yenatch
f44f306cfd
Merge pull request #477 from mid-kid/master
...
Medium-sized cleanups
2018-02-25 20:12:59 -05:00
yenatch
f404af8a43
Merge pull request #486 from surskitty/master
...
Another batch of label names
2018-02-25 20:12:31 -05:00
mid-kid
e8bc86d1fe
Pkmn -> Mon
...
Since we're aiming for consistency across the codebase, I believe it
includes a uniform way to refer to the creatures this game consists of
in the labels of the code.
The only exceptions to this rule are labels referring to things named
through the use of the <PK><MN> or <PKMN> characters, in which case PKMN
is used.
Most of this was already consistent enoughâ„¢, I just picked the
convention with the most occurences and fixed the outliers.
2018-02-22 17:39:06 +01:00
luckytyphlosion
8b007e8d51
Fix more w-izing edge cases.
2018-02-04 22:45:04 -05:00
surskitty
c959f7a2ea
Labelling, once again.
2018-02-03 22:37:08 -05:00
surskitty
e668b6cf3a
Merge branch 'master' of github.com:pret/pokecrystal
2018-02-03 22:18:56 -05:00
yenatch
b35eb72290
Merge pull request #480 from luckytyphlosion/master
...
[Ready to merge] Prefix wram labels with w.
2018-02-03 17:15:20 -05:00
surskitty
2edf131b05
Route 30 Berry Speech House labels
2018-02-02 16:52:15 -05:00
surskitty
955e43c630
Labels, labels, labels
2018-02-02 12:08:43 -05:00
surskitty
1b3a269812
Local jumps, once again.
2018-02-02 11:57:24 -05:00
surskitty
507a8f3535
Ruins of Alph partial labels
2018-02-02 11:57:11 -05:00
surskitty
b37cc569be
Radio Card local jumps
2018-02-02 11:30:16 -05:00
surskitty
ddd0b6f958
Jasmine and Amphy labels
2018-02-02 11:13:28 -05:00
surskitty
f1e4951cf1
Sailor Huey labels
2018-02-02 11:02:31 -05:00
surskitty
b94c1f7084
Labelling the Victory Road rival script
2018-02-02 10:57:06 -05:00
surskitty
b53b03eed0
Labelling Buena's subroutines.
2018-02-01 23:39:14 -05:00
surskitty
ae909428ae
Incomplete labelling
2018-02-01 23:30:17 -05:00
surskitty
8874ec7252
Completing labels for Route 35.
2018-01-23 23:49:50 -05:00
surskitty
b25e5626a1
Renaming the UnknownScript for reloading the map after battle.
2018-01-23 23:49:15 -05:00
surskitty
076e604387
Labelling some more UnknownScripts. These files remain incomplete.
2018-01-23 23:40:25 -05:00
luckytyphlosion
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
luckytyphlosion
f2ae74079f
Prefix wram labels with w, part 1.
...
Handle edge cases first.
2018-01-23 16:45:34 -05:00
surskitty
fbc6fe4722
Merge branch 'master' of github.com:pret/pokecrystal
2018-01-23 00:02:56 -05:00
Remy Oukaour
05382d3e3c
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 12:25:55 -05:00
Remy Oukaour
8127d1fbcf
Rename BATTLETOWER_NROF constants
2018-01-20 12:05:16 -05:00
Remy Oukaour
b071dd364f
Japanese characters in Japanese text (e.g. "ã‚©" not "," for $f4)
2018-01-19 21:49:16 -05:00
Remy Oukaour
e69544b61f
More Unicode
2018-01-19 02:30:19 -05:00
Remy Oukaour
a3beba1e64
Use Japanese charmap definitions in strings
2018-01-18 20:49:17 -05:00
Remy Oukaour
2acaa96cf1
More charmap and home/text.asm documentation for JP chars
2018-01-18 18:34:20 -05:00
Remy Oukaour
c70e8eec49
Comment on changeblock ids
2018-01-17 13:23:43 -05:00
Remy Oukaour
bf074f3598
map_header → map_def; map_header_2 → map_data
2018-01-16 23:25:00 -05:00
Remy Oukaour
94bbfe2f0c
Move map-related "metadata" files into data/maps/
2018-01-16 19:56:21 -05:00
surskitty
4162705db9
Cooltrainerm Kevin
2018-01-16 13:35:33 -05:00
surskitty
fb02e4bde5
Birdkeeper Jose and Cooltrainerf Reena
2018-01-16 13:26:13 -05:00
surskitty
d588033748
Route 35 local labels
2018-01-15 23:30:39 -05:00
surskitty
115a5c236d
Changing labels to local.
2018-01-15 23:23:04 -05:00
surskitty
c167c81611
Fisherman Tully labels
2018-01-15 23:09:56 -05:00
surskitty
9ce97c82d4
Route 43 labels
2018-01-15 23:02:39 -05:00
surskitty
3734a43062
Route 45 labels
2018-01-15 22:52:19 -05:00
surskitty
f14d0d8f21
Route 26 labels
2018-01-15 22:25:11 -05:00
surskitty
40952508c2
Renaming again
2018-01-15 22:19:17 -05:00
surskitty
d837c7609a
Labelling Route 46's wrappers.
2018-01-15 22:02:01 -05:00
surskitty
2548f75feb
Disambiguating the wrapper functions.
2018-01-15 21:59:48 -05:00
surskitty
d53881a0d4
Picnicker Erin labels
2018-01-15 21:39:07 -05:00
surskitty
e8d651b79a
Saffron City guard labels
2018-01-15 21:32:31 -05:00
surskitty
3e0cac29e3
Route 5 Cleanse Tag granny labels
2018-01-15 21:28:42 -05:00
surskitty
b098816b46
Labelling Route 44; Birdkeeper Vance and Fisher Wilton.
2018-01-15 21:23:32 -05:00
surskitty
1aae9eb528
Labelling simple local jumps.
2018-01-15 21:14:48 -05:00
Remy Oukaour
fe3ef73a8c
Group unused data
2018-01-15 00:44:40 -05:00
Remy Oukaour
14c8cf5b48
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452 )
...
# Conflicts:
# data/player_names.asm
# engine/battle/menu.asm
# engine/billspc.asm
# engine/billspctop.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/delete_save_change_clock.asm
# engine/events/buena.asm
# engine/events/elevator.asm
# engine/events/kurt.asm
# engine/events/mom.asm
# engine/events/move_tutor.asm
# engine/events/pokecenter_pc.asm
# engine/events/pokepic.asm
# engine/events/std_scripts.asm
# engine/events/unown_walls.asm
# engine/init_gender.asm
# engine/intro_menu.asm
# engine/mail.asm
# engine/main_menu.asm
# engine/mart.asm
# engine/menu_2.asm
# engine/mon_menu.asm
# engine/pack.asm
# engine/slot_machine.asm
# engine/start_menu.asm
# home/menu.asm
# maps/CeladonDeptStore6F.asm
# maps/CeladonGameCornerPrizeRoom.asm
# maps/DragonShrine.asm
# maps/EarlsPokemonAcademy.asm
# maps/GoldenrodCity.asm
# maps/GoldenrodDeptStore6F.asm
# maps/GoldenrodGameCorner.asm
# maps/GoldenrodPokeComCenter2FMobile.asm
# mobile/mobile_12.asm
# mobile/mobile_12_2.asm
# mobile/mobile_22.asm
# mobile/mobile_22_2.asm
# mobile/mobile_40.asm
# mobile/mobile_45.asm
# mobile/mobile_45_sprite_engine.asm
# mobile/mobile_46.asm
# mobile/mobile_5c.asm
# mobile/mobile_5f.asm
# mobile/mobile_menu.asm
2018-01-14 23:43:51 -05:00
