335c2699f0
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# constants/map_constants.asm
# constants/wram_constants.asm
# data/radio/oaks_pkmn_talk_routes.asm
# data/radio/pnp_hidden_places.asm
# engine/battle/core.asm
# engine/breeding.asm
# engine/phone/phone_scripts.asm
# engine/radio.asm
# maps/BattleTower1F.asm
# maps/OlivineLighthouse2F.asm
# maps/OlivineLighthouse6F.asm
# maps/PokemonFanClub.asm
# maps/RadioTower1F.asm
# maps/RadioTower2F.asm
# maps/Route30BerryHouse.asm
# maps/Route34IlexForestGate.asm
# maps/Route36NationalParkGate.asm
# maps/RuinsOfAlphKabutoChamber.asm
# maps/RuinsOfAlphResearchCenter.asm
# maps/VermilionPort.asm
# maps/VictoryRoad.asm
2018-02-25 20:39:54 -05:00
3d34f5a5a3
Label wPokemonWithdrawDepositParameter of RemoveMonFromPartyOrBox
...
It takes a clearly different parameter, completely unrelated and
different in function to PC_DEPOSIT and PC_WITHDRAW.
2018-02-22 21:36:14 +01:00
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
23b773d5c2
Label some daycare-related functions
2018-02-14 11:51:47 +01:00
f1c23f2153
Fix use of one constant
2018-02-13 08:36:25 +01:00
89c5f0adf0
Comment GeneratePartyMonStats
2018-02-09 22:21:59 +01:00
32ed487a47
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
2018-02-03 19:42:56 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
05382d3e3c
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 12:25:55 -05:00
8048082114
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 14:39:28 -05:00
2c789b64b1
Predef_FlagAction -> Predef_SmallFarFlagAction
2018-01-07 11:53:20 +01:00
e9e8bf6eb1
Predef_Flag -> Predef_FlagAction
2018-01-05 11:05:01 +01:00
d7970f749a
Consistent predef function names
2018-01-02 18:49:25 +01:00
9a3088e50c
Clean up XXX comments for unused content
2018-01-02 13:26:18 +01:00
e34e68095d
Resolve #428 : Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff
2017-12-25 14:23:16 -05:00
148fd299f9
Add more constants for some maximum values
2017-12-24 19:49:57 -05:00
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
699495bfcb
Consistent capitalization for map names, matching their constants
2017-12-10 13:37:15 -05:00
512863989f
Document constants with comments, actual names, and more thorough usage
2017-12-09 02:15:46 -05:00
ca01a92880
Fix indentation in many places
2016-06-07 08:13:08 -04:00
ae36ef2c7f
Labeled every function in ROM0 that's referenced in the source
2016-05-10 12:31:49 -04:00
3713b71d9e
More splitting of main.asm; remove unneeded rept 2
2016-05-04 11:46:23 -04:00
6be4cd4da9
Local labels starting with lowercase letters are no longer decorated with a trailing colon
2016-04-10 15:01:49 -04:00
bf73772a56
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 14:42:14 -04:00
be8d1c80f4
Merge branch 'master' of https://github.com/pret/pokecrystal
2016-01-19 23:28:37 -05:00
c087d44c42
more gfx-related labels
2016-01-04 08:43:55 -05:00
f030315b1f
jumptable macro repurposed
2015-12-26 21:59:03 -05:00
2bd45ca574
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 19:22:27 -05:00
a5e928eb98
writebackup --> closewindow; game corner prize vendors; others
2015-12-24 22:58:42 -05:00
Rangi