diff --git a/.gitignore b/.gitignore index 09145f7d5..bb88bb0c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ # generated -globals.asm *.tx *.o diff --git a/Makefile b/Makefile index 406b3ac96..403ecf1ce 100644 --- a/Makefile +++ b/Makefile @@ -27,13 +27,9 @@ OBJS := $(CRYSTAL_OBJS) ROMS := pokecrystal.gbc -ALL_DEPENDENCIES := # generate a list of dependencies for each object file $(shell $(foreach obj, $(OBJS), \ - $(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) $(POKEMONTOOLS)/scan_includes.py $(obj:.o=.asm) | sed s/globals.asm//g)) \ -)) -$(shell $(foreach obj, $(OBJS), \ - $(eval ALL_DEPENDENCIES += $($(obj:.o=)_DEPENDENCIES)) \ + $(eval $(obj:.o=)_DEPENDENCIES := $(shell $(PYTHON) $(POKEMONTOOLS)/scan_includes.py $(obj:.o=.asm))) \ )) @@ -44,7 +40,6 @@ crystal: pokecrystal.gbc clean: rm -f $(ROMS) rm -f $(OBJS) - rm -f globals.asm find -iname '*.tx' -exec rm {} + baserom.gbc: ; @@ -53,20 +48,16 @@ baserom.gbc: ; %.asm: ; .asm.tx: - $(eval TEXTQUEUE := $(TEXTQUEUE) $<) + $(eval TEXTQUEUE += $<) @rm -f $@ -globals.asm: $(ALL_DEPENDENCIES:.asm=.tx) $(OBJS:.o=.tx) - @touch $@ - @$(PYTHON) prequeue.py $(TEXTQUEUE) -globals.tx: globals.asm - @cp $< $@ - $(OBJS): $$*.tx $$(patsubst %.asm, %.tx, $$($$*_DEPENDENCIES)) + @$(PYTHON) prequeue.py $(TEXTQUEUE) + $(eval TEXTQUEUE :=) rgbasm -o $@ $*.tx -pokecrystal.gbc: globals.tx $(CRYSTAL_OBJS) - rgblink -n $*.sym -m $*.map -o $@ $(CRYSTAL_OBJS) +pokecrystal.gbc: $(CRYSTAL_OBJS) + rgblink -n $*.sym -m $*.map -o $@ $^ rgbfix -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ cmp baserom.gbc $@ diff --git a/audio.asm b/audio.asm index 80a644d53..704edb501 100644 --- a/audio.asm +++ b/audio.asm @@ -166,7 +166,7 @@ INCBIN "baserom.gbc",$17982d, $1799ef - $17982d SECTION "Cries", ROMX, BANK[CRIES] -CryHeaders: INCLUDE "audio/cry_headers.asm" +CryHeaders:: INCLUDE "audio/cry_headers.asm" INCBIN "baserom.gbc",$f2d69, $f3fb6 - $f2d69 diff --git a/audio/engine.asm b/audio/engine.asm index 12512263e..14c007935 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -7,7 +7,7 @@ ; PlayStereoSFX ; PlayCry -_SoundRestart: ; e8000 +_SoundRestart:: ; e8000 ; restart sound operation ; clear all relevant hardware registers & wram push hl @@ -84,7 +84,7 @@ MusicOff: ; e8057 ret ; e805c -_UpdateSound: ; e805c +_UpdateSound:: ; e805c ; called once per frame ; no use updating audio if it's not playing ld a, [MusicPlaying] @@ -2322,7 +2322,7 @@ SetLRTracks: ; e8b1b ret ; e8b30 -_PlayMusic: ; e8b30 +_PlayMusic:: ; e8b30 ; load music call MusicOff ld hl, MusicID @@ -2365,7 +2365,7 @@ _PlayMusic: ; e8b30 ret ; e8b79 -PlayCry: ; e8b79 +PlayCry:: ; e8b79 ; Play cry de using parameters: ; CryPitch ; CryEcho @@ -2479,7 +2479,7 @@ PlayCry: ; e8b79 ret ; e8c04 -_PlaySFX: ; e8c04 +_PlaySFX:: ; e8c04 ; clear channels if they aren't already call MusicOff ld hl, $c1cc ; Channel5Flags @@ -2580,7 +2580,7 @@ _PlaySFX: ; e8c04 ; e8ca6 -PlayStereoSFX: ; e8ca6 +PlayStereoSFX:: ; e8ca6 ; play sfx de call MusicOff @@ -2759,7 +2759,7 @@ ChannelInit: ; e8d5b ret ; e8d76 -LoadMusicByte: ; e8d76 +LoadMusicByte:: ; e8d76 ; input: ; de = current music address ; output: @@ -3156,7 +3156,7 @@ ChannelPointers: ; e8fd9 dw Channel8 ; e8fe9 -ClearChannels: ; e8fe9 +ClearChannels:: ; e8fe9 ; runs ClearChannel for all 4 channels ; doesn't seem to be used, but functionally identical to SoundRestart ld hl, rNR50 diff --git a/audio/trainer_encounters.asm b/audio/trainer_encounters.asm index 7ddc38f06..de748d26a 100644 --- a/audio/trainer_encounters.asm +++ b/audio/trainer_encounters.asm @@ -1,6 +1,6 @@ ; Currently, must be in the same bank as the sound engine. -PlayTrainerEncounterMusic: ; e900a +PlayTrainerEncounterMusic:: ; e900a ; input: e = trainer type ; turn fade off xor a diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 34c946e33..cfd40220d 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -335,7 +335,7 @@ Functioncc293: ; cc293 ; no known jump sources -BattleAnimCommands: ; cc2a4 (33:42a4) +BattleAnimCommands:: ; cc2a4 (33:42a4) dw BattleAnimCmd_D0 dw BattleAnimCmd_D1 dw BattleAnimCmd_D2 diff --git a/battle/anims.asm b/battle/anims.asm index e3836480b..9fcde859e 100644 --- a/battle/anims.asm +++ b/battle/anims.asm @@ -1,4 +1,4 @@ -BattleAnimations: ; c906f +BattleAnimations:: ; c906f dw BattleAnim_0 dw BattleAnim_Pound dw BattleAnim_KarateChop diff --git a/battle/core.asm b/battle/core.asm index be7abc8fe..ef7ea442d 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -4761,7 +4761,7 @@ Function3df2c: ; 3df2c -Function3df48: ; 3df48 +Function3df48:: ; 3df48 push hl push de push bc @@ -4907,7 +4907,7 @@ PrintPlayerHUD: ; 3dfbf jp PrintLevel ; 3e036 -Function3e036: ; 3e036 +Function3e036:: ; 3e036 push hl push de push bc @@ -7191,7 +7191,7 @@ EmptyBattleTextBox: ; 3edd1 ; 3edd8 -_BattleRandom: ; 3edd8 +_BattleRandom:: ; 3edd8 ; If the normal RNG is used in a link battle it'll desync. ; To circumvent this a shared PRNG is used instead. diff --git a/constants.asm b/constants.asm index 2c07ebb5a..8b0b8978d 100644 --- a/constants.asm +++ b/constants.asm @@ -1,9 +1,4 @@ -; macros require rst vectors to be defined -FarCall EQU $08 -Bankswitch EQU $10 -JumpTable EQU $28 - INCLUDE "macros.asm" INCLUDE "gbhw.asm" @@ -26,169 +21,6 @@ INCLUDE "constants/music_constants.asm" INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/animation_constants.asm" INCLUDE "constants/gfx_constants.asm" - - - -NONE EQU 0 - - - -; egg group constants -MONSTER EQU $01 -AMPHIBIAN EQU $02 -INSECT EQU $03 -AVIAN EQU $04 -FIELD EQU $05 -FAIRY EQU $06 -PLANT EQU $07 -HUMANSHAPE EQU $08 -INVERTEBRATE EQU $09 -INANIMATE EQU $0A -AMORPHOUS EQU $0B -FISH EQU $0C -LADIES_MAN EQU $0D -REPTILE EQU $0E -NO_EGGS EQU $0F - -; menu sprites -ICON_POLIWAG EQU $01 -ICON_JIGGLYPUFF EQU $02 -ICON_DIGLETT EQU $03 -ICON_PIKACHU EQU $04 -ICON_STARYU EQU $05 -ICON_FISH EQU $06 -ICON_BIRD EQU $07 -ICON_MONSTER EQU $08 -ICON_CLEFAIRY EQU $09 -ICON_ODDISH EQU $0a -ICON_BUG EQU $0b -ICON_GHOST EQU $0c -ICON_LAPRAS EQU $0d -ICON_HUMANSHAPE EQU $0e -ICON_FOX EQU $0f -ICON_EQUINE EQU $10 -ICON_SHELL EQU $11 -ICON_BLOB EQU $12 -ICON_SERPENT EQU $13 -ICON_VOLTORB EQU $14 -ICON_SQUIRTLE EQU $15 -ICON_BULBASAUR EQU $16 -ICON_CHARMANDER EQU $17 -ICON_CATERPILLAR EQU $18 -ICON_UNOWN EQU $19 -ICON_GEODUDE EQU $1a -ICON_FIGHTER EQU $1b -ICON_EGG EQU $1c -ICON_JELLYFISH EQU $1d -ICON_MOTH EQU $1e -ICON_BAT EQU $1f -ICON_SNORLAX EQU $20 -ICON_HO_OH EQU $21 -ICON_LUGIA EQU $22 -ICON_GYARADOS EQU $23 -ICON_SLOWPOKE EQU $24 -ICON_SUDOWOODO EQU $25 -ICON_BIGMON EQU $26 - - -; evolution types -EVOLVE_LEVEL EQU 1 -EVOLVE_ITEM EQU 2 -EVOLVE_TRADE EQU 3 -EVOLVE_HAPPINESS EQU 4 -EVOLVE_STAT EQU 5 - -BASE_HAPPINESS EQU 70 -; happiness evolution triggers -HAPPINESS_TO_EVOLVE EQU 220 -TR_ANYTIME EQU 1 -TR_MORNDAY EQU 2 -TR_NITE EQU 3 - -; stat evolution triggers -ATK_GT_DEF EQU 1 -ATK_LT_DEF EQU 2 -ATK_EQ_DEF EQU 3 - - -; name length -PLAYER_NAME_LENGTH EQU 8 -PKMN_NAME_LENGTH EQU 11 - - -; predefs -PREDEF_FLAG EQU $03 -PREDEF_FILLPP EQU $05 -PREDEF_ADDPARTYMON EQU $06 -PREDEF_FILLSTATS EQU $0C -PREDEF_PRINT_MOVE_DESCRIPTION EQU $11 -PREDEF_UPDATE_PLAYER_HUD EQU $12 -PREDEF_FILL_BOX EQU $13 -PREDEF_UPDATE_ENEMY_HUD EQU $15 -PREDEF_START_BATTLE EQU $16 -PREDEF_FILL_IN_EXP_BAR EQU $17 -PREDEF_FILLMOVES EQU $1B -PREDEF_GET_GENDER EQU $24 -PREDEF_STATS_SCREEN EQU $25 -PREDEF_DRAW_PLAYER_HP EQU $26 -PREDEF_DRAW_ENEMY_HP EQU $27 -PREDEF_GET_TYPE_NAME EQU $29 -PREDEF_PRINT_MOVE_TYPE EQU $2A -PREDEF_PRINT_TYPE EQU $2B -PREDEF_GET_UNOWN_LETTER EQU $2D -PREDEF_LOAD_SGB_LAYOUT EQU $31 -PREDEF_CHECK_CONTEST_MON EQU $33 -PREDEF_BATTLE_TRANSITION EQU $34 -PREDEF_PARTYMON_ITEM_NAME EQU $3B -PREDEF_DECOMPRESS EQU $40 - - -; flag manipulation -RESET_FLAG EQU 0 -SET_FLAG EQU 1 -CHECK_FLAG EQU 2 - - -; joypad -BUTTONS EQU %00010000 -D_PAD EQU %00100000 - -NO_INPUT EQU %00000000 -A_BUTTON EQU %00000001 -B_BUTTON EQU %00000010 -SELECT EQU %00000100 -START EQU %00001000 -D_RIGHT EQU %00010000 -D_LEFT EQU %00100000 -D_UP EQU %01000000 -D_DOWN EQU %10000000 - - -; screen -HP_BAR_LENGTH EQU 6 -HP_BAR_LENGTH_PX EQU 48 -EXP_BAR_LENGTH EQU 8 -EXP_BAR_LENGTH_PX EQU 64 - -SCREEN_WIDTH EQU 20 -SCREEN_HEIGHT EQU 18 -SCREEN_WIDTH_PX EQU 160 -SCREEN_HEIGHT_PX EQU 144 - -BG_MAP_WIDTH EQU 32 -BG_MAP_HEIGHT EQU 32 - -TILE_WIDTH EQU 8 - - -; movement -STEP_SLOW EQU 0 -STEP_WALK EQU 1 -STEP_BIKE EQU 2 -STEP_LEDGE EQU 3 -STEP_ICE EQU 4 -STEP_TURN EQU 5 -STEP_BACK_LEDGE EQU 6 -STEP_WALK_IN_PLACE EQU 7 - +INCLUDE "constants/pokemon_data_constants.asm" +INCLUDE "constants/misc_constants.asm" diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm new file mode 100644 index 000000000..23b331b36 --- /dev/null +++ b/constants/misc_constants.asm @@ -0,0 +1,81 @@ + +; name length +PLAYER_NAME_LENGTH EQU 8 +PKMN_NAME_LENGTH EQU 11 + + +; predefs +PREDEF_FLAG EQU $03 +PREDEF_FILLPP EQU $05 +PREDEF_ADDPARTYMON EQU $06 +PREDEF_FILLSTATS EQU $0C +PREDEF_PRINT_MOVE_DESCRIPTION EQU $11 +PREDEF_UPDATE_PLAYER_HUD EQU $12 +PREDEF_FILL_BOX EQU $13 +PREDEF_UPDATE_ENEMY_HUD EQU $15 +PREDEF_START_BATTLE EQU $16 +PREDEF_FILL_IN_EXP_BAR EQU $17 +PREDEF_FILLMOVES EQU $1B +PREDEF_GET_GENDER EQU $24 +PREDEF_STATS_SCREEN EQU $25 +PREDEF_DRAW_PLAYER_HP EQU $26 +PREDEF_DRAW_ENEMY_HP EQU $27 +PREDEF_GET_TYPE_NAME EQU $29 +PREDEF_PRINT_MOVE_TYPE EQU $2A +PREDEF_PRINT_TYPE EQU $2B +PREDEF_GET_UNOWN_LETTER EQU $2D +PREDEF_LOAD_SGB_LAYOUT EQU $31 +PREDEF_CHECK_CONTEST_MON EQU $33 +PREDEF_BATTLE_TRANSITION EQU $34 +PREDEF_PARTYMON_ITEM_NAME EQU $3B +PREDEF_DECOMPRESS EQU $40 + + +; flag manipulation +RESET_FLAG EQU 0 +SET_FLAG EQU 1 +CHECK_FLAG EQU 2 + + +; joypad +BUTTONS EQU %00010000 +D_PAD EQU %00100000 + +NO_INPUT EQU %00000000 +A_BUTTON EQU %00000001 +B_BUTTON EQU %00000010 +SELECT EQU %00000100 +START EQU %00001000 +D_RIGHT EQU %00010000 +D_LEFT EQU %00100000 +D_UP EQU %01000000 +D_DOWN EQU %10000000 + + +; screen +HP_BAR_LENGTH EQU 6 +HP_BAR_LENGTH_PX EQU 48 +EXP_BAR_LENGTH EQU 8 +EXP_BAR_LENGTH_PX EQU 64 + +SCREEN_WIDTH EQU 20 +SCREEN_HEIGHT EQU 18 +SCREEN_WIDTH_PX EQU 160 +SCREEN_HEIGHT_PX EQU 144 + +BG_MAP_WIDTH EQU 32 +BG_MAP_HEIGHT EQU 32 + +TILE_WIDTH EQU 8 + + +; movement +STEP_SLOW EQU 0 +STEP_WALK EQU 1 +STEP_BIKE EQU 2 +STEP_LEDGE EQU 3 +STEP_ICE EQU 4 +STEP_TURN EQU 5 +STEP_BACK_LEDGE EQU 6 +STEP_WALK_IN_PLACE EQU 7 + diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm new file mode 100644 index 000000000..2fb6fdbe0 --- /dev/null +++ b/constants/pokemon_data_constants.asm @@ -0,0 +1,83 @@ + +; egg group constants + +MONSTER EQU $01 +AMPHIBIAN EQU $02 +INSECT EQU $03 +AVIAN EQU $04 +FIELD EQU $05 +FAIRY EQU $06 +PLANT EQU $07 +HUMANSHAPE EQU $08 +INVERTEBRATE EQU $09 +INANIMATE EQU $0A +AMORPHOUS EQU $0B +FISH EQU $0C +LADIES_MAN EQU $0D +REPTILE EQU $0E +NO_EGGS EQU $0F + + +; menu sprites +ICON_POLIWAG EQU $01 +ICON_JIGGLYPUFF EQU $02 +ICON_DIGLETT EQU $03 +ICON_PIKACHU EQU $04 +ICON_STARYU EQU $05 +ICON_FISH EQU $06 +ICON_BIRD EQU $07 +ICON_MONSTER EQU $08 +ICON_CLEFAIRY EQU $09 +ICON_ODDISH EQU $0a +ICON_BUG EQU $0b +ICON_GHOST EQU $0c +ICON_LAPRAS EQU $0d +ICON_HUMANSHAPE EQU $0e +ICON_FOX EQU $0f +ICON_EQUINE EQU $10 +ICON_SHELL EQU $11 +ICON_BLOB EQU $12 +ICON_SERPENT EQU $13 +ICON_VOLTORB EQU $14 +ICON_SQUIRTLE EQU $15 +ICON_BULBASAUR EQU $16 +ICON_CHARMANDER EQU $17 +ICON_CATERPILLAR EQU $18 +ICON_UNOWN EQU $19 +ICON_GEODUDE EQU $1a +ICON_FIGHTER EQU $1b +ICON_EGG EQU $1c +ICON_JELLYFISH EQU $1d +ICON_MOTH EQU $1e +ICON_BAT EQU $1f +ICON_SNORLAX EQU $20 +ICON_HO_OH EQU $21 +ICON_LUGIA EQU $22 +ICON_GYARADOS EQU $23 +ICON_SLOWPOKE EQU $24 +ICON_SUDOWOODO EQU $25 +ICON_BIGMON EQU $26 + + +; evolution types +EVOLVE_LEVEL EQU 1 +EVOLVE_ITEM EQU 2 +EVOLVE_TRADE EQU 3 +EVOLVE_HAPPINESS EQU 4 +EVOLVE_STAT EQU 5 + + +BASE_HAPPINESS EQU 70 +; happiness evolution triggers +HAPPINESS_TO_EVOLVE EQU 220 +TR_ANYTIME EQU 1 +TR_MORNDAY EQU 2 +TR_NITE EQU 3 + + +; stat evolution triggers +ATK_GT_DEF EQU 1 +ATK_LT_DEF EQU 2 +ATK_EQ_DEF EQU 3 + + diff --git a/engine/color.asm b/engine/color.asm index 5a050e7f2..b26954923 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -865,7 +865,7 @@ Function9853: ; 9853 ; 9890 -Function9890: ; 9890 +Function9890:: ; 9890 call CheckCGB ret z ld a, $1 diff --git a/engine/credits.asm b/engine/credits.asm index 677e1639b..fabd409da 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -114,7 +114,7 @@ const_value SET -7 const CREDITS_END -Function109847: ; 109847 +Function109847:: ; 109847 bit 6, b ld a, $0 jr z, .asm_10984f diff --git a/engine/events.asm b/engine/events.asm index 9e4c1e98a..a26982499 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -3,7 +3,7 @@ INCLUDE "includes.asm" SECTION "Events", ROMX, BANK[EVENTS] -OverworldLoop: ; 966b0 +OverworldLoop:: ; 966b0 xor a ld [MapStatus], a .loop @@ -30,7 +30,7 @@ Function966cb: ; 966cb ret ; 966d0 -Function966d0: ; 966d0 +Function966d0:: ; 966d0 ld a, $ff ld [ScriptFlags3], a ret @@ -419,7 +419,7 @@ CheckTileEvent: ; 96874 ; 968c7 -Function968c7: ; 968c7 +Function968c7:: ; 968c7 ld hl, $d452 ld a, [hl] and a diff --git a/engine/events_2.asm b/engine/events_2.asm index 682fd8237..68f5027ab 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -5,14 +5,14 @@ INCLUDE "includes.asm" SECTION "Events 2", ROMX, BANK[EVENTS] -Function97c28: ; 97c28 +Function97c28:: ; 97c28 ld hl, StatusFlags2 res 1, [hl] res 2, [hl] ret ; 97c30 -Function97c30: ; 97c30 +Function97c30:: ; 97c30 ld a, [$d45c] and a ret z @@ -32,7 +32,7 @@ Function97c30: ; 97c30 ret ; 97c4f -Function97c4f: ; 97c4f +Function97c4f:: ; 97c4f ld hl, $d45c ld a, [hl] and a @@ -48,7 +48,7 @@ Function97c4f: ; 97c4f ret ; 97c5f -Function97c5f: ; 97c5f +Function97c5f:: ; 97c5f call GetFacingTileCoord ld [EngineBuffer1], a ld c, a @@ -99,7 +99,7 @@ Function97c5f: ; 97c5f ; 97cc0 -Function97cc0: ; 97cc0 +Function97cc0:: ; 97cc0 ; Rock Smash encounter call Function968c7 @@ -146,7 +146,7 @@ RockSmashBattleScript: ; 97cf9 end ; 97cfd -Function97cfd: ; 97cfd +Function97cfd:: ; 97cfd ld hl, StatusFlags bit 5, [hl] jr nz, .asm_97d21 @@ -178,7 +178,7 @@ Function97d23: ; 97d23 ret ; 97d31 -Function97d31: ; 97d31 +Function97d31:: ; 97d31 ; Pick a random mon out of ContestMons. .asm_97d31 @@ -266,7 +266,7 @@ ContestMons: ; 97d87 db -1, VENOMOTH, 30, 40 ; 97db3 -Function97db3: ; 97db3 +Function97db3:: ; 97db3 nop nop ; fallthrough @@ -319,7 +319,7 @@ Function97db5: ; 97db5 ret ; 97df9 -Function97df9: ; 97df9 +Function97df9:: ; 97df9 ld hl, $d6de ld de, $0006 ld c, $4 @@ -332,7 +332,7 @@ Function97df9: ; 97df9 ret ; 97e08 -Function97e08: ; 97e08 +Function97e08:: ; 97e08 ld hl, $d6de xor a .asm_97e0c @@ -365,7 +365,7 @@ Function97e25: ; 97e25 ret ; 97e31 -Function97e31: ; 97e31 +Function97e31:: ; 97e31 push bc push de call Function97e45 @@ -403,7 +403,7 @@ Function97e45: ; 97e45 ret ; 97e5c -Function97e5c: ; 97e5c +Function97e5c:: ; 97e5c ld hl, $d6de ld de, $0006 ld c, $4 diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 50653823b..202f077e6 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -1,4 +1,4 @@ -FruitTreeScript: ; 44000 +FruitTreeScript:: ; 44000 3callasm GetCurTreeFruit loadfont copybytetovar CurFruit diff --git a/engine/landmarks.asm b/engine/landmarks.asm index a6ea6be68..1d050da77 100644 --- a/engine/landmarks.asm +++ b/engine/landmarks.asm @@ -15,7 +15,7 @@ GetLandmarkCoords: ; 0x1ca896 ; 0x1ca8a5 -GetLandmarkName: ; 0x1ca8a5 +GetLandmarkName:: ; 0x1ca8a5 ; Copy the name of landmark e to StringBuffer1. push hl push de diff --git a/engine/scripting.asm b/engine/scripting.asm index 58648514b..5f1612677 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1,7 +1,7 @@ ; Event scripting commands. -Function96c56: ; 96c56 +Function96c56:: ; 96c56 push af ld a, 1 ld [ScriptMode], a @@ -10,7 +10,7 @@ Function96c56: ; 96c56 ; 96c5e -ScriptEvents: ; 96c5e +ScriptEvents:: ; 96c5e call StartScript .loop ld a, [ScriptMode] @@ -1658,7 +1658,7 @@ ScriptCall: ; 0x974cb ret ; 0x974f3 -Unknown_0x974f3: ; 0x974f3 +Unknown_0x974f3:: ; 0x974f3 ld a, [ScriptBank] or $80 ld [ScriptBank], a @@ -2952,7 +2952,7 @@ Script_changeblock: ; 0x97acc ret ; 0x97ae3 -Script_reloadmappart: ; 0x97ae3 +Script_reloadmappart:: ; 0x97ae3 ; script command 0x7c xor a diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 95283ad19..1cd74c4c2 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -1,4 +1,4 @@ -StdScripts: ; bc000 +StdScripts:: ; bc000 dbw BANK(PokeCenterNurseScript), PokeCenterNurseScript dbw BANK(UnknownScript_0xbc162), UnknownScript_0xbc162 dbw BANK(UnknownScript_0xbc166), UnknownScript_0xbc166 diff --git a/home.asm b/home.asm index 565b547cd..5b15709c1 100644 --- a/home.asm +++ b/home.asm @@ -1,7 +1,7 @@ INCLUDE "includes.asm" SECTION "NULL", ROM0[0] -NULL: +NULL:: INCLUDE "rst.asm" @@ -10,7 +10,7 @@ INCLUDE "interrupts.asm" SECTION "Header", ROM0[$100] -Start: +Start:: nop jp _Start @@ -41,7 +41,7 @@ INCLUDE "home/game_time.asm" INCLUDE "home/map.asm" -Function2d43: ; 2d43 +Function2d43:: ; 2d43 ; Inexplicably empty. ; Seen in PredefPointers. rept 16 @@ -56,7 +56,7 @@ INCLUDE "home/predef.asm" INCLUDE "home/window.asm" -Function2e4e: ; 2e4e +Function2e4e:: ; 2e4e scf ret ; 2e50 @@ -65,7 +65,7 @@ Function2e4e: ; 2e4e INCLUDE "home/flag.asm" -Function2ebb: ; 2ebb +Function2ebb:: ; 2ebb ld a, [$c2cc] bit 1, a ret z @@ -75,18 +75,18 @@ Function2ebb: ; 2ebb ; 2ec6 -Function2ec6: ; 2ec6 +Function2ec6:: ; 2ec6 xor a ret ; 2ec8 -Function2ec8: ; 2ec8 +Function2ec8:: ; 2ec8 xor a dec a ret ; 2ecb -Function2ecb: ; 2ecb +Function2ecb:: ; 2ecb push hl ld hl, $c2cc bit 1, [hl] @@ -95,7 +95,7 @@ Function2ecb: ; 2ecb ; 2ed3 -Function2ed3: ; 0x2ed3 +Function2ed3:: ; 0x2ed3 ; disables overworld sprite updating? xor a ld [$ffde], a @@ -107,7 +107,7 @@ Function2ed3: ; 0x2ed3 ret ; 0x2ee4 -Function2ee4: ; 2ee4 +Function2ee4:: ; 2ee4 ld a, $1 ld [$c2ce], a ld a, [VramState] @@ -122,7 +122,7 @@ Function2ee4: ; 2ee4 INCLUDE "home/string.asm" -IsInJohto: ; 2f17 +IsInJohto:: ; 2f17 ; Return 0 if the player is in Johto, and 1 in Kanto. ld a, [MapGroup] @@ -157,7 +157,7 @@ IsInJohto: ; 2f17 ; 2f3e -Function2f3e: ; 2f3e +Function2f3e:: ; 2f3e ret ; 2f3f @@ -169,11 +169,11 @@ INCLUDE "home/sram.asm" ; Register aliases -_hl_: ; 2fec +_hl_:: ; 2fec jp [hl] ; 2fed -_de_: ; 2fed +_de_:: ; 2fed push de ret ; 2fef @@ -182,7 +182,7 @@ _de_: ; 2fed INCLUDE "home/double_speed.asm" -ClearSprites: ; 300b +ClearSprites:: ; 300b ; Erase OAM data ld hl, Sprites ld b, SpritesEnd - Sprites @@ -194,7 +194,7 @@ ClearSprites: ; 300b ret ; 3016 -HideSprites: ; 3016 +HideSprites:: ; 3016 ; Set all OAM y-positions to 160 to hide them offscreen ld hl, Sprites ld de, 4 ; length of an OAM struct @@ -212,7 +212,7 @@ HideSprites: ; 3016 INCLUDE "home/copy2.asm" -Function309d: ; 309d +Function309d:: ; 309d ld a, [rSVBK] push af ld a, 2 @@ -226,7 +226,7 @@ Function309d: ; 309d ret ; 30b4 -Function30b4: ; 30b4 +Function30b4:: ; 30b4 xor a ld [hBGMapMode], a call Function30bf @@ -235,7 +235,7 @@ Function30b4: ; 30b4 ret ; 30bf -Function30bf: ; 30bf +Function30bf:: ; 30bf ld a, [rSVBK] push af ld a, 2 @@ -250,10 +250,10 @@ Function30bf: ; 30bf ; 30d6 -CopyName1: ; 30d6 +CopyName1:: ; 30d6 ld hl, StringBuffer2 -CopyName2: ; 30d9 +CopyName2:: ; 30d9 .loop ld a, [de] inc de @@ -263,7 +263,7 @@ CopyName2: ; 30d9 ret ; 30e1 -IsInArray: ; 30e1 +IsInArray:: ; 30e1 ; Find value a for every de bytes in array hl. ; Return index in b and carry if found. @@ -288,7 +288,7 @@ IsInArray: ; 30e1 ret ; 30f4 -SkipNames: ; 0x30f4 +SkipNames:: ; 0x30f4 ; skips n names where n = a ld bc, $000b ; name length and a @@ -300,7 +300,7 @@ SkipNames: ; 0x30f4 ret ; 0x30fe -AddNTimes: ; 0x30fe +AddNTimes:: ; 0x30fe ; adds bc n times where n = a and a ret z @@ -315,7 +315,7 @@ AddNTimes: ; 0x30fe INCLUDE "home/math.asm" -PrintLetterDelay: ; 313d +PrintLetterDelay:: ; 313d ; Wait before printing the next letter. ; The text speed setting in Options is actually a frame count: @@ -399,7 +399,7 @@ PrintLetterDelay: ; 313d ; 318c -CopyDataUntil: ; 318c +CopyDataUntil:: ; 318c ; Copy [hl .. bc) to [de .. de + bc - hl). ; In other words, the source data is @@ -419,7 +419,7 @@ CopyDataUntil: ; 318c ; 0x3198 -PrintNum: ; 3198 +PrintNum:: ; 3198 ld a, [hROMBank] push af ld a, BANK(_PrintNum) @@ -433,7 +433,7 @@ PrintNum: ; 3198 ; 31a4 -Function31a4: ; 31a4 +Function31a4:: ; 31a4 ld a, [hROMBank] push af ld a, BANK(Function1061ef) @@ -447,7 +447,7 @@ Function31a4: ; 31a4 ; 31b0 -FarPrintText: ; 31b0 +FarPrintText:: ; 31b0 ld [hBuffer], a ld a, [hROMBank] push af @@ -462,7 +462,7 @@ FarPrintText: ; 31b0 ; 31be -CallPointerAt: ; 31be +CallPointerAt:: ; 31be ld a, [hROMBank] push af ld a, [hli] @@ -481,11 +481,11 @@ CallPointerAt: ; 31be ; 31cd -Function31cd: ; 31cd +Function31cd:: ; 31cd ; Push pointer hl in the current bank to $d0e8. ld a, [hROMBank] -Function31cf: ; 31cf +Function31cf:: ; 31cf ; Push pointer a:hl to $d0e8. ld [$d0e8], a ld a, l @@ -496,7 +496,7 @@ Function31cf: ; 31cf ; 31db -StringCmp: ; 31db +StringCmp:: ; 31db ; Compare c bytes at de and hl. ; Return z if they all match. ld a, [de] @@ -510,7 +510,7 @@ StringCmp: ; 31db ; 0x31e4 -CompareLong: ; 31e4 +CompareLong:: ; 31e4 ; Compare bc bytes at de and hl. ; Return carry if they all match. @@ -535,9 +535,9 @@ CompareLong: ; 31e4 ; 31f3 -WhiteBGMap: ; 31f3 +WhiteBGMap:: ; 31f3 call ClearPalettes -WaitBGMap: ; 31f6 +WaitBGMap:: ; 31f6 ; Tell VBlank to update BG Map ld a, 1 ; BG Map 0 tiles ld [hBGMapMode], a @@ -547,7 +547,7 @@ WaitBGMap: ; 31f6 ret ; 3200 -Function3200: ; 0x3200 +Function3200:: ; 0x3200 ld a, [hCGB] and a jr z, .asm_320e @@ -565,14 +565,14 @@ Function3200: ; 0x3200 ; 0x3218 -Function3218: ; 3218 +Function3218:: ; 3218 ld a, [hCGB] and a ret ; 321c -Function321c: ; 321c +Function321c:: ; 321c ld a, [hCGB] and a jr z, .asm_322e @@ -593,21 +593,21 @@ Function321c: ; 321c ret ; 3238 -Function3238: ; 3238 +Function3238:: ; 3238 ld a, [hCGB] and a jr z, WaitBGMap -Function323d: ; 323d +Function323d:: ; 323d jr Function3246 ; 323f -Function323f: ; 323f +Function323f:: ; 323f callba Function104000 ret ; 3246 -Function3246: ; 3246 +Function3246:: ; 3246 ld a, [hBGMapMode] push af xor a @@ -641,7 +641,7 @@ Function3246: ; 3246 ret ; 327b -Function327b: ; 327b +Function327b:: ; 327b ld [hSPBuffer], sp ld sp, hl ld a, [$ffd7] @@ -691,7 +691,7 @@ endr -Function32f9: ; 32f9 +Function32f9:: ; 32f9 ld a, [hCGB] and a jr nz, .asm_3309 @@ -713,7 +713,7 @@ Function32f9: ; 32f9 ; 3317 -ClearPalettes: ; 3317 +ClearPalettes:: ; 3317 ; Make all palettes white ; CGB: make all the palette colors white @@ -751,10 +751,10 @@ ClearPalettes: ; 3317 ; 333e -ClearSGB: ; 333e +ClearSGB:: ; 333e ld b, $ff -GetSGBLayout: ; 3340 +GetSGBLayout:: ; 3340 ; load sgb packets unless dmg ld a, [hCGB] @@ -771,7 +771,7 @@ GetSGBLayout: ; 3340 ; 334e -SetHPPal: ; 334e +SetHPPal:: ; 334e ; Set palette for hp bar pixel length e at hl. call GetHPPal ld [hl], d @@ -779,7 +779,7 @@ SetHPPal: ; 334e ; 3353 -GetHPPal: ; 3353 +GetHPPal:: ; 3353 ; Get palette for hp bar pixel length e in d. ld d, 0 ; green @@ -794,7 +794,7 @@ GetHPPal: ; 3353 ; 335f -CountSetBits: ; 0x335f +CountSetBits:: ; 0x335f ; Count the number of set bits in b bytes starting from hl. ; Return in a, c and [$d265]. @@ -821,7 +821,7 @@ CountSetBits: ; 0x335f ; 0x3376 -GetWeekday: ; 3376 +GetWeekday:: ; 3376 ld a, [CurDay] .mod sub 7 @@ -834,7 +834,7 @@ GetWeekday: ; 3376 INCLUDE "home/pokedex_flags.asm" -NamesPointers: ; 33ab +NamesPointers:: ; 33ab dbw BANK(PokemonNames), PokemonNames dbw BANK(MoveNames), MoveNames dbw 0, 0 @@ -846,7 +846,7 @@ NamesPointers: ; 33ab ; 33c3 -GetName: ; 33c3 +GetName:: ; 33c3 ; Return name CurSpecies from name list $cf61 in StringBuffer1. ld a, [hROMBank] @@ -906,7 +906,7 @@ GetName: ; 33c3 ; 3411 -GetNthString: ; 3411 +GetNthString:: ; 3411 ; Return the address of the ; ath string starting from hl. @@ -927,7 +927,7 @@ GetNthString: ; 3411 ; 3420 -GetBasePokemonName: ; 3420 +GetBasePokemonName:: ; 3420 ; Discards gender (Nidoran). push hl @@ -953,7 +953,7 @@ GetBasePokemonName: ; 3420 ; 343b -GetPokemonName: ; 343b +GetPokemonName:: ; 343b ; Get Pokemon name $d265. ld a, [hROMBank] @@ -992,7 +992,7 @@ GetPokemonName: ; 343b ; 3468 -GetItemName: ; 3468 +GetItemName:: ; 3468 ; Get item name $d265. push hl @@ -1017,7 +1017,7 @@ GetItemName: ; 3468 ; 3487 -GetTMHMName: ; 3487 +GetTMHMName:: ; 3487 ; Get TM/HM name by item id $d265. push hl @@ -1101,7 +1101,7 @@ GetTMHMName: ; 3487 ; 34df -IsHM: ; 34df +IsHM:: ; 34df cp HM_01 jr c, .NotHM scf @@ -1112,7 +1112,7 @@ IsHM: ; 34df ; 34e7 -IsHMMove: ; 34e7 +IsHMMove:: ; 34e7 ld hl, .HMMoves ld de, 1 jp IsInArray @@ -1129,7 +1129,7 @@ IsHMMove: ; 34e7 ; 34f8 -GetMoveName: ; 34f8 +GetMoveName:: ; 34f8 push hl ; move name ld a, $2 ; move names @@ -1145,7 +1145,7 @@ GetMoveName: ; 34f8 ; 350c -Function350c: ; 350c +Function350c:: ; 350c call Function1c66 ld a, [hROMBank] push af @@ -1162,14 +1162,14 @@ Function350c: ; 350c ret ; 3524 -Function3524: ; 3524 +Function3524:: ; 3524 ld hl, VramState bit 0, [hl] jp nz, UpdateTimePals jp Function32f9 ; 352f -Function352f: ; 352f +Function352f:: ; 352f ld a, [$cf82] dec a ld b, a @@ -1188,7 +1188,7 @@ Function352f: ; 352f jp TextBox ; 354b -Function354b: ; 354b +Function354b:: ; 354b call DelayFrame ld a, [$ffaa] push af @@ -1208,7 +1208,7 @@ Function354b: ; 354b ; 3567 -Function3567: ; 3567 +Function3567:: ; 3567 ld a, [hROMBank] push af call Function2c52 @@ -1220,7 +1220,7 @@ Function3567: ; 3567 ret ; 3574 -Function3574: ; 3574 +Function3574:: ; 3574 ld hl, $0001 add hl, de ld a, [hl] @@ -1245,7 +1245,7 @@ Function3574: ; 3574 ret ; 3599 -Function3599: ; 3599 +Function3599:: ; 3599 push de ld hl, $0010 add hl, de @@ -1263,7 +1263,7 @@ Function3599: ; 3599 ret ; 35b0 -Function35b0: ; 35b0 +Function35b0:: ; 35b0 ld hl, $dbfc ld a, [hli] ld h, [hl] @@ -1308,7 +1308,7 @@ Function35b0: ; 35b0 ret ; 35de -Function35de: ; 35de +Function35de:: ; 35de inc e ld hl, $0001 add hl, bc @@ -1347,7 +1347,7 @@ Function35de: ; 35de ; 3600 -CheckTrainerBattle2: ; 3600 +CheckTrainerBattle2:: ; 3600 ld a, [hROMBank] push af @@ -1362,7 +1362,7 @@ CheckTrainerBattle2: ; 3600 ; 360d -CheckTrainerBattle: ; 360d +CheckTrainerBattle:: ; 360d ; Check if any trainer on the map sees the player and wants to battle. ; Skip the player object. @@ -1454,13 +1454,13 @@ CheckTrainerBattle: ; 360d jr Function367e ; 3674 -Function3674: ; 3674 +Function3674:: ; 3674 ld a, $1 ld [$d03f], a ld a, $ff ld [MartPointer], a -Function367e: ; 367e +Function367e:: ; 367e call GetMapScriptHeaderBank ld [EngineBuffer1], a ld a, [$ffe0] @@ -1480,7 +1480,7 @@ Function367e: ; 367e ; 36a5 -FacingPlayerDistance_bc: ; 36a5 +FacingPlayerDistance_bc:: ; 36a5 push de call FacingPlayerDistance @@ -1491,7 +1491,7 @@ FacingPlayerDistance_bc: ; 36a5 ; 36ad -FacingPlayerDistance: ; 36ad +FacingPlayerDistance:: ; 36ad ; Return carry if the sprite at bc is facing the player, ; and its distance in d. @@ -1562,7 +1562,7 @@ FacingPlayerDistance: ; 36ad ; 36f5 -Function36f5: ; 36f5 +Function36f5:: ; 36f5 push bc ld hl, $0001 add hl, bc @@ -1588,7 +1588,7 @@ Function36f5: ; 36f5 ; 3718 -Function3718: ; 3718 +Function3718:: ; 3718 ld a, [BattleType] cp $1 jr .asm_3724 @@ -1616,7 +1616,7 @@ Function3718: ; 3718 -IsAPokemon: ; 3741 +IsAPokemon:: ; 3741 ; Return carry if species a is not a Pokemon. and a jr z, .NotAPokemon @@ -1635,7 +1635,7 @@ IsAPokemon: ; 3741 ; 3750 -DrawHPBar: ; 3750 +DrawHPBar:: ; 3750 ; Draw an HP bar d tiles long at hl ; Fill it up to e pixels @@ -1697,11 +1697,11 @@ DrawHPBar: ; 3750 ; 3786 -Function3786: ; 3786 +Function3786:: ; 3786 ld a, $1 ld [$c2c6], a -Function378b: ; 378b +Function378b:: ; 378b ld a, [CurPartySpecies] call IsAPokemon jr c, .asm_37ad @@ -1727,7 +1727,7 @@ Function378b: ; 378b ret ; 37b6 -Function37b6: ; 37b6 +Function37b6:: ; 37b6 push af ld a, $1 ld [$c2bc], a @@ -1737,7 +1737,7 @@ Function37b6: ; 37b6 ret ; 37c4 -Function37c4: ; 37c4 +Function37c4:: ; 37c4 push af ld a, $1 ld [$c2bc], a @@ -1745,13 +1745,13 @@ Function37c4: ; 37c4 jp Function37e2 ; 37ce -Function37ce: ; 37ce +Function37ce:: ; 37ce call Function37d5 call WaitSFX ret ; 37d5 -Function37d5: ; 37d5 +Function37d5:: ; 37d5 push af xor a ld [$c2bc], a @@ -1761,7 +1761,7 @@ Function37d5: ; 37d5 ret ; 37e2 -Function37e2: ; 37e2 +Function37e2:: ; 37e2 push hl push de push bc @@ -1778,7 +1778,7 @@ Function37e2: ; 37e2 ret ; 37f3 -Function37f3: ; 37f3 +Function37f3:: ; 37f3 call Function381e ret c ld a, [hROMBank] @@ -1812,7 +1812,7 @@ Function37f3: ; 37f3 ret ; 381e -Function381e: ; 381e +Function381e:: ; 381e and a jr z, .asm_382b cp $fc @@ -1829,7 +1829,7 @@ Function381e: ; 381e ; 382d -PrintLevel: ; 382d +PrintLevel:: ; 382d ; Print TempMonLevel at hl ld a, [TempMonLevel] @@ -1847,14 +1847,14 @@ PrintLevel: ; 382d jr Function3842 ; 383d -Function383d: ; 383d +Function383d:: ; 383d ; Print :L and all 3 digits ld [hl], $6e inc hl ld c, 3 ; 3842 -Function3842: ; 3842 +Function3842:: ; 3842 ld [$d265], a ld de, $d265 ld b, %01000001 ; flags @@ -1862,7 +1862,7 @@ Function3842: ; 3842 ; 384d -Function384d: ; 384d +Function384d:: ; 384d ld hl, $d25e ld c, a ld b, $0 @@ -1872,7 +1872,7 @@ Function384d: ; 384d ; 3856 -GetBaseData: ; 3856 +GetBaseData:: ; 3856 push bc push de push hl @@ -1930,11 +1930,11 @@ GetBaseData: ; 3856 ; 389c -GetCurNick: ; 389c +GetCurNick:: ; 389c ld a, [CurPartyMon] ld hl, PartyMonNicknames -GetNick: ; 38a2 +GetNick:: ; 38a2 ; Get nickname a from list hl. push hl @@ -1956,7 +1956,7 @@ GetNick: ; 38a2 ; 38bb -PrintBCDNumber: ; 38bb +PrintBCDNumber:: ; 38bb ; function to print a BCD (Binary-coded decimal) number ; de = address of BCD number ; hl = destination address @@ -2008,7 +2008,7 @@ PrintBCDNumber: ; 38bb ret ; 0x38f2 -PrintBCDDigit: ; 38f2 +PrintBCDDigit:: ; 38f2 and a, %00001111 and a jr z, .zeroDigit @@ -2037,7 +2037,7 @@ PrintBCDDigit: ; 38f2 ret ; 0x3917 -GetPartyParamLocation: ; 3917 +GetPartyParamLocation:: ; 3917 ; Get the location of parameter a from CurPartyMon in hl push bc ld hl, PartyMons @@ -2050,14 +2050,14 @@ GetPartyParamLocation: ; 3917 ret ; 3927 -GetPartyLocation: ; 3927 +GetPartyLocation:: ; 3927 ; Add the length of a PartyMon struct to hl a times. ld bc, PartyMon2 - PartyMon1 jp AddNTimes ; 392d -Function392d: ; 392d +Function392d:: ; 392d push hl ld a, b dec a @@ -2075,7 +2075,7 @@ Function392d: ; 392d ; 3945 -UserPartyAttr: ; 3945 +UserPartyAttr:: ; 3945 push af ld a, [hBattleTurn] and a @@ -2088,7 +2088,7 @@ UserPartyAttr: ; 3945 ; 3951 -OpponentPartyAttr: ; 3951 +OpponentPartyAttr:: ; 3951 push af ld a, [hBattleTurn] and a @@ -2101,7 +2101,7 @@ OpponentPartyAttr: ; 3951 ; 395d -BattlePartyAttr: ; 395d +BattlePartyAttr:: ; 395d ; Get attribute a from the active BattleMon's party struct. push bc ld c, a @@ -2115,7 +2115,7 @@ BattlePartyAttr: ; 395d ; 396d -OTPartyAttr: ; 396d +OTPartyAttr:: ; 396d ; Get attribute a from the active EnemyMon's party struct. push bc ld c, a @@ -2129,46 +2129,46 @@ OTPartyAttr: ; 396d ; 397d -ResetDamage: ; 397d +ResetDamage:: ; 397d xor a ld [CurDamage], a ld [CurDamage + 1], a ret ; 3985 -SetPlayerTurn: ; 3985 +SetPlayerTurn:: ; 3985 xor a ld [hBattleTurn], a ret ; 3989 -SetEnemyTurn: ; 3989 +SetEnemyTurn:: ; 3989 ld a, 1 ld [hBattleTurn], a ret ; 398e -UpdateOpponentInParty: ; 398e +UpdateOpponentInParty:: ; 398e ld a, [hBattleTurn] and a jr z, UpdateEnemyMonInParty jr UpdateBattleMonInParty ; 3995 -UpdateUserInParty: ; 3995 +UpdateUserInParty:: ; 3995 ld a, [hBattleTurn] and a jr z, UpdateBattleMonInParty jr UpdateEnemyMonInParty ; 399c -UpdateBattleMonInParty: ; 399c +UpdateBattleMonInParty:: ; 399c ; Update level, status, current HP ld a, [CurBattleMon] -Function399f: ; 399f +Function399f:: ; 399f ld hl, PartyMon1Level call GetPartyLocation @@ -2179,7 +2179,7 @@ Function399f: ; 399f jp CopyBytes ; 39b0 -UpdateEnemyMonInParty: ; 39b0 +UpdateEnemyMonInParty:: ; 39b0 ; Update level, status, current HP ; No wildmons. @@ -2199,21 +2199,21 @@ UpdateEnemyMonInParty: ; 39b0 ; 39c9 -RefreshBattleHuds: ; 39c9 +RefreshBattleHuds:: ; 39c9 call UpdateBattleHuds ld c, 3 call DelayFrames jp WaitBGMap ; 39d4 -UpdateBattleHuds: ; 39d4 +UpdateBattleHuds:: ; 39d4 callba Function3df48 callba Function3e036 ret ; 39e1 -GetBattleVar: ; 39e1 +GetBattleVar:: ; 39e1 ; Preserves hl. push hl call _GetBattleVar @@ -2221,7 +2221,7 @@ GetBattleVar: ; 39e1 ret ; 39e7 -_GetBattleVar: ; 39e7 +_GetBattleVar:: ; 39e7 ; Get variable from pair a, depending on whose turn it is. ; There are 21 variable pairs. @@ -2340,7 +2340,7 @@ _GetBattleVar: ; 39e7 ; 3a90 -Function3a90: ; 3a90 +Function3a90:: ; 3a90 inc hl ld a, [hROMBank] push af @@ -2365,7 +2365,7 @@ Function3a90: ; 3a90 ; 3ab2 -MobileTextBorder: ; 3ab2 +MobileTextBorder:: ; 3ab2 ; For mobile link battles only. ld a, [InLinkBattle] cp 4 @@ -2379,7 +2379,7 @@ MobileTextBorder: ; 3ab2 ; 3ac3 -BattleTextBox: ; 3ac3 +BattleTextBox:: ; 3ac3 ; Open a textbox and print text at hl. push hl call SpeechTextBox @@ -2392,7 +2392,7 @@ BattleTextBox: ; 3ac3 ; 3ad5 -StdBattleTextBox: ; 3ad5 +StdBattleTextBox:: ; 3ad5 ; Open a textbox and print battle text at 20:hl. ld a, [hROMBank] @@ -2409,7 +2409,7 @@ StdBattleTextBox: ; 3ad5 ; 3ae1 -Function3ae1: ; 3ae1 +Function3ae1:: ; 3ae1 ld a, BANK(BattleAnimations) rst Bankswitch @@ -2425,7 +2425,7 @@ Function3ae1: ; 3ae1 ret ; 3af0 -GetBattleAnimByte: ; 3af0 +GetBattleAnimByte:: ; 3af0 push hl push de @@ -2456,7 +2456,7 @@ GetBattleAnimByte: ; 3af0 ret ; 3b0c -Function3b0c: ; 3b0c +Function3b0c:: ; 3b0c ld a, [hLCDStatCustom] and a ret z @@ -2478,7 +2478,7 @@ Function3b0c: ; 3b0c -Function3b2a: ; 3b2a +Function3b2a:: ; 3b2a ld [$c3b8], a ld a, [hROMBank] push af @@ -2494,7 +2494,7 @@ Function3b2a: ; 3b2a ; 3b3c -Function3b3c: ; 3b3c +Function3b3c:: ; 3b3c ld [$c3b8], a ld a, [hROMBank] push af @@ -2510,7 +2510,7 @@ Function3b3c: ; 3b3c ; 3b4e -SoundRestart: ; 3b4e +SoundRestart:: ; 3b4e push hl push de @@ -2537,7 +2537,7 @@ SoundRestart: ; 3b4e ; 3b6a -UpdateSound: ; 3b6a +UpdateSound:: ; 3b6a push hl push de @@ -2564,7 +2564,7 @@ UpdateSound: ; 3b6a ; 3b86 -_LoadMusicByte: ; 3b86 +_LoadMusicByte:: ; 3b86 ; CurMusicByte = [a:de] ld [hROMBank], a @@ -2580,7 +2580,7 @@ _LoadMusicByte: ; 3b86 ; 3b97 -PlayMusic: ; 3b97 +PlayMusic:: ; 3b97 ; Play music de. push hl @@ -2616,7 +2616,7 @@ PlayMusic: ; 3b97 ; 3bbc -PlayMusic2: ; 3bbc +PlayMusic2:: ; 3bbc ; Stop playing music, then play music de. push hl @@ -2650,7 +2650,7 @@ PlayMusic2: ; 3bbc ; 3be3 -PlayCryHeader: ; 3be3 +PlayCryHeader:: ; 3be3 ; Play a cry given parameters in header de push hl @@ -2708,7 +2708,7 @@ PlayCryHeader: ; 3be3 ; 3c23 -PlaySFX: ; 3c23 +PlaySFX:: ; 3c23 ; Play sound effect de. ; Sound effects are ordered by priority (lowest to highest) @@ -2748,14 +2748,14 @@ PlaySFX: ; 3c23 ; 3c4e -WaitPlaySFX: ; 3c4e +WaitPlaySFX:: ; 3c4e call WaitSFX call PlaySFX ret ; 3c55 -WaitSFX: ; 3c55 +WaitSFX:: ; 3c55 ; infinite loop until sfx is done playing push hl @@ -2782,7 +2782,7 @@ WaitSFX: ; 3c55 ret ; 3c74 -Function3c74: ; 3c74 +Function3c74:: ; 3c74 push hl ld hl, $c1cc bit 0, [hl] @@ -2806,37 +2806,37 @@ Function3c74: ; 3c74 ret ; 3c97 -MaxVolume: ; 3c97 +MaxVolume:: ; 3c97 ld a, $77 ; max ld [Volume], a ret ; 3c9d -LowVolume: ; 3c9d +LowVolume:: ; 3c9d ld a, $33 ; 40% ld [Volume], a ret ; 3ca3 -VolumeOff: ; 3ca3 +VolumeOff:: ; 3ca3 xor a ld [Volume], a ret ; 3ca8 -Function3ca8: ; 3ca8 +Function3ca8:: ; 3ca8 ld a, $4 ld [MusicFade], a ret ; 3cae -Function3cae: ; 3cae +Function3cae:: ; 3cae ld a, $84 ld [MusicFade], a ret ; 3cb4 -Function3cb4: ; 3cb4 +Function3cb4:: ; 3cb4 .asm_3cb4 and a ret z @@ -2845,7 +2845,7 @@ Function3cb4: ; 3cb4 jr .asm_3cb4 ; 3cbc -Function3cbc: ; 3cbc +Function3cbc:: ; 3cbc push hl push de push bc @@ -2871,7 +2871,7 @@ Function3cbc: ; 3cbc ret ; 3cdf -Function3cdf: ; 3cdf +Function3cdf:: ; 3cdf push hl push de push bc @@ -2897,7 +2897,7 @@ Function3cdf: ; 3cdf ret ; 3d03 -Function3d03: ; 3d03 +Function3d03:: ; 3d03 push hl push de push bc @@ -2925,7 +2925,7 @@ Function3d03: ; 3d03 ret ; 3d2f -Function3d2f: ; 3d2f +Function3d2f:: ; 3d2f ld a, [$c2c1] and a jr z, Function3d47 @@ -2939,7 +2939,7 @@ Function3d2f: ; 3d2f ret ; 3d47 -Function3d47: ; 3d47 +Function3d47:: ; 3d47 push hl push de push bc @@ -2958,7 +2958,7 @@ Function3d47: ; 3d47 ret ; 3d62 -Function3d62: ; 3d62 +Function3d62:: ; 3d62 ld a, [PlayerState] cp $4 jr z, .asm_3d7b @@ -2996,14 +2996,14 @@ Function3d62: ; 3d62 ret ; 3d97 -Function3d97: ; 3d97 +Function3d97:: ; 3d97 call Function3d62 ret c call Function2cbd ret ; 3d9f -Function3d9f: ; 3d9f +Function3d9f:: ; 3d9f ld a, $20 ld [$c498], a ld [$c49c], a @@ -3037,7 +3037,7 @@ Function3d9f: ; 3d9f ret ; 3dde -CheckSFX: ; 3dde +CheckSFX:: ; 3dde ; returns carry if sfx channels are active ld a, [$c1cc] ; 1 bit 0, a @@ -3058,7 +3058,7 @@ CheckSFX: ; 3dde ret ; 3dfe -Function3dfe: ; 3dfe +Function3dfe:: ; 3dfe xor a ld [$c1cc], a ld [SoundInput], a @@ -3071,7 +3071,7 @@ Function3dfe: ; 3dfe ; 3e10 -ChannelsOff: ; 3e10 +ChannelsOff:: ; 3e10 ; Quickly turn off music channels xor a ld [Channel1Flags], a @@ -3082,7 +3082,7 @@ ChannelsOff: ; 3e10 ret ; 3e21 -SFXChannelsOff: ; 3e21 +SFXChannelsOff:: ; 3e21 ; Quickly turn off sound effect channels xor a ld [$c1cc], a @@ -3093,7 +3093,7 @@ SFXChannelsOff: ; 3e21 ret ; 3e32 -Function3e32: ; 3e32 +Function3e32:: ; 3e32 cp $2 ld [$c988], a ld a, l @@ -3123,7 +3123,7 @@ Function3e32: ; 3e32 ; 3e60 -Function3e60: ; 3e60 +Function3e60:: ; 3e60 ld [$c986], a ld a, l ld [$c987], a @@ -3145,7 +3145,7 @@ Function3e60: ; 3e60 ; 3e80 -Function3e80: ; 3e80 +Function3e80:: ; 3e80 ld a, [hROMBank] push af ld a, BANK(Function1116c5) @@ -3162,7 +3162,7 @@ Function3e80: ; 3e80 ; 3e93 -Timer: ; 3e93 +Timer:: ; 3e93 push af push bc push de @@ -3220,7 +3220,7 @@ Timer: ; 3e93 reti ; 3ed7 -Function3ed7: ; 3ed7 +Function3ed7:: ; 3ed7 ld [$dc02], a ld a, [hROMBank] push af @@ -3236,7 +3236,7 @@ Function3ed7: ; 3ed7 ret ; 3eea -Function3eea: ; 3eea +Function3eea:: ; 3eea push hl push bc ld de, $0939 @@ -3252,7 +3252,7 @@ Function3eea: ; 3eea ret ; 3efd -Function3efd: ; 3efd +Function3efd:: ; 3efd push hl ld hl, $c590 ld b, $4 @@ -3263,7 +3263,7 @@ Function3efd: ; 3efd ret ; 3f0d -Function3f0d: ; 3f0d +Function3f0d:: ; 3f0d push hl push bc ld de, $0939 @@ -3279,7 +3279,7 @@ Function3f0d: ; 3f0d ret ; 3f20 -Function3f20: ; 3f20 +Function3f20:: ; 3f20 ld hl, AttrMap ld b, $6 ld c, $14 @@ -3291,7 +3291,7 @@ Function3f20: ; 3f20 ret ; 3f35 -Function3f35: ; 3f35 +Function3f35:: ; 3f35 ld a, $6 ld de, $0014 .asm_3f3a @@ -3309,7 +3309,7 @@ Function3f35: ; 3f35 ret ; 3f47 -Function3f47: ; 3f47 +Function3f47:: ; 3f47 push bc call Function3f58 pop bc @@ -3323,24 +3323,24 @@ Function3f47: ; 3f47 ret ; 3f58 -Function3f58: ; 3f58 +Function3f58:: ; 3f58 ld a, $63 ld d, $62 ld e, $64 jr Function3f6e -Function3f60: ; 3f60 +Function3f60:: ; 3f60 ld a, $68 ld d, $67 ld e, $69 jr Function3f6e -Function3f68: ; 3f68 +Function3f68:: ; 3f68 ld a, $7f ld d, $65 ld e, $66 -Function3f6e: ; 3f6e +Function3f6e:: ; 3f6e push hl ld [hl], d inc hl @@ -3355,7 +3355,7 @@ Function3f6e: ; 3f6e ret ; 3f7c -Function3f7c: ; 3f7c +Function3f7c:: ; 3f7c call Function1cfd call Function1c53 dec b @@ -3364,7 +3364,7 @@ Function3f7c: ; 3f7c ret ; 3f88 -Function3f88: ; 3f88 +Function3f88:: ; 3f88 ld hl, $d000 ld b, $0 .asm_3f8d @@ -3385,7 +3385,7 @@ Function3f88: ; 3f88 ret ; 3f9f -Function3f9f: ; 3f9f +Function3f9f:: ; 3f9f ld hl, $d000 .asm_3fa2 push bc diff --git a/home/copy.asm b/home/copy.asm index 633c993be..538669654 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -1,7 +1,7 @@ ; Functions to copy data from ROM. -Functiondc9: ; dc9 +Functiondc9:: ; dc9 ld a, [rLCDC] bit 7, a jp z, Copy2bpp @@ -17,7 +17,7 @@ Functiondc9: ; dc9 ret ; ddc -Functionddc: ; ddc +Functionddc:: ; ddc ld a, [rLCDC] bit 7, a jp z, Copy1bpp @@ -33,7 +33,7 @@ Functionddc: ; ddc ret ; def -Functiondef: ; def +Functiondef:: ; def ld [hBuffer], a ld a, [hROMBank] push af @@ -45,7 +45,7 @@ Functiondef: ; def ret ; dfd -Functiondfd: ; dfd +Functiondfd:: ; dfd dec c ld a, [hBGMapMode] push af @@ -105,37 +105,37 @@ Functiondfd: ; dfd -Functione4a: ; e4a +Functione4a:: ; e4a callba Function14135 ret ; e51 -Functione51: ; e51 +Functione51:: ; e51 callba Functionfb449 ret ; e58 -Functione58: ; e58 +Functione58:: ; e58 callba Functionfb4be ret ; e5f -Functione5f: ; e5f +Functione5f:: ; e5f callba Functionfb48a callba Functionfb4b0 ret ; e6c -Functione6c: ; e6c +Functione6c:: ; e6c callba Functionfb4b0 ret ; e73 -Functione73: ; e73 +Functione73:: ; e73 push de ld a, $0 call GetSRAMBank @@ -153,7 +153,7 @@ Functione73: ; e73 -FarCopyBytes: ; e8d +FarCopyBytes:: ; e8d ; copy bc bytes from a:hl to de ld [hBuffer], a @@ -170,7 +170,7 @@ FarCopyBytes: ; e8d ; 0xe9b -FarCopyBytesDouble: ; e9b +FarCopyBytesDouble:: ; e9b ; Copy bc bytes from a:hl to bc*2 bytes at de, ; doubling each byte in the process. @@ -209,7 +209,7 @@ FarCopyBytesDouble: ; e9b ; 0xeba -Request2bpp: ; eba +Request2bpp:: ; eba ld a, [hBGMapMode] push af xor a @@ -283,7 +283,7 @@ Request2bpp: ; eba ; f1e -Request1bpp: ; f1e +Request1bpp:: ; f1e ld a, [hBGMapMode] push af xor a @@ -356,12 +356,12 @@ Request1bpp: ; f1e ; f82 -Get2bpp: ; f82 +Get2bpp:: ; f82 ld a, [rLCDC] bit 7, a jp nz, Request2bpp -Copy2bpp: ; f89 +Copy2bpp:: ; f89 ; copy c 2bpp tiles from b:de to hl push hl @@ -387,12 +387,12 @@ Copy2bpp: ; f89 ; f9d -Get1bpp: ; f9d +Get1bpp:: ; f9d ld a, [rLCDC] bit 7, a jp nz, Request1bpp -Copy1bpp: ; fa4 +Copy1bpp:: ; fa4 ; copy c 1bpp tiles from b:de to hl push de diff --git a/home/copy2.asm b/home/copy2.asm index bdfbe9fdf..136c5f602 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -1,4 +1,4 @@ -CopyBytes: ; 0x3026 +CopyBytes:: ; 0x3026 ; copy bc bytes from hl to de inc b ; we bail the moment b hits 0, so include the last run inc c ; same thing; include last byte @@ -14,7 +14,7 @@ CopyBytes: ; 0x3026 jr nz, .CopyByte ret -SwapBytes: ; 0x3034 +SwapBytes:: ; 0x3034 ; swap bc bytes between hl and de .Loop ; stash [hl] away on the stack @@ -37,7 +37,7 @@ SwapBytes: ; 0x3034 jr nz, .Loop ret -ByteFill: ; 0x3041 +ByteFill:: ; 0x3041 ; fill bc bytes with the value of a, starting at hl inc b ; we bail the moment b hits 0, so include the last run inc c ; same thing; include last byte @@ -51,7 +51,7 @@ ByteFill: ; 0x3041 jr nz, .PutByte ret -GetFarByte: ; 0x304d +GetFarByte:: ; 0x304d ; retrieve a single byte from a:hl, and return it in a. ; bankswitch to new bank ld [hBuffer], a @@ -72,7 +72,7 @@ GetFarByte: ; 0x304d ld a, [hBuffer] ret -GetFarHalfword: ; 0x305d +GetFarHalfword:: ; 0x305d ; retrieve a halfword from a:hl, and return it in hl. ; bankswitch to new bank ld [hBuffer], a @@ -92,7 +92,7 @@ GetFarHalfword: ; 0x305d ret ; 0x306b -FarCopyWRAM: ; 306b +FarCopyWRAM:: ; 306b ld [hBuffer], a ld a, [rSVBK] push af @@ -104,7 +104,7 @@ FarCopyWRAM: ; 306b ret ; 307b -GetFarWRAMByte: ; 307b +GetFarWRAMByte:: ; 307b ld [hBuffer], a ld a, [rSVBK] push af @@ -118,7 +118,7 @@ GetFarWRAMByte: ; 307b ret ; 308d -GetFarWRAMWord: ; 308d +GetFarWRAMWord:: ; 308d ld [hBuffer], a ld a, [rSVBK] push af diff --git a/home/decompress.asm b/home/decompress.asm index 8d39cd968..23c86864a 100644 --- a/home/decompress.asm +++ b/home/decompress.asm @@ -1,4 +1,4 @@ -FarDecompress: ; b40 +FarDecompress:: ; b40 ; Decompress graphics data at a:hl to de ; put a away for a sec @@ -20,7 +20,7 @@ FarDecompress: ; b40 ; b50 -Decompress: ; b50 +Decompress:: ; b50 ; Pokemon Crystal uses an lz variant for compression. ; This is mainly used for graphics, but the intro's diff --git a/home/delay.asm b/home/delay.asm index 4e8b2147c..b9f84fcdf 100644 --- a/home/delay.asm +++ b/home/delay.asm @@ -1,4 +1,4 @@ -DelayFrame: ; 45a +DelayFrame:: ; 45a ; Wait for one frame ld a, 1 ld [VBlankOccurred], a @@ -13,7 +13,7 @@ DelayFrame: ; 45a ; 468 -DelayFrames: ; 468 +DelayFrames:: ; 468 ; Wait c frames call DelayFrame dec c diff --git a/home/double_speed.asm b/home/double_speed.asm index fc1234215..4bb6e1253 100644 --- a/home/double_speed.asm +++ b/home/double_speed.asm @@ -5,20 +5,20 @@ ; and double speed at any time, but LCD output ; collapses during the switch. -DoubleSpeed: ; 2fef +DoubleSpeed:: ; 2fef ld hl, rKEY1 bit 7, [hl] jr z, SwitchSpeed ret ; 2ff7 -NormalSpeed: ; 2ff7 +NormalSpeed:: ; 2ff7 ld hl, rKEY1 bit 7, [hl] ret z ; 2ffd -SwitchSpeed: ; 2ffd +SwitchSpeed:: ; 2ffd set 0, [hl] xor a ld [rIF], a diff --git a/home/fade.asm b/home/fade.asm index d67211e29..71a701a09 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -1,7 +1,7 @@ ; Functions to fade the screen in and out. -Function48c: ; 48c +Function48c:: ; 48c ld a, [TimeOfDayPal] ld b, a ld hl, IncGradGBPalTable_11 @@ -22,7 +22,7 @@ Function48c: ; 48c ; 4a3 -Function4a3: ; 4a3 +Function4a3:: ; 4a3 ld a, [hCGB] and a jr z, .asm_4af @@ -36,7 +36,7 @@ Function4a3: ; 4a3 jr FadeOut ; 4b6 -Function4b6: ; 4b6 +Function4b6:: ; 4b6 ld a, [hCGB] and a jr z, .asm_4c2 @@ -49,7 +49,7 @@ Function4b6: ; 4b6 ld b, 3 ; 4c7 -FadeOut: ; 4c7 +FadeOut:: ; 4c7 push de ld a, [hli] call DmgToCgbBGPals @@ -66,7 +66,7 @@ FadeOut: ; 4c7 ret ; 4dd -Function4dd: ; 4dd +Function4dd:: ; 4dd ld a, [hCGB] and a jr z, .asm_4e9 @@ -80,7 +80,7 @@ Function4dd: ; 4dd jr FadeIn ; 4f0 -Function4f0: ; 4f0 +Function4f0:: ; 4f0 ld a, [hCGB] and a jr z, .asm_4fc @@ -94,7 +94,7 @@ Function4f0: ; 4f0 ; fallthrough ; 501 -FadeIn: ; 501 +FadeIn:: ; 501 push de ld a, [hld] ld d, a @@ -113,22 +113,22 @@ FadeIn: ; 501 ; 517 -IncGradGBPalTable_00: db %11111111, %11111111, %11111111 -IncGradGBPalTable_01: db %11111110, %11111110, %11111110 -IncGradGBPalTable_02: db %11111001, %11111001, %11111001 -IncGradGBPalTable_03: db %11100100, %11100100, %11100100 -IncGradGBPalTable_04: db %11100100, %11100100, %11100100 -IncGradGBPalTable_05: db %10010000, %10010000, %10010000 -IncGradGBPalTable_06: db %01000000, %01000000, %01000000 -IncGradGBPalTable_07: db %00000000, %00000000, %00000000 +IncGradGBPalTable_00:: db %11111111, %11111111, %11111111 +IncGradGBPalTable_01:: db %11111110, %11111110, %11111110 +IncGradGBPalTable_02:: db %11111001, %11111001, %11111001 +IncGradGBPalTable_03:: db %11100100, %11100100, %11100100 +IncGradGBPalTable_04:: db %11100100, %11100100, %11100100 +IncGradGBPalTable_05:: db %10010000, %10010000, %10010000 +IncGradGBPalTable_06:: db %01000000, %01000000, %01000000 +IncGradGBPalTable_07:: db %00000000, %00000000, %00000000 ; bgp obp1 obp2 -IncGradGBPalTable_08: db %11111111, %11111111, %11111111 -IncGradGBPalTable_09: db %11111110, %11111110, %11111000 -IncGradGBPalTable_10: db %11111001, %11100100, %11100100 -IncGradGBPalTable_11: db %11100100, %11010000, %11100000 -IncGradGBPalTable_12: db %11100100, %11010000, %11100000 -IncGradGBPalTable_13: db %10010000, %10000000, %10010000 -IncGradGBPalTable_14: db %01000000, %01000000, %01000000 -IncGradGBPalTable_15: db %00000000, %00000000, %00000000 +IncGradGBPalTable_08:: db %11111111, %11111111, %11111111 +IncGradGBPalTable_09:: db %11111110, %11111110, %11111000 +IncGradGBPalTable_10:: db %11111001, %11100100, %11100100 +IncGradGBPalTable_11:: db %11100100, %11010000, %11100000 +IncGradGBPalTable_12:: db %11100100, %11010000, %11100000 +IncGradGBPalTable_13:: db %10010000, %10000000, %10010000 +IncGradGBPalTable_14:: db %01000000, %01000000, %01000000 +IncGradGBPalTable_15:: db %00000000, %00000000, %00000000 ; 547 diff --git a/home/farcall.asm b/home/farcall.asm index bdee3bf38..8539fcc2f 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -1,4 +1,4 @@ -FarCall_de: ; 2d54 +FarCall_de:: ; 2d54 ; Call a:de. ; Preserves other registers. @@ -16,7 +16,7 @@ FarCall_de: ; 2d54 ; 2d63 -FarCall_hl: ; 2d63 +FarCall_hl:: ; 2d63 ; Call a:hl. ; Preserves other registers. @@ -28,7 +28,7 @@ FarCall_hl: ; 2d63 call Function2d82 ; 2d6e -ReturnFarCall: ; 2d6e +ReturnFarCall:: ; 2d6e ; We want to retain the contents of f. ; To do this, we can pop to bc instead of af. @@ -49,7 +49,7 @@ ReturnFarCall: ; 2d6e ret ; 2d82 -Function2d82: ; 2d82 +Function2d82:: ; 2d82 jp [hl] ; 2d83 diff --git a/home/flag.asm b/home/flag.asm index e99248a3e..dba06532c 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -1,11 +1,11 @@ -Function2e50: ; 2e50 +Function2e50:: ; 2e50 xor a ld hl, EventFlags ld [hli], a ret ; 2e56 -Function2e56: ; 2e56 +Function2e56:: ; 2e56 xor a ld hl, BikeFlags ld [hli], a @@ -13,7 +13,7 @@ Function2e56: ; 2e56 ret ; 2e5d -Function2e5d: ; 2e5d +Function2e5d:: ; 2e5d ld a, [$d19a] cp $2 jr z, .asm_2e69 @@ -28,12 +28,12 @@ Function2e5d: ; 2e5d ; 2e6f -EventFlagAction: ; 0x2e6f +EventFlagAction:: ; 0x2e6f ld hl, EventFlags call FlagAction ret -FlagAction: ; 0x2e76 +FlagAction:: ; 0x2e76 ; Perform action b on bit de in flag array hl. ; inputs: @@ -102,7 +102,7 @@ FlagAction: ; 0x2e76 ; 0x2ead -Function2ead: ; 2ead +Function2ead:: ; 2ead ld de, ENGINE_POKEDEX ld b, CHECK_FLAG callba EngineFlagAction diff --git a/home/game_time.asm b/home/game_time.asm index ee52488f4..23f0cfe63 100644 --- a/home/game_time.asm +++ b/home/game_time.asm @@ -1,4 +1,4 @@ -ResetGameTime: ; 208a +ResetGameTime:: ; 208a xor a ld [GameTimeCap], a ld [GameTimeHours], a @@ -10,7 +10,7 @@ ResetGameTime: ; 208a ; 209e -GameTimer: ; 209e +GameTimer:: ; 209e nop @@ -27,7 +27,7 @@ GameTimer: ; 209e ; 20ad -UpdateGameTimer: ; 20ad +UpdateGameTimer:: ; 20ad ; Increment the game timer by one frame. ; The game timer is capped at 999:59:59.00. diff --git a/home/handshake.asm b/home/handshake.asm index 8ed1473e4..b72b861c2 100644 --- a/home/handshake.asm +++ b/home/handshake.asm @@ -1,4 +1,4 @@ -AskSerial: ; 2063 +AskSerial:: ; 2063 ; send out a handshake while serial int is off ld a, [$c2d4] bit 0, a diff --git a/home/init.asm b/home/init.asm index 46ff1de4b..b879b9802 100644 --- a/home/init.asm +++ b/home/init.asm @@ -1,4 +1,4 @@ -Reset: ; 150 +Reset:: ; 150 di call SoundRestart xor a @@ -20,7 +20,7 @@ Reset: ; 150 ; 16e -_Start: ; 16e +_Start:: ; 16e cp $11 jr z, .asm_175 xor a @@ -36,7 +36,7 @@ _Start: ; 16e ; 17d -Init: ; 17d +Init:: ; 17d di @@ -177,7 +177,7 @@ Init: ; 17d ; 245 -ClearVRAM: ; 245 +ClearVRAM:: ; 245 ; Wipe VRAM banks 0 and 1 ld a, 1 @@ -194,7 +194,7 @@ ClearVRAM: ; 245 ret ; 25a -ClearWRAM: ; 25a +ClearWRAM:: ; 25a ; Wipe swappable WRAM banks (1-7) ld a, 1 @@ -212,7 +212,7 @@ ClearWRAM: ; 25a ret ; 270 -Function270: ; 270 +Function270:: ; 270 ld a, $0 call GetSRAMBank ld hl, $a000 diff --git a/home/item.asm b/home/item.asm index 0906a19f6..3ba5db2a8 100644 --- a/home/item.asm +++ b/home/item.asm @@ -1,9 +1,9 @@ -DoItemEffect: ; 2f3f +DoItemEffect:: ; 2f3f callba _DoItemEffect ret ; 2f46 -CheckTossableItem: ; 2f46 +CheckTossableItem:: ; 2f46 push hl push de push bc @@ -14,7 +14,7 @@ CheckTossableItem: ; 2f46 ret ; 2f53 -TossItem: ; 2f53 +TossItem:: ; 2f53 push hl push de push bc @@ -34,7 +34,7 @@ TossItem: ; 2f53 ret ; 2f66 -ReceiveItem: ; 2f66 +ReceiveItem:: ; 2f66 push bc ld a, [hROMBank] push af @@ -54,7 +54,7 @@ ReceiveItem: ; 2f66 ret ; 2f79 -CheckItem: ; 2f79 +CheckItem:: ; 2f79 push hl push de push bc diff --git a/home/joypad.asm b/home/joypad.asm index a55bb204b..532763914 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -1,4 +1,4 @@ -JoypadInt: ; 92e +JoypadInt:: ; 92e ; Replaced by Joypad, called from VBlank instead of the useless ; joypad interrupt. @@ -6,7 +6,7 @@ JoypadInt: ; 92e reti ; 92f -ClearJoypad: ; 92f +ClearJoypad:: ; 92f xor a ; Pressed this frame (delta) ld [hJoyPressed], a @@ -15,7 +15,7 @@ ClearJoypad: ; 92f ret ; 935 -Joypad: ; 935 +Joypad:: ; 935 ; Read the joypad register and translate it to something more ; workable for use in-game. There are 8 buttons, so we can use ; one byte to contain all player input. @@ -109,7 +109,7 @@ Joypad: ; 935 ; 984 -GetJoypad: ; 984 +GetJoypad:: ; 984 ; Update mirror joypad input from hJoypadDown (real input) ; hJoyReleased: released this frame (delta) @@ -238,7 +238,7 @@ GetJoypad: ; 984 ; 9ee -StartAutoInput: ; 9ee +StartAutoInput:: ; 9ee ; Start reading automated input stream at a:hl. ld [AutoInputBank], a @@ -261,7 +261,7 @@ StartAutoInput: ; 9ee ; a0a -StopAutoInput: ; a0a +StopAutoInput:: ; a0a ; Clear variables related to automated input. xor a ld [AutoInputBank], a @@ -274,7 +274,7 @@ StopAutoInput: ; a0a ; a1b -Functiona1b: ; a1b +Functiona1b:: ; a1b call DelayFrame @@ -302,7 +302,7 @@ Functiona1b: ; a1b ; a36 -Functiona36: ; a36 +Functiona36:: ; a36 call DelayFrame call GetJoypad ld a, [hJoyPressed] @@ -312,7 +312,7 @@ Functiona36: ; a36 jr Functiona36 ; a46 -Functiona46: ; a46 +Functiona46:: ; a46 ld a, [hOAMUpdate] push af ld a, 1 @@ -324,7 +324,7 @@ Functiona46: ; a46 ret ; a57 -Functiona57: ; a57 +Functiona57:: ; a57 call GetJoypad ld a, [$ffaa] and a @@ -354,7 +354,7 @@ Functiona57: ; a57 ret ; a80 -Functiona80: ; a80 +Functiona80:: ; a80 ld a, [$ffaf] push af ld a, [$ffb0] @@ -379,7 +379,7 @@ Functiona80: ; a80 ret ; aa5 -Functionaa5: ; aa5 +Functionaa5:: ; aa5 call Functiona57 ld a, [$ffa9] and A_BUTTON | B_BUTTON @@ -387,7 +387,7 @@ Functionaa5: ; aa5 ret ; aaf -Functionaaf: ; aaf +Functionaaf:: ; aaf ld a, [InLinkBattle] and a jr nz, .asm_ac1 @@ -403,7 +403,7 @@ Functionaaf: ; aaf jp DelayFrames ; ac6 -Functionac6: ; ac6 +Functionac6:: ; ac6 ld a, [hOAMUpdate] push af ld a, $1 @@ -430,7 +430,7 @@ Functionac6: ; ac6 ret ; af5 -Functionaf5: ; af5 +Functionaf5:: ; af5 ld a, [$ff9b] and $10 jr z, .asm_aff @@ -445,7 +445,7 @@ Functionaf5: ; af5 ret ; b06 -Functionb06: ; b06 +Functionb06:: ; b06 push bc ld a, [hl] ld b, a diff --git a/home/lcd.asm b/home/lcd.asm index 9c86eaa5c..5a1b6cfda 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -1,7 +1,7 @@ ; LCD handling -Function547: ; 547 +Function547:: ; 547 ld a, [hLCDStatCustom] cp rSCX & $ff ret nz @@ -12,7 +12,7 @@ Function547: ; 547 ; 552 -LCD: ; 552 +LCD:: ; 552 push af ld a, [hLCDStatCustom] and a @@ -37,7 +37,7 @@ LCD: ; 552 ; 568 -DisableLCD: ; 568 +DisableLCD:: ; 568 ; Turn the LCD off ; Don't need to do anything if the LCD is already off @@ -72,7 +72,7 @@ DisableLCD: ; 568 ; 58a -EnableLCD: ; 58a +EnableLCD:: ; 58a ld a, [rLCDC] set 7, a ; lcd enable ld [rLCDC], a diff --git a/home/map.asm b/home/map.asm index 6094332e7..11e2f4e5a 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1,6 +1,6 @@ ; Functions dealing with rendering and interacting with maps. -Function210f: ; 210f +Function210f:: ; 210f ld hl, $c7e8 ld bc, $0018 ld a, $0 @@ -8,7 +8,7 @@ Function210f: ; 210f ret ; 211b -Function211b: ; 211b +Function211b:: ; 211b push hl ld hl, $dbf7 ld a, [hli] @@ -24,7 +24,7 @@ Function211b: ; 211b ret ; 212a -Function212a: ; 212a +Function212a:: ; 212a ld a, [MapGroup] ld b, a ld a, [MapNumber] @@ -42,7 +42,7 @@ Function212a: ; 212a ret ; 2147 -Function2147: ; 2147 +Function2147:: ; 2147 push bc ld a, [hROMBank] push af @@ -87,13 +87,13 @@ Function2147: ; 2147 ret ; 2173 -Function2173: ; 2173 +Function2173:: ; 2173 call Function217a call Functiondb1 ret ; 217a -Function217a: ; 217a +Function217a:: ; 217a ld a, [hROMBank] push af @@ -115,7 +115,7 @@ Function217a: ; 217a ret ; 2198 -Function2198: ; 2198 +Function2198:: ; 2198 ld a, [$d194] ld e, a ld a, [$d195] @@ -211,7 +211,7 @@ endr ret ; 222a -Function222a: ; 222a +Function222a:: ; 222a ld a, $fa ld [$ff9f], a callba RunMapSetupScript @@ -220,7 +220,7 @@ Function222a: ; 222a ret ; 2238 -Function2238: ; 2238 +Function2238:: ; 2238 call Function2252 ret nc push bc @@ -234,14 +234,14 @@ Function2238: ; 2238 -Function224a: ; 224a +Function224a:: ; 224a call Function2252 ret nc call Function22a7 ret ; 2252 -Function2252: ; 2252 +Function2252:: ; 2252 callba Function1499a ret nc @@ -257,7 +257,7 @@ Function2252: ; 2252 ret ; 2266 -Function2266: ; 2266 +Function2266:: ; 2266 ld a, [MapY] sub $4 ld e, a @@ -308,14 +308,14 @@ Function2266: ; 2266 ret ; 22a3 -Function22a3: ; 22a3 +Function22a3:: ; 22a3 inc hl inc hl scf ret ; 22a7 -Function22a7: ; 22a7 +Function22a7:: ; 22a7 ld a, [hROMBank] push af @@ -328,7 +328,7 @@ Function22a7: ; 22a7 ret ; 22b4 -Function22b4: ; 22b4 +Function22b4:: ; 22b4 push bc ld hl, $dbfc ld a, [hli] @@ -365,14 +365,14 @@ Function22b4: ; 22b4 -CheckOutdoorMap: ; 22ee +CheckOutdoorMap:: ; 22ee cp ROUTE ret z cp TOWN ret ; 22f4 -CheckIndoorMap: ; 22f4 +CheckIndoorMap:: ; 22f4 cp INDOOR ret z cp CAVE @@ -383,7 +383,7 @@ CheckIndoorMap: ; 22f4 ret ; 2300 -Function2300: ; 2300 +Function2300:: ; 2300 cp INDOOR ret z cp GATE @@ -393,7 +393,7 @@ Function2300: ; 2300 ; 2309 -Function2309: ; 2309 +Function2309:: ; 2309 call Function2326 call Function2c52 call Function234f @@ -402,7 +402,7 @@ Function2309: ; 2309 ret ; 2317 -Function2317: ; 2317 +Function2317:: ; 2317 call Function2326 call Function2c52 call Function234f @@ -411,7 +411,7 @@ Function2317: ; 2317 ret ; 2326 -Function2326: ; 2326 +Function2326:: ; 2326 call Function2c3d call SwitchToMapBank call GetSecondaryMapHeaderPointer @@ -420,7 +420,7 @@ Function2326: ; 2326 ret ; 2336 -Function2336: ; 2336 +Function2336:: ; 2336 push af ld hl, MapEventHeaderPointer ld a, [hli] @@ -438,7 +438,7 @@ Function2336: ; 2336 ret ; 234f -Function234f: ; 234f +Function234f:: ; 234f ld hl, MapScriptHeaderPointer ld a, [hli] ld h, [hl] @@ -448,7 +448,7 @@ Function234f: ; 234f ret ; 235c -Function235c: ; 235c +Function235c:: ; 235c ld de, $d19d ld c, $c .asm_2361 @@ -460,7 +460,7 @@ Function235c: ; 235c ret ; 2368 -Function2368: ; 2368 +Function2368:: ; 2368 ld a, $ff ld [NorthConnectedMapGroup], a ld [SouthConnectedMapGroup], a @@ -498,7 +498,7 @@ Function2368: ; 2368 ; 23a3 -GetMapConnection: ; 23a3 +GetMapConnection:: ; 23a3 ; Load map connection struct at hl into de. ld c, SouthMapConnection - NorthMapConnection .loop @@ -511,7 +511,7 @@ GetMapConnection: ; 23a3 ; 23ac -Function23ac: ; 23ac +Function23ac:: ; 23ac ld a, [hli] ld c, a ld [$dc07], a @@ -527,7 +527,7 @@ Function23ac: ; 23ac ret ; 23c3 -Function23c3: ; 23c3 +Function23c3:: ; 23c3 ld a, [hli] ld c, a ld [$dc0a], a @@ -543,7 +543,7 @@ Function23c3: ; 23c3 ret ; 23da -Function23da: ; 23da +Function23da:: ; 23da ld a, [hli] ld c, a ld [$dbfb], a @@ -559,7 +559,7 @@ Function23da: ; 23da ret ; 23f1 -Function23f1: ; 23f1 +Function23f1:: ; 23f1 ld a, [hli] ld c, a ld [$dbfe], a @@ -575,7 +575,7 @@ Function23f1: ; 23f1 ret ; 2408 -Function2408: ; 2408 +Function2408:: ; 2408 ld a, [hli] ld c, a ld [$dc01], a @@ -591,7 +591,7 @@ Function2408: ; 2408 ret ; 241f -Function241f: ; 241f +Function241f:: ; 241f push hl call Function2471 pop de @@ -628,7 +628,7 @@ Function241f: ; 241f ret ; 2457 -Function2457: ; 2457 +Function2457:: ; 2457 and a ret z ld c, a @@ -653,7 +653,7 @@ Function2457: ; 2457 ret ; 2471 -Function2471: ; 2471 +Function2471:: ; 2471 ld hl, $d4fe ld bc, $01e0 xor a @@ -670,7 +670,7 @@ Function2471: ; 2471 ret ; 248a -Function248a: ; 248a +Function248a:: ; 248a call GetMapScriptHeaderBank rst Bankswitch @@ -701,7 +701,7 @@ Function248a: ; 248a ret ; 24ba -Function24ba: ; 24ba +Function24ba:: ; 24ba ld a, [$d149] ld [$dcac], a ld a, [$d14a] @@ -711,7 +711,7 @@ Function24ba: ; 24ba ret ; 24cd -Function24cd: ; 24cd +Function24cd:: ; 24cd ld hl, OverworldMap ld bc, OverworldMapEnd - OverworldMap ld a, 0 @@ -725,7 +725,7 @@ Function24cd: ; 24cd -Function24e4: ; 24e4 +Function24e4:: ; 24e4 ld a, [hROMBank] push af @@ -777,7 +777,7 @@ Function24e4: ; 24e4 -FillMapConnections: ; 2524 +FillMapConnections:: ; 2524 ; North ld a, [NorthConnectedMapGroup] @@ -876,8 +876,8 @@ FillMapConnections: ; 2524 ; 25d3 -FillNorthConnectionStrip: -FillSouthConnectionStrip: ; 25d3 +FillNorthConnectionStrip:: +FillSouthConnectionStrip:: ; 25d3 ld c, 3 .y @@ -913,8 +913,8 @@ FillSouthConnectionStrip: ; 25d3 ; 25f6 -FillWestConnectionStrip: -FillEastConnectionStrip: ; 25f6 +FillWestConnectionStrip:: +FillEastConnectionStrip:: ; 25f6 .asm_25f6 ld a, [MapWidth] @@ -952,13 +952,13 @@ FillEastConnectionStrip: ; 25f6 ret ; 261b -Function261b: ; 261b +Function261b:: ; 261b ld [$d432], a ret ; 261f -CallScript: ; 261f +CallScript:: ; 261f ; Call a script at a:hl. ld [ScriptBank], a @@ -974,7 +974,7 @@ CallScript: ; 261f ret ; 2631 -Function2631: ; 2631 +Function2631:: ; 2631 ld a, [ScriptRunning] and a ret nz @@ -982,7 +982,7 @@ Function2631: ; 2631 jr CallScript ; 263b -Function263b: ; 263b +Function263b:: ; 263b ld b, a ld a, [hROMBank] push af @@ -1002,7 +1002,7 @@ Function263b: ; 263b ret ; 2653 -Function2653: ; 2653 +Function2653:: ; 2653 ld a, [$dc0a] ld c, a and a @@ -1033,7 +1033,7 @@ Function2653: ; 2653 ret ; 2674 -Function2674: ; 2674 +Function2674:: ; 2674 callba Unknown_0x974f3 ld a, [ScriptMode] push af @@ -1050,7 +1050,7 @@ Function2674: ; 2674 ret ; 269a -Function269a: ; 269a +Function269a:: ; 269a ld a, [hROMBank] push af @@ -1073,7 +1073,7 @@ Function269a: ; 269a ret ; 26b7 -Function26b7: ; 26b7 +Function26b7:: ; 26b7 ; Call a:de. ld [hBuffer], a @@ -1093,7 +1093,7 @@ Function26b7: ; 26b7 ret ; 26c7 -Function26c7: ; 26c7 +Function26c7:: ; 26c7 ld a, [hROMBank] push af ld a, b @@ -1109,7 +1109,7 @@ Function26c7: ; 26c7 ; 26d4 -GetScriptByte: ; 0x26d4 +GetScriptByte:: ; 0x26d4 ; Return byte at ScriptBank:ScriptPos in a. push hl @@ -1141,37 +1141,37 @@ GetScriptByte: ; 0x26d4 ; 0x26ef -ObjectEvent: ; 0x26ef +ObjectEvent:: ; 0x26ef jumptextfaceplayer ObjectEventText ; 0x26f2 -ObjectEventText: +ObjectEventText:: TX_FAR _ObjectEventText db "@" ; 0x26f7 -BGEvent: ; 26f7 +BGEvent:: ; 26f7 jumptext BGEventText ; 26fa -BGEventText: ; 26fa +BGEventText:: ; 26fa text_jump UnknownText_0x1c46fc db "@" ; 26ff -CoordinatesEvent: ; 26ff +CoordinatesEvent:: ; 26ff jumptext CoordinatesEventText ; 2702 -CoordinatesEventText: ; 2702 +CoordinatesEventText:: ; 2702 text_jump UnknownText_0x1c4706 db "@" ; 2707 -Function2707: ; 2707 +Function2707:: ; 2707 ld a, [hConnectionStripLength] ld e, a ld d, $0 @@ -1181,7 +1181,7 @@ Function2707: ; 2707 ret ; 2712 -Function2712: ; 2712 +Function2712:: ; 2712 ld a, [hConnectionStripLength] ld e, a ld d, $0 @@ -1191,7 +1191,7 @@ Function2712: ; 2712 ret ; 271e -Function271e: ; 271e +Function271e:: ; 271e ld a, [hConnectionStripLength] ld e, a ld d, $0 @@ -1202,7 +1202,7 @@ Function271e: ; 271e ; 272a -Function272a: ; 272a +Function272a:: ; 272a ld hl, TileMap ld de, BGMapBuffer call Function27b7 @@ -1218,7 +1218,7 @@ Function272a: ; 272a ret ; 2748 -Function2748: ; 2748 +Function2748:: ; 2748 ld hl, $c5e0 ld de, BGMapBuffer call Function27b7 @@ -1241,7 +1241,7 @@ Function2748: ; 2748 ret ; 2771 -Function2771: ; 2771 +Function2771:: ; 2771 ld hl, TileMap ld de, BGMapBuffer call Function27c0 @@ -1257,7 +1257,7 @@ Function2771: ; 2771 ret ; 278f -Function278f: ; 278f +Function278f:: ; 278f ld hl, $c4b2 ld de, BGMapBuffer call Function27c0 @@ -1280,7 +1280,7 @@ Function278f: ; 278f ret ; 27b7 -Function27b7: ; 27b7 +Function27b7:: ; 27b7 ld c, $28 .asm_27b9 ld a, [hli] @@ -1291,7 +1291,7 @@ Function27b7: ; 27b7 ret ; 27c0 -Function27c0: ; 27c0 +Function27c0:: ; 27c0 ld c, $12 .asm_27c2 ld a, [hli] @@ -1312,7 +1312,7 @@ Function27c0: ; 27c0 ret ; 27d3 -Function27d3: ; 27d3 +Function27d3:: ; 27d3 ld hl, BGMapBufferPtrs push de call .asm_27df @@ -1344,7 +1344,7 @@ Function27d3: ; 27d3 ret ; 27f8 -Function27f8: ; 27f8 +Function27f8:: ; 27f8 ld hl, BGMapBufferPtrs ld c, $12 .asm_27fd @@ -1370,7 +1370,7 @@ Function27f8: ; 27f8 ret ; 2816 -Function2816: ; 2816 +Function2816:: ; 2816 ld hl, BGMapBuffer ld bc, $0078 xor a @@ -1378,7 +1378,7 @@ Function2816: ; 2816 ret ; 2821 -Function2821: ; 2821 +Function2821:: ; 2821 ld hl, TilesetAddress ld a, [hli] ld h, [hl] @@ -1426,7 +1426,7 @@ Function2821: ; 2821 ret ; 2879 -Function2879: ; 2879 +Function2879:: ; 2879 ld hl, $d194 ld a, [hli] ld h, [hl] @@ -1455,7 +1455,7 @@ Function2879: ; 2879 ret ; 289d -Function289d: ; 289d +Function289d:: ; 289d ld hl, $d194 ld a, [hli] ld h, [hl] @@ -1505,7 +1505,7 @@ Function289d: ; 289d jr Function28f7 -Function28e3: ; 28e3 +Function28e3:: ; 28e3 ld hl, $d194 ld a, [hli] ld h, [hl] @@ -1517,7 +1517,7 @@ Function28e3: ; 28e3 ld b, $6 ld c, $5 -Function28f7: ; 28f7 +Function28f7:: ; 28f7 .asm_28f7 push bc push hl @@ -1547,7 +1547,7 @@ Function28f7: ; 28f7 ret ; 2914 -Function2914: ; 2914 +Function2914:: ; 2914 xor a ld [TilePermissions], a call Function296c @@ -1579,7 +1579,7 @@ Function2914: ; 2914 db 1, 2, 4, 8, 9, 10, 5, 6 ; 294d -Function294d: ; 294d +Function294d:: ; 294d ld a, [MapX] ld d, a ld a, [MapY] @@ -1597,7 +1597,7 @@ Function294d: ; 294d ret ; 296c -Function296c: ; 296c +Function296c:: ; 296c ld a, [MapX] ld d, a ld a, [MapY] @@ -1615,7 +1615,7 @@ Function296c: ; 296c ret ; 298b -Function298b: ; 298b +Function298b:: ; 298b call Function29ff ret nz ld a, [TileDown] @@ -1634,7 +1634,7 @@ Function298b: ; 298b ret ; 29a8 -Function29a8: ; 29a8 +Function29a8:: ; 29a8 call Function29ff ret nz ld a, [TileUp] @@ -1653,7 +1653,7 @@ Function29a8: ; 29a8 ret ; 29c5 -Function29c5: ; 29c5 +Function29c5:: ; 29c5 call Function29ff ret nz ld a, [TileRight] @@ -1672,7 +1672,7 @@ Function29c5: ; 29c5 ret ; 29e2 -Function29e2: ; 29e2 +Function29e2:: ; 29e2 call Function29ff ret nz ld a, [TileLeft] @@ -1691,7 +1691,7 @@ Function29e2: ; 29e2 ret ; 29ff -Function29ff: ; 29ff +Function29ff:: ; 29ff and $f0 cp $b0 ret z @@ -1700,7 +1700,7 @@ Function29ff: ; 29ff ; 2a07 -GetFacingTileCoord: ; 2a07 +GetFacingTileCoord:: ; 2a07 ; Return map coordinates in (d, e) and tile id in a ; of the tile the player is facing. @@ -1746,7 +1746,7 @@ GetFacingTileCoord: ; 2a07 ; 2a3c -Function2a3c: ; 2a3c +Function2a3c:: ; 2a3c call Function2a66 ld a, [hl] and a @@ -1780,7 +1780,7 @@ Function2a3c: ; 2a3c ret ; 2a66 -Function2a66: ; 2a66 +Function2a66:: ; 2a66 ld a, [MapWidth] add $6 ld c, a @@ -1811,7 +1811,7 @@ Function2a66: ; 2a66 ; 2a8b -CheckFacingSign: ; 2a8b +CheckFacingSign:: ; 2a8b call GetFacingTileCoord ld b, a ld a, d @@ -1834,7 +1834,7 @@ CheckFacingSign: ; 2a8b ret ; 2aaa -Function2aaa: ; 2aaa +Function2aaa:: ; 2aaa ld hl, $dc02 ld a, [hli] ld h, [hl] @@ -1872,7 +1872,7 @@ Function2aaa: ; 2aaa ret ; 2ad4 -Function2ad4: ; 2ad4 +Function2ad4:: ; 2ad4 ld a, [$dbfe] and a ret z @@ -1887,7 +1887,7 @@ Function2ad4: ; 2ad4 ret ; 2ae7 -Function2ae7: ; 2ae7 +Function2ae7:: ; 2ae7 ld hl, $dbff ld a, [hli] ld h, [hl] @@ -1941,7 +1941,7 @@ Function2ae7: ; 2ae7 ; 2b29 -FadeToMenu: ; 2b29 +FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a call Function1d6e @@ -1952,7 +1952,7 @@ FadeToMenu: ; 2b29 ; 2b3c -Function2b3c: ; 2b3c +Function2b3c:: ; 2b3c call WhiteBGMap call Function2bae call Function1ad2 @@ -1961,7 +1961,7 @@ Function2b3c: ; 2b3c jr Function2b5c ; 2b4d -Function2b4d: ; 2b4d +Function2b4d:: ; 2b4d call WhiteBGMap call Function1d7d call Function2bae @@ -1969,7 +1969,7 @@ Function2b4d: ; 2b4d call Functiond90 ; 2b5c -Function2b5c: ; 2b5c +Function2b5c:: ; 2b5c ld b, $9 call GetSGBLayout callba Function49409 @@ -1980,7 +1980,7 @@ Function2b5c: ; 2b5c ; 2b74 -Function2b74: ; 0x2b74 +Function2b74:: ; 0x2b74 push af ld a, $1 ld [$c2ce], a @@ -2005,7 +2005,7 @@ Function2b74: ; 0x2b74 ret ; 0x2bae -Function2bae: ; 2bae +Function2bae:: ; 2bae call DisableLCD call ClearSprites callba Function14168 @@ -2031,14 +2031,14 @@ Function2bae: ; 2bae ; 2be5 -GetMapHeaderPointer: ; 2be5 +GetMapHeaderPointer:: ; 2be5 ld a, [MapGroup] ld b, a ld a, [MapNumber] ld c, a ; 2bed -GetAnyMapHeaderPointer: ; 0x2bed +GetAnyMapHeaderPointer:: ; 0x2bed ; Prior to calling this function, you must have switched banks so that ; MapGroupPointers is visible. @@ -2071,7 +2071,7 @@ GetAnyMapHeaderPointer: ; 0x2bed ret ; 0x2c04 -GetMapHeaderMember: ; 0x2c04 +GetMapHeaderMember:: ; 0x2c04 ; Extract data from the current map's header. ; inputs: @@ -2087,7 +2087,7 @@ GetMapHeaderMember: ; 0x2c04 ld c, a ; fallthrough -GetAnyMapHeaderMember: ; 0x2c0c +GetAnyMapHeaderMember:: ; 0x2c0c ; bankswitch ld a, [hROMBank] push af @@ -2107,28 +2107,28 @@ GetAnyMapHeaderMember: ; 0x2c0c ; 0x2c1c -SwitchToMapBank: ; 2c1c +SwitchToMapBank:: ; 2c1c ld a, [MapGroup] ld b, a ld a, [MapNumber] ld c, a ; 2c24 -SwitchToAnyMapBank: ; 2c24 +SwitchToAnyMapBank:: ; 2c24 call GetAnyMapBank rst Bankswitch ret ; 2c29 -GetMapBank: ; 2c29 +GetMapBank:: ; 2c29 ld a, [MapGroup] ld b, a ld a, [MapNumber] ld c, a ; 2c31 -GetAnyMapBank: ; 2c31 +GetAnyMapBank:: ; 2c31 push hl push de ld de, $0000 @@ -2139,7 +2139,7 @@ GetAnyMapBank: ; 2c31 ret ; 2c3d -Function2c3d: ; 2c3d +Function2c3d:: ; 2c3d ld a, [hROMBank] push af ld a, $25 @@ -2153,19 +2153,19 @@ Function2c3d: ; 2c3d ret ; 2c52 -Function2c52: ; 2c52 +Function2c52:: ; 2c52 ld a, [MapScriptHeaderBank] rst Bankswitch ret ; 2c57 -GetMapScriptHeaderBank: ; 2c57 +GetMapScriptHeaderBank:: ; 2c57 ld a, [MapScriptHeaderBank] ret ; 2c5b -GetAnyMapBlockdataBank: ; 2c5b +GetAnyMapBlockdataBank:: ; 2c5b ; Return the blockdata bank for group b map c. push hl push de @@ -2195,7 +2195,7 @@ GetAnyMapBlockdataBank: ; 2c5b ret ; 2c7d -GetSecondaryMapHeaderPointer: ; 0x2c7d +GetSecondaryMapHeaderPointer:: ; 0x2c7d ; returns the current map's secondary map header pointer in hl. push bc push de @@ -2208,7 +2208,7 @@ GetSecondaryMapHeaderPointer: ; 0x2c7d ret ; 2c8a -GetMapPermission: ; 2c8a +GetMapPermission:: ; 2c8a push hl push de push bc @@ -2221,11 +2221,11 @@ GetMapPermission: ; 2c8a ret ; 2c98 -Function2c98: ; 2c98 +Function2c98:: ; 2c98 ret ; 2c99 -GetAnyMapPermission: ; 2c99 +GetAnyMapPermission:: ; 2c99 push hl push de push bc @@ -2238,14 +2238,14 @@ GetAnyMapPermission: ; 2c99 ret ; 2ca7 -GetAnyMapTileset: ; 2ca7 +GetAnyMapTileset:: ; 2ca7 ld de, $0001 call GetAnyMapHeaderMember ld a, c ret ; 2caf -GetWorldMapLocation: ; 0x2caf +GetWorldMapLocation:: ; 0x2caf ; given a map group/id in bc, return its location on the Pokégear map. push hl push de @@ -2259,7 +2259,7 @@ GetWorldMapLocation: ; 0x2caf ret ; 0x2cbd -Function2cbd: ; 2cbd +Function2cbd:: ; 2cbd push hl push bc ld de, $0006 @@ -2303,20 +2303,20 @@ Function2cbd: ; 2cbd jr .asm_2cd7 ; 2cff -Function2cff: ; 2cff +Function2cff:: ; 2cff call Function2d0d and $f ret ; 2d05 -Function2d05: ; 2d05 +Function2d05:: ; 2d05 call Function2d0d and $f0 swap a ret ; 2d0d -Function2d0d: ; 2d0d +Function2d0d:: ; 2d0d push hl push bc ld de, $0007 @@ -2327,7 +2327,7 @@ Function2d0d: ; 2d0d ret ; 2d19 -Function2d19: ; 2d19 +Function2d19:: ; 2d19 push de push hl push bc @@ -2340,7 +2340,7 @@ Function2d19: ; 2d19 ret ; 2d27 -LoadTilesetHeader: ; 2d27 +LoadTilesetHeader:: ; 2d27 push hl push bc diff --git a/home/map_objects.asm b/home/map_objects.asm index df7d87332..5f3514bd0 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -1,7 +1,7 @@ ; Functions handling map objects. -GetSpritePalette: ; 17ff +GetSpritePalette:: ; 17ff push hl push de push bc @@ -15,7 +15,7 @@ GetSpritePalette: ; 17ff ; 180e -Function180e: ; 180e +Function180e:: ; 180e push hl push bc ld hl, $d156 @@ -51,7 +51,7 @@ Function180e: ; 180e ret ; 1836 -Function1836: ; 1836 +Function1836:: ; 1836 push de push hl @@ -76,14 +76,14 @@ Function1836: ; 1836 -Function184a: ; 184a +Function184a:: ; 184a ld a, [StandingTile] call GetTileCollision ld b, a ret ; 1852 -Function1852: ; 1852 +Function1852:: ; 1852 ld a, [StandingTile] call GetTileCollision sub 1 @@ -93,7 +93,7 @@ Function1852: ; 1852 ; 185d -GetTileCollision: ; 185d +GetTileCollision:: ; 185d ; Get the collision type of tile a. push de @@ -121,7 +121,7 @@ GetTileCollision: ; 185d ; 1875 -Function1875: ; 1875 +Function1875:: ; 1875 ld d, a and $f0 cp $10 @@ -146,42 +146,42 @@ Function1875: ; 1875 ret ; 188e -Function188e: ; 188e +Function188e:: ; 188e cp $14 ret z cp $1c ret ; 1894 -CheckCutTreeTile: ; 1894 +CheckCutTreeTile:: ; 1894 cp $12 ret z cp $1a ret ; 189a -CheckHeadbuttTreeTile: ; 189a +CheckHeadbuttTreeTile:: ; 189a cp $15 ret z cp $1d ret ; 18a0 -CheckCounterTile: ; 18a0 +CheckCounterTile:: ; 18a0 cp $90 ret z cp $98 ret ; 18a6 -CheckPitTile: ; 18a6 +CheckPitTile:: ; 18a6 cp $60 ret z cp $68 ret ; 18ac -CheckIceTile: ; 18ac +CheckIceTile:: ; 18ac cp $23 ret z cp $2b @@ -190,7 +190,7 @@ CheckIceTile: ; 18ac ret ; 18b4 -CheckWhirlpoolTile: ; 18b4 +CheckWhirlpoolTile:: ; 18b4 nop cp $24 ret z @@ -200,14 +200,14 @@ CheckWhirlpoolTile: ; 18b4 ret ; 18bd -CheckWaterfallTile: ; 18bd +CheckWaterfallTile:: ; 18bd cp $33 ret z cp $3b ret ; 18c3 -CheckStandingOnEntrance: ; 18c3 +CheckStandingOnEntrance:: ; 18c3 ld a, [StandingTile] cp $71 ; door ret z @@ -220,7 +220,7 @@ CheckStandingOnEntrance: ; 18c3 ; 18d2 -GetMapObject: ; 18d2 +GetMapObject:: ; 18d2 ; Return the location of map object a in bc. ld hl, MapObjects ld bc, $10 @@ -231,7 +231,7 @@ GetMapObject: ; 18d2 ; 18de -Function18de: ; 18de +Function18de:: ; 18de ld [hConnectionStripLength], a call GetMapObject ld hl, $0000 @@ -249,7 +249,7 @@ Function18de: ; 18de ret ; 18f5 -Function18f5: ; 18f5 +Function18f5:: ; 18f5 ld hl, $0006 add hl, bc ld a, [hl] @@ -323,7 +323,7 @@ Function18f5: ; 18f5 ret ; 194d -Function194d: ; 194d +Function194d:: ; 194d ld [hConnectionStripLength], a call GetMapObject call Function80e7 @@ -332,7 +332,7 @@ Function194d: ; 194d -Function1956: ; 1956 +Function1956:: ; 1956 ld [hConnectionStripLength], a call Function271e ld a, [hConnectionStripLength] @@ -341,7 +341,7 @@ Function1956: ; 1956 ret ; 1967 -Function1967: ; 1967 +Function1967:: ; 1967 ld [hConnectionStripLength], a call GetMapObject ld hl, $0000 @@ -358,7 +358,7 @@ Function1967: ; 1967 ret ; 1985 -Function1985: ; 1985 +Function1985:: ; 1985 ld hl, $d4cd cp [hl] jr z, .asm_1990 @@ -374,13 +374,13 @@ Function1985: ; 1985 ret ; 199f -Function199f: ; 199f +Function199f:: ; 199f call Function1967 call Function2712 ret ; 19a6 -Function19a6: ; 19a6 +Function19a6:: ; 19a6 push hl call GetMapObject ld d, b @@ -394,7 +394,7 @@ Function19a6: ; 19a6 ret ; 19b8 -Function19b8: ; 19b8 +Function19b8:: ; 19b8 call GetMapObject ld hl, $0000 add hl, bc @@ -426,7 +426,7 @@ Function19b8: ; 19b8 -Function19e9: ; 19e9 +Function19e9:: ; 19e9 ld [$c2e2], a ld a, [hROMBank] ld [$c2e3], a @@ -451,7 +451,7 @@ Function19e9: ; 19e9 -Function1a13: ; 1a13 +Function1a13:: ; 1a13 push bc push de ld hl, $d4d6 @@ -480,7 +480,7 @@ Function1a13: ; 1a13 -Function1a2f: ; 1a2f +Function1a2f:: ; 1a2f ld hl, $0003 add hl, bc ld a, [hl] @@ -502,7 +502,7 @@ Function1a2f: ; 1a2f ret ; 1a47 -Function1a47: ; 1a47 +Function1a47:: ; 1a47 push bc push de ld e, a @@ -525,7 +525,7 @@ Function1a47: ; 1a47 ; 1a61 -Function1a61: ; 1a61 +Function1a61:: ; 1a61 ld l, a ld a, [hROMBank] push af @@ -543,7 +543,7 @@ Function1a61: ; 1a61 ret ; 1a71 -Function1a71: ; 1a71 +Function1a71:: ; 1a71 ld hl, $0003 add hl, de ld [hl], a @@ -591,7 +591,7 @@ Function1a71: ; 1a71 ret ; 1aae -Function1aae: ; 1aae +Function1aae:: ; 1aae ld a, [hROMBank] push af ld a, [hli] @@ -616,20 +616,20 @@ Function1aae: ; 1aae ret ; 1ac6 -Function1ac6: ; 1ac6 +Function1ac6:: ; 1ac6 ld hl, VramState set 0, [hl] ret ; 1acc -Function1acc: ; 1acc +Function1acc:: ; 1acc ld hl, VramState res 0, [hl] ret ; 1ad2 -Function1ad2: ; 1ad2 +Function1ad2:: ; 1ad2 ld a, [VramState] bit 0, a ret z @@ -639,7 +639,7 @@ Function1ad2: ; 1ad2 ; 1ae5 -Function1ae5: ; 1ae5 +Function1ae5:: ; 1ae5 ld bc, $0028 ld hl, $d4d6 call AddNTimes @@ -648,7 +648,7 @@ Function1ae5: ; 1ae5 ret ; 1af1 -Function1af1: ; 1af1 +Function1af1:: ; 1af1 ld hl, $0000 add hl, bc ld a, [hl] @@ -656,7 +656,7 @@ Function1af1: ; 1af1 ret ; 1af8 -Function1af8: ; 1af8 +Function1af8:: ; 1af8 push af ld hl, $0008 add hl, bc @@ -671,7 +671,7 @@ Function1af8: ; 1af8 ; 1b07 -GetSpriteDirection: ; 1b07 +GetSpriteDirection:: ; 1b07 ld hl, $0008 add hl, bc ld a, [hl] diff --git a/home/math.asm b/home/math.asm index 87a00c412..5e1cbdb50 100644 --- a/home/math.asm +++ b/home/math.asm @@ -1,4 +1,4 @@ -SimpleMultiply: ; 3105 +SimpleMultiply:: ; 3105 ; Return a * c. and a ret z @@ -15,7 +15,7 @@ SimpleMultiply: ; 3105 ; 3110 -SimpleDivide: ; 3110 +SimpleDivide:: ; 3110 ; Divide a by c. Return quotient b and remainder a. ld b, 0 .loop @@ -28,7 +28,7 @@ SimpleDivide: ; 3110 ; 3119 -Multiply: ; 3119 +Multiply:: ; 3119 ; Multiply hMultiplicand (3 bytes) by hMultiplier. Result in hProduct. ; All values are big endian. push hl @@ -42,7 +42,7 @@ Multiply: ; 3119 ; 3124 -Divide: ; 3124 +Divide:: ; 3124 ; Divide hDividend length b (max 4 bytes) by hDivisor. Result in hQuotient. ; All values are big endian. push hl @@ -64,7 +64,7 @@ Divide: ; 3124 ; 3136 -SubtractSigned: ; 3136 +SubtractSigned:: ; 3136 ; Return a - b, sign in carry. sub b ret nc diff --git a/home/menu.asm b/home/menu.asm index 6a8b8628a..8ac9b302b 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -1,12 +1,12 @@ ; Functions used in displaying and handling menus. -LoadMenuDataHeader: ; 0x1d35 +LoadMenuDataHeader:: ; 0x1d35 call Function1d3c call Function1c00 ret -Function1d3c: ; 0x1d3c +Function1d3c:: ; 0x1d3c ld de, $cf81 ld bc, $0010 call CopyBytes @@ -15,30 +15,30 @@ Function1d3c: ; 0x1d3c ret ; 0x1d4b -Function1d4b: ; 1d4b +Function1d4b:: ; 1d4b ld [$cf88], a ret ; 1d4f -Function1d4f: ; 1d4f +Function1d4f:: ; 1d4f push hl call Function1d58 pop hl jp PrintText ; 1d57 -Function1d57: ; 1d57 +Function1d57:: ; 1d57 ret ; 1d58 -Function1d58: ; 1d58 +Function1d58:: ; 1d58 ld hl, MenuDataHeader_0x1d5f call LoadMenuDataHeader ret ; 1d5f -MenuDataHeader_0x1d5f: ; 1d5f +MenuDataHeader_0x1d5f:: ; 1d5f db $40 ; tile backup db 12, 0 ; start coords db 17, 19 ; end coords @@ -46,19 +46,19 @@ MenuDataHeader_0x1d5f: ; 1d5f db 0 ; default option ; 1d67 -Function1d67: ; 1d67 +Function1d67:: ; 1d67 call Function1d4f call Function1c17 ret ; 1d6e -Function1d6e: ; 1d6e +Function1d6e:: ; 1d6e ld hl, MenuDataHeader_0x1d75 call LoadMenuDataHeader ret ; 1d75 -MenuDataHeader_0x1d75: ; 1d75 +MenuDataHeader_0x1d75:: ; 1d75 db $40 ; tile backup db 0, 0 ; start coords db 17, 19 ; end coords @@ -66,12 +66,12 @@ MenuDataHeader_0x1d75: ; 1d75 db 1 ; default option ; 1d7d -Function1d7d: ; 1d7d +Function1d7d:: ; 1d7d call Function1c07 ret ; 1d81 -Function1d81: ; 0x1d81 +Function1d81:: ; 0x1d81 xor a ld [hBGMapMode], a call Function1cbb @@ -95,7 +95,7 @@ Function1d81: ; 0x1d81 ret ; 0x1dab -Function1dab: ; 1dab +Function1dab:: ; 1dab call LoadMenuDataHeader call Function1d81 call Function1c17 @@ -103,7 +103,7 @@ Function1dab: ; 1dab ret ; 1db8 -Function1db8: ; 0x1db8 +Function1db8:: ; 0x1db8 push hl push bc push af @@ -124,17 +124,17 @@ Function1db8: ; 0x1db8 ; 0x1dcf -YesNoBox: ; 1dcf +YesNoBox:: ; 1dcf lb bc, 14, 7 -PlaceYesNoBox: ; 1dd2 +PlaceYesNoBox:: ; 1dd2 jr _YesNoBox -Function1dd4: ; 1dd4 +Function1dd4:: ; 1dd4 call LoadMenuDataHeader jr Function1dfe -_YesNoBox: ; 1dd9 +_YesNoBox:: ; 1dd9 ; Return nc (yes) or c (no). push bc ld hl, YesNoMenuDataHeader @@ -157,7 +157,7 @@ _YesNoBox: ; 1dd9 ld [$cf84], a call Function1c00 -Function1dfe: ; 1dfe +Function1dfe:: ; 1dfe call Function1d81 push af ld c, $f @@ -178,7 +178,7 @@ Function1dfe: ; 1dfe ret ; 1e1d -YesNoMenuDataHeader: ; 1e1d +YesNoMenuDataHeader:: ; 1e1d db $40 ; tile backup db 5, 10 ; start coords db 9, 15 ; end coords @@ -186,20 +186,20 @@ YesNoMenuDataHeader: ; 1e1d db 1 ; default option ; 1e25 -YesNoMenuData2: ; 1e25 +YesNoMenuData2:: ; 1e25 db $c0 ; flags db 2 db "YES@" db "NO@" ; 1e2e -Function1e2e: ; 1e2e +Function1e2e:: ; 1e2e call Function1e35 call Function1c00 ret ; 1e35 -Function1e35: ; 1e35 +Function1e35:: ; 1e35 push de call Function1d3c pop de @@ -224,7 +224,7 @@ Function1e35: ; 1e35 ret ; 1e5d -Function1e5d: ; 1e5d +Function1e5d:: ; 1e5d call MenuFunc_1e7f call MenuWriteText call Function1eff @@ -234,7 +234,7 @@ Function1e5d: ; 1e5d ret ; 1e70 -SetUpMenu: ; 1e70 +SetUpMenu:: ; 1e70 call MenuFunc_1e7f ; ??? call MenuWriteText call Function1eff ; set up selection pointer @@ -242,14 +242,14 @@ SetUpMenu: ; 1e70 set 7, [hl] ret -MenuFunc_1e7f: ; 0x1e7f +MenuFunc_1e7f:: ; 0x1e7f call Function1c66 call Function1ebd call Function1ea6 call Function1cbb ret -MenuWriteText: ; 0x1e8c +MenuWriteText:: ; 0x1e8c xor a ld [hBGMapMode], a call Function1ebd ; sort out the text @@ -265,7 +265,7 @@ MenuWriteText: ; 0x1e8c ret ; 0x1ea6 -Function1ea6: ; 1ea6 +Function1ea6:: ; 1ea6 ld a, [$cf83] ld c, a ld a, [$cf85] @@ -281,7 +281,7 @@ Function1ea6: ; 1ea6 ret ; 1ebd -Function1ebd: ; 1ebd +Function1ebd:: ; 1ebd ld hl, $cf93 ld a, [hli] ld h, [hl] @@ -306,7 +306,7 @@ Function1ebd: ; 1ebd ret ; 1eda -Function1eda: ; 1eda +Function1eda:: ; 1eda call Function1cfd ld bc, $002a add hl, bc @@ -329,14 +329,14 @@ Function1eda: ; 1eda jr .asm_1ee1 ; 1efb -Function1efb: ; 1efb +Function1efb:: ; 1efb ld a, [hli] ld h, [hl] ld l, a jp [hl] ; 1eff -Function1eff: ; 1eff +Function1eff:: ; 1eff call Function1c10 ld hl, $cfa8 ld a, [$cf91] @@ -356,20 +356,20 @@ Function1eff: ; 1eff ; 1f1a -Function1f1a: ; 1f1a +Function1f1a:: ; 1f1a call Function1bd3 ld hl, $cfa8 and [hl] jr Function1f2a ; 1f23 -Function1f23: ; 1f23 +Function1f23:: ; 1f23 xor a ld [$cf73], a call Function1bc9 ; 1f2a -Function1f2a: ; 1f2a +Function1f2a:: ; 1f2a bit 0, a jr nz, .asm_1f52 bit 1, a @@ -420,7 +420,7 @@ Function1f2a: ; 1f2a ret ; 1f79 -Function1f79: ; 1f79 +Function1f79:: ; 1f79 push de ld hl, $cf97 ld a, [hli] @@ -435,7 +435,7 @@ Function1f79: ; 1f79 ret ; 1f8d -Function1f8d: ; 1f8d +Function1f8d:: ; 1f8d push de ld a, [MenuSelection] call Function1fb1 @@ -449,7 +449,7 @@ Function1f8d: ; 1f8d ret ; 1f9e -Function1f9e: ; 1f9e +Function1f9e:: ; 1f9e call Function1fb1 inc hl inc hl @@ -459,7 +459,7 @@ Function1f9e: ; 1f9e ret ; 1fa7 -Function1fa7: ; 1fa7 +Function1fa7:: ; 1fa7 ld a, [MenuSelection] call Function1fb1 ld a, [hli] @@ -468,7 +468,7 @@ Function1fa7: ; 1fa7 jp [hl] ; 1fb1 -Function1fb1: ; 1fb1 +Function1fb1:: ; 1fb1 ld e, a ld d, $0 ld hl, $cf97 @@ -482,7 +482,7 @@ Function1fb1: ; 1fb1 ret ; 1fbf -Function1fbf: ; 1fbf +Function1fbf:: ; 1fbf ld hl, $cf71 call Function1ff0 ld hl, $cf81 @@ -508,14 +508,14 @@ Function1fbf: ; 1fbf ret ; 1ff0 -Function1ff0: ; 1ff0 +Function1ff0:: ; 1ff0 ld bc, $0010 xor a call ByteFill ret ; 1ff8 -Function1ff8: ; 1ff8 +Function1ff8:: ; 1ff8 push af and $3 jr z, .asm_2007 @@ -530,7 +530,7 @@ Function1ff8: ; 1ff8 ; 2009 -PlayClickSFX: ; 2009 +PlayClickSFX:: ; 2009 push de ld de, SFX_READ_TEXT_2 call PlaySFX @@ -538,14 +538,14 @@ PlayClickSFX: ; 2009 ret ; 0x2012 -Function2012: ; 2012 +Function2012:: ; 2012 call Function1d4f call Functiona46 call Function1c07 ret ; 201c -Function201c: ; 201c +Function201c:: ; 201c ld [hBuffer], a ld a, [hROMBank] push af @@ -559,7 +559,7 @@ Function201c: ; 201c ret ; 202a -Function202a: ; 202a +Function202a:: ; 202a ld a, [hROMBank] ld [$cf94], a callba Function2400e @@ -567,7 +567,7 @@ Function202a: ; 202a ret ; 2039 -Function2039: ; 2039 +Function2039:: ; 2039 ld a, [hROMBank] ld [$cf94], a callba Function24022 @@ -575,7 +575,7 @@ Function2039: ; 2039 ret ; 2048 -Function2048: ; 2048 +Function2048:: ; 2048 ld a, [hROMBank] ld [$cf94], a callba Function2403c @@ -583,7 +583,7 @@ Function2048: ; 2048 ret ; 2057 -Function2057: ; 2057 +Function2057:: ; 2057 ld a, [hROMBank] push af ld a, $21 diff --git a/home/movement.asm b/home/movement.asm index 274d27926..4925ffe74 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -1,4 +1,4 @@ -Function1b1e: ; 1b1e +Function1b1e:: ; 1b1e ld [$d003], a xor a ld [DefaultFlypoint], a @@ -11,7 +11,7 @@ Function1b1e: ; 1b1e ret ; 1b35 -Function1b35: ; 1b35 +Function1b35:: ; 1b35 ld a, [DefaultFlypoint] and a ret z @@ -20,7 +20,7 @@ Function1b35: ; 1b35 ret ; 1b3f -Function1b3f: ; 1b3f +Function1b3f:: ; 1b3f push hl push de ld hl, DefaultFlypoint @@ -35,7 +35,7 @@ Function1b3f: ; 1b3f ret ; 1b50 -Function1b50: ; 1b50 +Function1b50:: ; 1b50 push af ld a, c and a @@ -52,7 +52,7 @@ Function1b50: ; 1b50 ret ; 1b5f -Function1b5f: ; 1b5f +Function1b5f:: ; 1b5f push af ld a, b sub d @@ -97,7 +97,7 @@ Function1b5f: ; 1b5f ret ; 1b92 -Function1b92: ; 1b92 +Function1b92:: ; 1b92 push de push hl ld l, b @@ -119,7 +119,7 @@ Function1b92: ; 1b92 db 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 ; 1bb1 -Function1bb1: ; 1bb1 +Function1bb1:: ; 1bb1 push hl push bc ld hl, $cfa1 @@ -142,19 +142,19 @@ Function1bb1: ; 1bb1 ret ; 1bc9 -Function1bc9: ; 1bc9 +Function1bc9:: ; 1bc9 callab Function241a8 call Function1bdd ret ; 1bd3 -Function1bd3: ; 1bd3 +Function1bd3:: ; 1bd3 callab Function241ab call Function1bdd ret ; 1bdd -Function1bdd: ; 1bdd +Function1bdd:: ; 1bdd push bc push af ld a, [$ffa9] @@ -170,7 +170,7 @@ Function1bdd: ; 1bdd ret ; 1bee -Function1bee: ; 1bee +Function1bee:: ; 1bee ld hl, $cfac ld a, [hli] ld h, [hl] @@ -179,7 +179,7 @@ Function1bee: ; 1bee ret ; 1bf7 -Function1bf7: ; 1bf7 +Function1bf7:: ; 1bf7 ld hl, $cfac ld a, [hli] ld h, [hl] @@ -188,22 +188,22 @@ Function1bf7: ; 1bf7 ret ; 1c00 -Function1c00: ; 1c00 +Function1c00:: ; 1c00 callab Function24374 ret ; 1c07 -Function1c07: ; 0x1c07 +Function1c07:: ; 0x1c07 push af callab Function243e8 pop af ret -Function1c10: ; 0x1c10 +Function1c10:: ; 0x1c10 callab Function2446d ret -Function1c17: ; 0x1c17 +Function1c17:: ; 0x1c17 push af call Function1c07 call Function321c @@ -211,7 +211,7 @@ Function1c17: ; 0x1c17 pop af ret -Function1c23: ; 0x1c23 +Function1c23:: ; 0x1c23 call Function1cfd call Function1c30 call Function1d19 diff --git a/home/palettes.asm b/home/palettes.asm index accaa96b5..a4400f76a 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -1,7 +1,7 @@ ; Functions dealing with palettes. -UpdatePalsIfCGB: ; c2f +UpdatePalsIfCGB:: ; c2f ; update bgp data from BGPals ; update obp data from OBPals ; return carry if successful @@ -12,7 +12,7 @@ UpdatePalsIfCGB: ; c2f ret z -UpdateCGBPals: ; c33 +UpdateCGBPals:: ; c33 ; return carry if successful ; any pals to update? ld a, [hCGBPalUpdate] @@ -20,7 +20,7 @@ UpdateCGBPals: ; c33 ret z -ForceUpdateCGBPals: ; c37 +ForceUpdateCGBPals:: ; c37 ld a, [rSVBK] push af @@ -71,7 +71,7 @@ ForceUpdateCGBPals: ; c37 ; c9f -DmgToCgbBGPals: ; c9f +DmgToCgbBGPals:: ; c9f ; exists to forego reinserting cgb-converted image data ; input: a -> bgp @@ -116,7 +116,7 @@ DmgToCgbBGPals: ; c9f ; ccb -DmgToCgbObjPals: ; ccb +DmgToCgbObjPals:: ; ccb ; exists to forego reinserting cgb-converted image data ; input: d -> obp1 @@ -162,7 +162,7 @@ DmgToCgbObjPals: ; ccb ; cf8 -Functioncf8: ; cf8 +Functioncf8:: ; cf8 ld [rOBP0], a push af ld a, [hCGB] @@ -194,7 +194,7 @@ Functioncf8: ; cf8 ret ; d24 -Functiond24: ; d24 +Functiond24:: ; d24 ld [rOBP1], a push af ld a, [hCGB] @@ -228,7 +228,7 @@ Functiond24: ; d24 -CopyPals: ; d50 +CopyPals:: ; d50 ; copy c palettes in order b from de to hl push bc @@ -281,7 +281,7 @@ CopyPals: ; d50 ; d79 -Functiond79: ; d79 +Functiond79:: ; d79 ld a, [hCGB] and a ret z @@ -297,12 +297,12 @@ Functiond79: ; d79 ; d90 -Functiond90: ; d90 +Functiond90:: ; d90 ret ; d91 -Functiond91: ; d91 +Functiond91:: ; d91 ld a, [hCGB] and a ret z @@ -323,7 +323,7 @@ Functiond91: ; d91 ; db1 -Functiondb1: ; db1 +Functiondb1:: ; db1 ld a, [hROMBank] push af ld a, BANK(Function4c000) @@ -334,7 +334,7 @@ Functiondb1: ; db1 ret ; dbd -Functiondbd: ; dbd +Functiondbd:: ; dbd ld a, [hROMBank] push af ld a, BANK(Function4c03f) diff --git a/home/pokedex_flags.asm b/home/pokedex_flags.asm index bcd0f2afa..0ad13b497 100644 --- a/home/pokedex_flags.asm +++ b/home/pokedex_flags.asm @@ -1,4 +1,4 @@ -SetSeenAndCaughtMon: ; 3380 +SetSeenAndCaughtMon:: ; 3380 push af ld c, a ld hl, PokedexCaught @@ -8,28 +8,28 @@ SetSeenAndCaughtMon: ; 3380 ; fallthrough ; 338b -SetSeenMon: ; 338b +SetSeenMon:: ; 338b ld c, a ld hl, PokedexSeen ld b, SET_FLAG jr PokedexFlagAction ; 3393 -CheckCaughtMon: ; 3393 +CheckCaughtMon:: ; 3393 ld c, a ld hl, PokedexCaught ld b, CHECK_FLAG jr PokedexFlagAction ; 339b -CheckSeenMon: ; 339b +CheckSeenMon:: ; 339b ld c, a ld hl, PokedexSeen ld b, CHECK_FLAG ; fallthrough ; 33a1 -PokedexFlagAction: ; 33a1 +PokedexFlagAction:: ; 33a1 ld d, 0 ld a, PREDEF_FLAG call Predef diff --git a/home/predef.asm b/home/predef.asm index bd34a87a1..9c57497bf 100644 --- a/home/predef.asm +++ b/home/predef.asm @@ -1,4 +1,4 @@ -Predef: ; 2d83 +Predef:: ; 2d83 ; Call predefined function a. ; Preserves bc, de, hl and f. diff --git a/home/random.asm b/home/random.asm index 0f46da9e4..100b4d37b 100644 --- a/home/random.asm +++ b/home/random.asm @@ -1,4 +1,4 @@ -Random: ; 2f8c +Random:: ; 2f8c ; A simple hardware-based random number generator (RNG). ; Two random numbers are generated by adding and subtracting @@ -29,7 +29,7 @@ Random: ; 2f8c ret ; 2f9f -BattleRandom: ; 2f9f +BattleRandom:: ; 2f9f ; _BattleRandom lives in another bank. ; It handles all RNG calls in the battle engine, allowing @@ -50,7 +50,7 @@ BattleRandom: ; 2f9f ; 2fb1 -Function2fb1: ; 2fb1 +Function2fb1:: ; 2fb1 push bc ld c, a xor a diff --git a/home/rtc.asm b/home/rtc.asm index 91428d03b..33176e722 100644 --- a/home/rtc.asm +++ b/home/rtc.asm @@ -1,4 +1,4 @@ -RTC: ; 46f +RTC:: ; 46f ; update time and time-sensitive palettes ; rtc enabled? @@ -13,12 +13,12 @@ RTC: ; 46f bit 0, a ; obj update ret z -TimeOfDayPals: ; 47e +TimeOfDayPals:: ; 47e callab _TimeOfDayPals ret ; 485 -UpdateTimePals: ; 485 +UpdateTimePals:: ; 485 callab _UpdateTimePals ret ; 48c diff --git a/home/serial.asm b/home/serial.asm index fca9d82c3..ca0155c87 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -1,4 +1,4 @@ -Serial: ; 6ef +Serial:: ; 6ef ; The serial interrupt. push af @@ -89,7 +89,7 @@ Serial: ; 6ef reti ; 75f -Function75f: ; 75f +Function75f:: ; 75f ld a, $1 ld [$ffcc], a .asm_763 @@ -125,7 +125,7 @@ Function75f: ; 75f ret ; 78a -Function78a: ; 78a +Function78a:: ; 78a xor a ld [$ffca], a ld a, [$ffcb] @@ -230,7 +230,7 @@ Function78a: ; 78a ret ; 82b -Function82b: ; 82b +Function82b:: ; 82b push hl ld hl, $cf5b ld a, [hli] @@ -239,14 +239,14 @@ Function82b: ; 82b ret ; 833 -Function833: ; 833 +Function833:: ; 833 dec a ld [$cf5b], a ld [$cf5c], a ret ; 83b -Function83b: ; 83b +Function83b:: ; 83b ld hl, $cf56 ld de, $cf51 ld c, $2 @@ -272,7 +272,7 @@ Function83b: ; 83b ret ; 862 -Function862: ; 862 +Function862:: ; 862 call Function309d callab Function4000 call Function87d @@ -280,7 +280,7 @@ Function862: ; 862 ; 871 -Function871: ; 871 +Function871:: ; 871 call Function309d callab Function4000 jp Function87d @@ -288,7 +288,7 @@ Function871: ; 871 -Function87d: ; 87d +Function87d:: ; 87d ld a, $ff ld [$cf52], a .asm_882 @@ -331,7 +331,7 @@ Function87d: ; 87d ret ; 8c1 -Function8c1: ; 8c1 +Function8c1:: ; 8c1 push bc ld b, $60 ld a, [InLinkBattle] @@ -363,7 +363,7 @@ Function8c1: ; 8c1 ret ; 8f3 -Function8f3: ; 8f3 +Function8f3:: ; 8f3 ld a, [hSerialReceive] ld [$cf51], a and $f0 @@ -377,7 +377,7 @@ Function8f3: ; 8f3 ret ; 908 -Function908: ; 908 +Function908:: ; 908 xor a ld [hSerialSend], a ld a, [$ffcb] @@ -390,7 +390,7 @@ Function908: ; 908 ret ; 919 -Function919: ; 919 +Function919:: ; 919 ld a, [InLinkBattle] and a ret nz diff --git a/home/sine.asm b/home/sine.asm index 09d06ca89..24fb1af92 100644 --- a/home/sine.asm +++ b/home/sine.asm @@ -1,8 +1,8 @@ -Cosine: ; 1b0f +Cosine:: ; 1b0f ; Return d * cos(a) in hl add $10 ; 90 degrees -Sine: ; 1b11 +Sine:: ; 1b11 ; Return d * sin(a) in hl ; a is a signed 6-bit value. diff --git a/home/sram.asm b/home/sram.asm index 3c42e7618..8f60f57f3 100644 --- a/home/sram.asm +++ b/home/sram.asm @@ -1,4 +1,4 @@ -GetSRAMBank: ; 2fcb +GetSRAMBank:: ; 2fcb ; load sram bank a ; if invalid bank, sram is disabled cp NUM_SRAM_BANKS @@ -6,7 +6,7 @@ GetSRAMBank: ; 2fcb jr CloseSRAM ; 2fd1 -OpenSRAM: ; 2fd1 +OpenSRAM:: ; 2fd1 ; switch to sram bank a push af ; latch clock data @@ -21,7 +21,7 @@ OpenSRAM: ; 2fd1 ret ; 2fe1 -CloseSRAM: ; 2fe1 +CloseSRAM:: ; 2fe1 push af ld a, SRAM_DISABLE ; reset clock latch for next time diff --git a/home/string.asm b/home/string.asm index a871b4d2a..5b705002a 100644 --- a/home/string.asm +++ b/home/string.asm @@ -1,16 +1,16 @@ -InitString: ; 2ef6 +InitString:: ; 2ef6 ; Init a string of length c. push hl jr _InitString ; 2ef9 -InitName: ; 2ef9 +InitName:: ; 2ef9 ; Intended for names, so this function is limited to ten characters. push hl ld c, 10 ; 2efc -_InitString: ; 2efc +_InitString:: ; 2efc ; if the string pointed to by hl is empty (defined as "zero or more spaces ; followed by a null"), then initialize it to the string pointed to by de. push bc diff --git a/home/text.asm b/home/text.asm index 47ebd7164..4284a2369 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1,8 +1,8 @@ -ClearBox: ; fb6 +ClearBox:: ; fb6 ; Fill a c*b box at hl with blank tiles. ld a, " " -Functionfb8: +Functionfb8:: push bc push hl .x @@ -19,7 +19,7 @@ Functionfb8: ; fc8 -ClearTileMap: ; fc8 +ClearTileMap:: ; fc8 ; Fill TileMap with blank tiles. ld hl, TileMap @@ -35,7 +35,7 @@ ClearTileMap: ; fc8 ; fdb -Functionfdb: ; fdb +Functionfdb:: ; fdb ld a, $7 ld hl, AttrMap ld bc, $0168 @@ -45,7 +45,7 @@ Functionfdb: ; fdb -TextBox: ; fe8 +TextBox:: ; fe8 ; Draw a text box width c height b at hl ; Dimensions do not include the border. push bc @@ -57,7 +57,7 @@ TextBox: ; fe8 ; ff1 -TextBoxBorder: ; ff1 +TextBoxBorder:: ; ff1 ; Top push hl @@ -96,7 +96,7 @@ TextBoxBorder: ; ff1 ; 101e -NPlaceChar: ; 101e +NPlaceChar:: ; 101e ; Place char a c times ld d,c .loop @@ -107,7 +107,7 @@ NPlaceChar: ; 101e ; 1024 -TextBoxPalette: ; 1024 +TextBoxPalette:: ; 1024 ; Fill text box width c height b at hl with pal 7 ld de, AttrMap - TileMap add hl, de @@ -133,7 +133,7 @@ TextBoxPalette: ; 1024 ; 103e -SpeechTextBox: ; 103e +SpeechTextBox:: ; 103e ; Standard textbox. hlcoord 0, 12 ld b, 4 ; height @@ -141,11 +141,11 @@ SpeechTextBox: ; 103e jp TextBox ; 1048 -UnknownText_0x1048: ; 1048 +UnknownText_0x1048:: ; 1048 db $0, "ゲームフりーク!", $57 ; 1052 -Function1052: ; 1052 +Function1052:: ; 1052 ld hl, .text_1056 ret .text_1056 @@ -153,23 +153,23 @@ Function1052: ; 1052 ; 1057 -PrintText: ; 1057 +PrintText:: ; 1057 call Function106c -Function105a: ; 105a +Function105a:: ; 105a push hl hlcoord 1, 14 ld bc, 18 + 3<<8 call ClearBox pop hl -PrintTextBoxText: ; 1065 +PrintTextBoxText:: ; 1065 bccoord 1, 14 call Function13e5 ret ; 106c -Function106c: ; 106c +Function106c:: ; 106c push hl call SpeechTextBox call Function1ad2 @@ -180,10 +180,10 @@ Function106c: ; 106c -PlaceString: ; 1078 +PlaceString:: ; 1078 push hl -PlaceNextChar: ; 1079 +PlaceNextChar:: ; 1079 ld a, [de] cp "@" jr nz, CheckDict @@ -193,11 +193,11 @@ PlaceNextChar: ; 1079 ret pop de -NextChar: ; 1083 +NextChar:: ; 1083 inc de jp PlaceNextChar -CheckDict: ; 1087 +CheckDict:: ; 1087 cp $15 jp z, Function117b cp $4f @@ -312,127 +312,127 @@ CheckDict: ; 1087 ; 0x117b -Function117b: ; 117b +Function117b:: ; 117b ld c, l ld b, h callba Function17f036 jp PlaceNextChar ; 1186 -Function1186: ; 1186 +Function1186:: ; 1186 push de ld de, MomsName jp $126a ; 118d -Function118d: ; 118d +Function118d:: ; 118d push de ld de, PlayerName jp $126a ; 1194 -Function1194: ; 1194 +Function1194:: ; 1194 push de ld de, RivalName jp $126a ; 119b -Function119b: ; 119b +Function119b:: ; 119b push de ld de, RedsName jp $126a ; 11a2 -Function11a2: ; 11a2 +Function11a2:: ; 11a2 push de ld de, GreensName jp $126a ; 11a9 -Function11a9: ; 11a9 +Function11a9:: ; 11a9 push de ld de, Char5DText jp $126a ; 11b0 -Function11b0: ; 11b0 +Function11b0:: ; 11b0 push de ld de, Char5CText jp $126a ; 11b7 -Function11b7: ; 11b7 +Function11b7:: ; 11b7 push de ld de, Char5BText jp $126a ; 11be -Function11be: ; 11be +Function11be:: ; 11be push de ld de, Char5EText jp $126a ; 11c5 -Function11c5: ; 11c5 +Function11c5:: ; 11c5 push de ld de, Char54Text jp $126a ; 11cc -Function11cc: ; 11cc +Function11cc:: ; 11cc push de ld de, Char23Text jp $126a ; 11d3 -Function11d3: ; 11d3 +Function11d3:: ; 11d3 push de ld de, $1292 jp $126a ; 11da -Function11da: ; 11da +Function11da:: ; 11da push de ld de, Char4AText jp $126a ; 11e1 -Function11e1: ; 11e1 +Function11e1:: ; 11e1 push de ld de, Char24Text jp $126a ; 11e8 -Function11e8: ; 11e8 +Function11e8:: ; 11e8 push de ld de, Char37Text jp $126a ; 11ef -Function11ef: ; 11ef +Function11ef:: ; 11ef push de ld de, Char37Text jp $126a ; 11f6 -Function11f6: ; 11f6 +Function11f6:: ; 11f6 push de ld de, Char37Text jp $126a ; 11fd -Function11fd: ; 11fd +Function11fd:: ; 11fd ld a, [hBattleTurn] xor $1 jr Function1205 ; 1203 -Char5D: ; 1203 +Char5D:: ; 1203 ld a, [hBattleTurn] ; 1205 -Function1205: ; 1205 +Function1205:: ; 1205 push de and a jr nz, .asm_120e ; 0x1207 $5 @@ -490,39 +490,39 @@ Function1205: ; 1205 jp NextChar ; 0x1273 -Char5CText: ; 1273 +Char5CText:: ; 1273 db "TM@" -Char5DText: ; 1276 +Char5DText:: ; 1276 db "TRAINER@" -Char5BText: ; 127e +Char5BText:: ; 127e db "PC@" -Char5EText: ; 1281 +Char5EText:: ; 1281 db "ROCKET@" -Char54Text: ; 1288 +Char54Text:: ; 1288 db "POKé@" -Char23Text: ; 128d +Char23Text:: ; 128d db "こうげき@" -Char56Text:; 1292 +Char56Text::; 1292 db "……@" -Char5AText: ; 1295 +Char5AText:: ; 1295 db "Enemy @" -Char4AText: ; 129c +Char4AText:: ; 129c db $e1, $e2, "@" ; PK MN -Char24Text: ; 129f +Char24Text:: ; 129f db $70, $71, "@" ; PO KE -String12a2: ; 12a2 +String12a2:: ; 12a2 db " @" -Char35Text: -Char36Text: -Char37Text: ; 12a4 +Char35Text:: +Char36Text:: +Char37Text:: ; 12a4 db "@" -String12a5: ; 12a5 +String12a5:: ; 12a5 db "@" -String12a6: ; 12a6 +String12a6:: ; 12a6 db "@" ; 12a7 -Function12a7: ; 12a7 +Function12a7:: ; 12a7 pop hl ld bc, $0028 add hl, bc @@ -530,7 +530,7 @@ Function12a7: ; 12a7 jp NextChar ; 12b0 -Function12b0: ; 12b0 +Function12b0:: ; 12b0 pop hl ld bc, $0014 add hl, bc @@ -538,7 +538,7 @@ Function12b0: ; 12b0 jp NextChar ; 12b9 -Function12b9: ; 12b9 +Function12b9:: ; 12b9 pop hl push de ld bc, $3b60 @@ -581,14 +581,14 @@ Function12b9: ; 12b9 ; 12ea -Char4F: ; 12ea +Char4F:: ; 12ea pop hl hlcoord 1, 16 push hl jp NextChar ; 0x12f2 -Function12f2: ; 12f2 +Function12f2:: ; 12f2 push de ld a, [InLinkBattle] cp $3 @@ -612,7 +612,7 @@ Function12f2: ; 12f2 ; 131f -Char4B: ; 131f +Char4B:: ; 131f ld a, [InLinkBattle] or a jr nz, .asm_1328 @@ -638,7 +638,7 @@ Char4B: ; 131f ; 1345 -Char55: ; 1345 +Char55:: ; 1345 push de ld de, Text_1354 ld b, h @@ -650,19 +650,19 @@ Char55: ; 1345 jp NextChar ; 1354 -Text_1354: ; 1354 +Text_1354:: ; 1354 db $4b, "@" ; 1356 -Char5F: ; 1356 +Char5F:: ; 1356 ; ends a Pokédex entry ld [hl], "." pop hl ret ; 135a -Function135a: ; 135a +Function135a:: ; 135a ld a, [InLinkBattle] cp $3 jr z, .asm_1368 @@ -690,14 +690,14 @@ Function135a: ; 135a db "@" ; 1383 -Function1383: ; 1383 +Function1383:: ; 1383 ld a, $e6 ld [hli], a call PrintLetterDelay jp NextChar ; 138c -Function138c: ; 138c +Function138c:: ; 138c ld hl, $c5b9 ld de, $c5a5 ld a, $3 @@ -726,7 +726,7 @@ Function138c: ; 138c ret ; 13b6 -Function13b6: ; 13b6 +Function13b6:: ; 13b6 push bc ld a, [hOAMUpdate] push af @@ -739,23 +739,23 @@ Function13b6: ; 13b6 ret ; 13c6 -Function13c6: ; 13c6 +Function13c6:: ; 13c6 ret ; 13c7 -Function13c7: ; 13c7 +Function13c7:: ; 13c7 ld a, $ee ld [$c606], a ret ; 13cd -Function13cd: ; 13cd +Function13cd:: ; 13cd ld a, [$c605] ld [$c606], a ret ; 13d4 -Function13d4: ; 13d4 +Function13d4:: ; 13d4 ld b, a ld a, [hROMBank] push af @@ -769,7 +769,7 @@ Function13d4: ; 13d4 ret ; 13e0 -Function13e0: ; 13e0 +Function13e0:: ; 13e0 ld hl, $13e4 ret @@ -778,7 +778,7 @@ Function13e0: ; 13e0 ; 13e5 -Function13e5: ; 13e5 +Function13e5:: ; 13e5 ld a, [$cfcf] push af set 1, a @@ -789,7 +789,7 @@ Function13e5: ; 13e5 ret ; 13f6 -Function13f6: ; 13f6 +Function13f6:: ; 13f6 .asm_13f6 ld a, [hli] cp "@" @@ -798,7 +798,7 @@ Function13f6: ; 13f6 jr .asm_13f6 ; 13ff -Function13ff: ; 13ff +Function13ff:: ; 13ff push hl push bc ld c, a @@ -817,7 +817,7 @@ Function13ff: ; 13ff ret ; 1410 -TextCommands: ; 1410 +TextCommands:: ; 1410 dw Text_00 dw Text_01 dw Text_02 @@ -843,7 +843,7 @@ TextCommands: ; 1410 dw Text_16 ; 143e -Text_00: ; 143e +Text_00:: ; 143e ; TX ; write text until "@" ; [$00]["...@"] @@ -859,7 +859,7 @@ Text_00: ; 143e ret ; 1449 -Text_01: ; 1449 +Text_01:: ; 1449 ; TX_RAM ; write text from a ram address ; little endian @@ -877,7 +877,7 @@ Text_01: ; 1449 ret ; 1455 -Text_16: ; 1455 +Text_16:: ; 1455 ; TX_FAR ; write text from a different bank ; little endian @@ -907,7 +907,7 @@ Text_16: ; 1455 ret ; 1470 -Text_02: ; 1470 +Text_02:: ; 1470 ; TX_NUM ; write bcdnumber from address, typically ram ; little endian @@ -930,7 +930,7 @@ Text_02: ; 1470 ret ; 1480 -Text_03: ; 1480 +Text_03:: ; 1480 ; TX_MOVE ; move to a new tile ; little endian @@ -945,7 +945,7 @@ Text_03: ; 1480 ret ; 148b -Text_04: ; 148b +Text_04:: ; 148b ; TX_BOX ; draw a box ; little endian @@ -967,7 +967,7 @@ Text_04: ; 148b ret ; 149b -Text_05: ; 149b +Text_05:: ; 149b ; TX_LOW ; write text at (1,16) ; [$05] @@ -997,7 +997,7 @@ Text_06:: ; 149f ret ; 14ba -Text_07: ; 14ba +Text_07:: ; 14ba push hl call Function13cd call Function138c @@ -1007,7 +1007,7 @@ Text_07: ; 14ba ret ; 14c9 -Text_08: ; 14c9 +Text_08:: ; 14c9 ; TX_ASM ; rom only? @@ -1021,7 +1021,7 @@ Text_08: ; 14c9 ret ; 14d2 -Text_09: ; 14d2 +Text_09:: ; 14d2 ld a, [hli] ld e, a ld a, [hli] @@ -1045,7 +1045,7 @@ Text_09: ; 14d2 ret ; 14ed -Text_0A: ; 14ed +Text_0A:: ; 14ed push hl push bc call GetJoypad @@ -1097,7 +1097,7 @@ Text_PlaySound:: ; 1500 ret ; 1522 -Function1522: ; 1522 +Function1522:: ; 1522 push de ld e, [hl] inc hl @@ -1109,7 +1109,7 @@ Function1522: ; 1522 ret ; 152d -TextSFX: ; 152d +TextSFX:: ; 152d dbw $0b, SFX_DEX_FANFARE_50_79 dbw $12, SFX_FANFARE dbw $0e, SFX_DEX_FANFARE_20_49 @@ -1120,7 +1120,7 @@ TextSFX: ; 152d db $ff ; end ; 1543 -Text_0C: ; 1543 +Text_0C:: ; 1543 ld a, [hli] ld d, a push hl @@ -1146,7 +1146,7 @@ Text_0C: ; 1543 ret ; 1562 -Text_0D: ; 1562 +Text_0D:: ; 1562 ; wait for key down ; display arrow push hl @@ -1157,7 +1157,7 @@ Text_0D: ; 1562 ret ; 156a -Text_14: ; 156a +Text_14:: ; 156a ; TX_PREDEF ; [$14][id] @@ -1179,7 +1179,7 @@ Text_14: ; 156a ret ; 1582 -Text_15: ; 1582 +Text_15:: ; 1582 ; TX_DAY call GetWeekday diff --git a/home/tilemap.asm b/home/tilemap.asm index c3d95be68..4042eb7a8 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -1,4 +1,4 @@ -Function1c30: ; 0x1c30 +Function1c30:: ; 0x1c30 call Function1c53 inc b inc c @@ -19,7 +19,7 @@ Function1c30: ; 0x1c30 jr nz, .asm_1c35 ; 0x1c44 $ef ret -Function1c47: ; 0x1c47 +Function1c47:: ; 0x1c47 ld b, $10 ld de, $cf81 .asm_1c4c @@ -30,7 +30,7 @@ Function1c47: ; 0x1c47 jr nz, .asm_1c4c ; 0x1c50 $fa ret -Function1c53: ; 0x1c53 +Function1c53:: ; 0x1c53 ld a, [$cf82] ld b, a ld a, [$cf84] @@ -44,7 +44,7 @@ Function1c53: ; 0x1c53 ret ; 0x1c66 -Function1c66: ; 1c66 +Function1c66:: ; 1c66 push hl push de push bc @@ -63,7 +63,7 @@ Function1c66: ; 1c66 ret ; 1c7e -Function1c7e: ; 1c7e +Function1c7e:: ; 1c7e ld hl, $cf71 ld a, [hli] ld h, [hl] @@ -75,7 +75,7 @@ Function1c7e: ; 1c7e ret ; 1c89 -Function1c89: ; 1c89 +Function1c89:: ; 1c89 call Function1c66 ld hl, $cf86 ld e, [hl] @@ -108,7 +108,7 @@ Function1c89: ; 1c89 jp PlaceString ; 1cbb -Function1cbb: ; 1cbb +Function1cbb:: ; 1cbb call Function1cfd call Function1c53 dec b @@ -116,7 +116,7 @@ Function1cbb: ; 1cbb jp TextBox ; 1cc6 -Function1cc6: ; 1cc6 +Function1cc6:: ; 1cc6 ld a, [$cf82] ld b, a inc b @@ -138,7 +138,7 @@ Function1cc6: ; 1cc6 ret ; 1ce1 -Function1ce1: ; 1ce1 +Function1ce1:: ; 1ce1 call Function1cfd ld bc, $0015 add hl, bc @@ -149,7 +149,7 @@ Function1ce1: ; 1ce1 ret ; 1cf1 -Function1cf1: ; 1cf1 +Function1cf1:: ; 1cf1 call Function1cfd call Function1c53 inc c @@ -159,7 +159,7 @@ Function1cf1: ; 1cf1 ; 1cfd -Function1cfd: ; 1cfd +Function1cfd:: ; 1cfd ld a, [$cf83] ld c, a ld a, [$cf82] @@ -167,7 +167,7 @@ Function1cfd: ; 1cfd ; 1d05 -GetTileCoord: ; 1d05 +GetTileCoord:: ; 1d05 ; Return the address of TileMap(c, b) in hl. xor a ld h, a @@ -189,13 +189,13 @@ GetTileCoord: ; 1d05 ret ; 1d19 -Function1d19: ; 1d19 +Function1d19:: ; 1d19 ld a, [$cf83] ld c, a ld a, [$cf82] ld b, a -GetAttrCoord: ; 1d21 +GetAttrCoord:: ; 1d21 ; Return the address of AttrMap(c, b) in hl. xor a ld h, a diff --git a/home/time.asm b/home/time.asm index b3b7ae3bd..e6c70824b 100644 --- a/home/time.asm +++ b/home/time.asm @@ -1,7 +1,7 @@ ; Functions relating to the timer interrupt and the real-time-clock. -AskTimer: ; 591 +AskTimer:: ; 591 push af ld a, [$ffe9] and a @@ -14,7 +14,7 @@ AskTimer: ; 591 ; 59c -LatchClock: ; 59c +LatchClock:: ; 59c ; latch clock counter data ld a, 0 ld [MBC3LatchClock], a @@ -24,7 +24,7 @@ LatchClock: ; 59c ; 5a7 -UpdateTime: ; 5a7 +UpdateTime:: ; 5a7 call GetClock call FixDays call FixTime @@ -33,7 +33,7 @@ UpdateTime: ; 5a7 ; 5b7 -GetClock: ; 5b7 +GetClock:: ; 5b7 ; store clock data in hRTCDayHi-hRTCSeconds ; enable clock r/w @@ -75,7 +75,7 @@ GetClock: ; 5b7 ; 5e8 -FixDays: ; 5e8 +FixDays:: ; 5e8 ; fix day count ; mod by 140 @@ -137,7 +137,7 @@ FixDays: ; 5e8 ; 61d -FixTime: ; 61d +FixTime:: ; 61d ; add ingame time (set at newgame) to current time ; day hr min sec ; store time in CurDay, hHours, hMinutes, hSeconds @@ -187,14 +187,14 @@ FixTime: ; 61d ret ; 658 -Function658: ; 658 +Function658:: ; 658 xor a ld [StringBuffer2], a ld a, $0 ld [$d089], a jr Function677 -Function663: ; 663 +Function663:: ; 663 call UpdateTime ld a, [hHours] ld [$d087], a @@ -204,20 +204,20 @@ Function663: ; 663 ld [$d089], a jr Function677 -Function677: ; 677 +Function677:: ; 677 callba Function140ed ret ; 67e -Function67e: ; 67e +Function67e:: ; 67e call Function685 call SetClock ret ; 685 -Function685: ; 685 +Function685:: ; 685 xor a ld [hRTCSeconds], a ld [hRTCMinutes], a @@ -228,7 +228,7 @@ Function685: ; 685 ; 691 -SetClock: ; 691 +SetClock:: ; 691 ; set clock data from hram ; enable clock r/w @@ -277,7 +277,7 @@ SetClock: ; 691 ; 6c4 -Function6c4: ; 6c4 +Function6c4:: ; 6c4 xor a push af ld a, $0 @@ -288,7 +288,7 @@ Function6c4: ; 6c4 ret ; 6d3 -Function6d3: ; 6d3 +Function6d3:: ; 6d3 ld hl, $ac60 push af ld a, $0 @@ -300,7 +300,7 @@ Function6d3: ; 6d3 ret ; 6e3 -Function6e3: ; 6e3 +Function6e3:: ; 6e3 ld a, $0 call GetSRAMBank ld a, [$ac60] diff --git a/home/vblank.asm b/home/vblank.asm index f9e68785d..54a99bc99 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -7,7 +7,7 @@ ; This prevents the display and audio output from lagging. -VBlank: ; 283 +VBlank:: ; 283 push af push bc push de @@ -52,7 +52,7 @@ VBlank: ; 283 ; 2b1 -VBlank0: ; 2b1 +VBlank0:: ; 2b1 ; normal operation ; rng @@ -181,7 +181,7 @@ VBlank0: ; 2b1 ; 325 -VBlank2: ; 325 +VBlank2:: ; 325 ; sound only ; save bank @@ -204,7 +204,7 @@ VBlank2: ; 325 ; 337 -VBlank1: ; 337 +VBlank1:: ; 337 ; scx, scy ; palettes ; bg map @@ -289,7 +289,7 @@ VBlank1: ; 337 ; 37f -UpdatePals: ; 37f +UpdatePals:: ; 37f ; update pals for either dmg or cgb ; check cgb @@ -312,7 +312,7 @@ UpdatePals: ; 37f ; 396 -VBlank3: ; 396 +VBlank3:: ; 396 ; scx, scy ; palettes ; bg map @@ -397,7 +397,7 @@ VBlank3: ; 396 ; 3df -VBlank4: ; 3df +VBlank4:: ; 3df ; bg map ; tiles ; oam @@ -444,7 +444,7 @@ VBlank4: ; 3df ; 400 -VBlank5: ; 400 +VBlank5:: ; 400 ; scx ; palettes ; bg map @@ -504,7 +504,7 @@ VBlank5: ; 400 ; 436 -VBlank6: ; 436 +VBlank6:: ; 436 ; palettes ; tiles ; dma transfer diff --git a/home/video.asm b/home/video.asm index 0d0aa272d..3fdd5888d 100644 --- a/home/video.asm +++ b/home/video.asm @@ -1,6 +1,6 @@ ; Functions dealing with VRAM. -DMATransfer: ; 15d8 +DMATransfer:: ; 15d8 ; Return carry if the transfer is completed. ld a, [hDMATransfer] @@ -19,7 +19,7 @@ DMATransfer: ; 15d8 ; 15e3 -UpdateBGMapBuffer: ; 15e3 +UpdateBGMapBuffer:: ; 15e3 ; Copy [$ffdc] 16x8 tiles from BGMapBuffer ; to bg map addresses in BGMapBufferPtrs. @@ -100,7 +100,7 @@ endr ; 163a -WaitTop: ; 163a +WaitTop:: ; 163a ; Wait until the top third of the BG Map is being updated. ld a, [hBGMapMode] @@ -121,7 +121,7 @@ WaitTop: ; 163a ; 164c -UpdateBGMap: ; 164c +UpdateBGMap:: ; 164c ; Update the BG Map, in thirds, from TileMap and AttrMap. ld a, [hBGMapMode] @@ -282,7 +282,7 @@ endr ; 170a -Serve1bppRequest: ; 170a +Serve1bppRequest:: ; 170a ; Only call during the first fifth of VBlank ld a, [Requested1bpp] @@ -363,7 +363,7 @@ endr ; 1769 -Serve2bppRequest: ; 1769 +Serve2bppRequest:: ; 1769 ; Only call during the first fifth of VBlank ld a, [Requested2bpp] @@ -379,13 +379,13 @@ Serve2bppRequest: ; 1769 jr _Serve2bppRequest -Serve2bppRequest@VBlank: ; 1778 +Serve2bppRequest@VBlank:: ; 1778 ld a, [Requested2bpp] and a ret z -_Serve2bppRequest: ; 177d +_Serve2bppRequest:: ; 177d ; Copy [Requested2bpp] 2bpp tiles from [Requested2bppSource] to [Requested2bppDest] ld [hSPBuffer], sp @@ -445,7 +445,7 @@ endr ; 17d3 -AnimateTileset: ; 17d3 +AnimateTileset:: ; 17d3 ; Only call during the first fifth of VBlank ld a, [$ffde] diff --git a/home/window.asm b/home/window.asm index b5b08e147..66c666340 100644 --- a/home/window.asm +++ b/home/window.asm @@ -1,4 +1,4 @@ -ResetWindow: ; 2dba +ResetWindow:: ; 2dba call Function1fbf ld a, [hROMBank] @@ -16,7 +16,7 @@ ResetWindow: ; 2dba ; 2dcf -Function2dcf: ; 2dcf +Function2dcf:: ; 2dcf ld a, [hOAMUpdate] push af ld a, $1 @@ -29,7 +29,7 @@ Function2dcf: ; 2dcf ret ; 2de2 -Function2de2: ; 2de2 +Function2de2:: ; 2de2 call Function1fbf xor a ld [hBGMapMode], a @@ -46,7 +46,7 @@ Function2de2: ; 2de2 ret ; 2e08 -Function2e08: ; 2e08 +Function2e08:: ; 2e08 call Function1fbf ld a, [hROMBank] push af @@ -63,7 +63,7 @@ Function2e08: ; 2e08 ret ; 2e20 -Function2e20: ; 2e20 +Function2e20:: ; 2e20 ld a, [hOAMUpdate] push af ld a, $1 @@ -74,7 +74,7 @@ Function2e20: ; 2e20 ret ; 2e31 -Function2e31: ; 2e31 +Function2e31:: ; 2e31 ld a, [hOAMUpdate] push af ld a, [hBGMapMode] diff --git a/includes.asm b/includes.asm index cb82f5d1c..456623d9f 100644 --- a/includes.asm +++ b/includes.asm @@ -1,3 +1,2 @@ -INCLUDE "globals.asm" INCLUDE "contents.asm" INCLUDE "constants.asm" diff --git a/items/item_effects.asm b/items/item_effects.asm index 9118fb4f0..d1bb8a3a3 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -1,4 +1,4 @@ -_DoItemEffect: ; e722 +_DoItemEffect:: ; e722 ld a, [CurItem] ld [$d265], a call GetItemName diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm index 745174b4f..758e79a93 100644 --- a/lib/mobile/main.asm +++ b/lib/mobile/main.asm @@ -21,7 +21,7 @@ Function110029: ; 110029 (44:4029) ret ; known jump sources: 3e5d (0:3e5d) -Function110030: ; 110030 (44:4030) +Function110030:: ; 110030 (44:4030) push de ld a, [$c988] cp $c @@ -183,7 +183,7 @@ Function111686: ; 111686 (44:5686) INCBIN "baserom.gbc",$1116a0,$1116c5 - $1116a0 ; known jump sources: 3e89 (0:3e89) -Function1116c5: ; 1116c5 (44:56c5) +Function1116c5:: ; 1116c5 (44:56c5) ld a, [OverworldMap] ; $c800 rrca jp nc, Function1118bc @@ -522,7 +522,7 @@ Function1118c2: ; 1118c2 (44:58c2) ret ; known jump sources: 3ec1 (0:3ec1) -Function1118de: ; 1118de (44:58de) +Function1118de:: ; 1118de (44:58de) ld a, [$c80b] cp $4 call z, Function111b3c diff --git a/macros.asm b/macros.asm index 5497ceec2..f98e53eb2 100644 --- a/macros.asm +++ b/macros.asm @@ -1,5 +1,15 @@ ; rgbds macros + +; macros require rst vectors to be defined +FarCall EQU $08 +Bankswitch EQU $10 +JumpTable EQU $28 + + +NONE EQU 0 + + dwb: MACRO dw \1 db \2 diff --git a/main.asm b/main.asm index 106953abf..d8acd16e8 100644 --- a/main.asm +++ b/main.asm @@ -4,7 +4,7 @@ INCLUDE "includes.asm" SECTION "bank1", ROMX, BANK[$1] -Function4000: ; 4000 +Function4000:: ; 4000 hlcoord 3, 10 ld b, 1 ld c, 11 @@ -32,7 +32,7 @@ Function4000: ; 4000 db "Waiting...!@" ; 4031 -LoadPushOAM: ; 4031 +LoadPushOAM:: ; 4031 ld c, hPushOAM & $ff ld b, PushOAMEnd - PushOAM ld hl, PushOAM @@ -60,12 +60,12 @@ PushOAMEnd INCLUDE "engine/facings.asm" -Data4273: ; 4273 +Data4273:: ; 4273 INCBIN "baserom.gbc",$4273,$4357 - $4273 ; 4357 -Function4357: ; 4357 +Function4357:: ; 4357 push bc ld hl, $0001 add hl, bc @@ -2748,7 +2748,7 @@ Function55b9: ; 55b9 ret ; 55e0 -Function55e0: ; 55e0 +Function55e0:: ; 55e0 ld a, [VramState] bit 0, a ret z @@ -3030,7 +3030,7 @@ Function56cd: ; 56cd ret ; 576a -Function576a: ; 576a +Function576a:: ; 576a call Function5771 call Function5781 ret @@ -3139,7 +3139,7 @@ Function57e2: ; 57e2 ret ; 5803 -Function5803: ; 5803 +Function5803:: ; 5803 push bc ld a, b call Function5815 @@ -3159,7 +3159,7 @@ Function5815: ; 5815 ret ; 581f -Function581f: ; 581f +Function581f:: ; 581f call Function5826 call Function5847 ret @@ -3199,7 +3199,7 @@ Function5847: ; 5847 ret ; 585c -Function585c: ; 585c +Function585c:: ; 585c ld a, c call Function18de ret c @@ -3246,7 +3246,7 @@ Function587a: ; 587a ret ; 5897 -Function5897: ; 5897 +Function5897:: ; 5897 ld a, [$d4cd] cp $ff ret z @@ -3268,7 +3268,7 @@ Function5897: ; 5897 ret ; 58b9 -Function58b9: ; 58b9 +Function58b9:: ; 58b9 push bc ld bc, $d4d6 xor a @@ -3344,7 +3344,7 @@ Function5903: ; 5903 db 6, 7, 8, 9 ; 5920 -Function5920: ; 5920 +Function5920:: ; 5920 ld a, [VramState] bit 0, a ret z @@ -5092,7 +5092,7 @@ CopyrightString: ; 63fd db "@" ; 642e -GameInit: ; 642e +GameInit:: ; 642e callba Function14f1c call Function1fbf call WhiteBGMap @@ -5110,7 +5110,7 @@ GameInit: ; 642e jp Function620b ; 6454 -Function6454: ; 6454 +Function6454:: ; 6454 call DelayFrame ld a, [hOAMUpdate] push af @@ -5168,7 +5168,7 @@ Function64b9: ; 64b9 ret ; 64bf -Function64bf: ; 64bf +Function64bf:: ; 64bf ld a, [hOAMUpdate] push af ld a, $1 @@ -5454,7 +5454,7 @@ UnknownText_0x669a: ; 669a ; 669f -CheckNickErrors: ; 669f +CheckNickErrors:: ; 669f ; error-check monster nick before use ; must be a peace offering to gamesharkers @@ -5533,7 +5533,7 @@ CheckNickErrors: ; 669f ; 66de -_Multiply: ; 66de +_Multiply:: ; 66de ; hMultiplier is one byte. ld a, 8 @@ -5620,7 +5620,7 @@ _Multiply: ; 66de ; 673e -_Divide: ; 673e +_Divide:: ; 673e xor a ld [hMathBuffer + 0], a ld [hMathBuffer + 1], a @@ -5972,7 +5972,7 @@ Function6fa1: ; 6fa1 -CheckFacingObject: ; 6fd9 +CheckFacingObject:: ; 6fd9 call GetFacingTileCoord @@ -6445,7 +6445,7 @@ ChangeHappiness: ; 71c2 ; 725a -StepHappiness: ; 725a +StepHappiness:: ; 725a ; Raise the party's happiness by 1 point every other step cycle. ld hl, $dc77 @@ -6482,7 +6482,7 @@ StepHappiness: ; 725a ; 7282 -DaycareStep: ; 7282 +DaycareStep:: ; 7282 ld a, [DaycareMan] bit 0, a @@ -6863,7 +6863,7 @@ Data8071: ; 8071 INCBIN "baserom.gbc",$8071,$807e - $8071 ; 807e -Function807e: ; 807e +Function807e:: ; 807e push de ld a, b call GetMapObject @@ -6891,7 +6891,7 @@ Function808f: ; 808f ; 80a1 -Function80a1: ; 80a1 +Function80a1:: ; 80a1 ld a, b call Function18de ret c @@ -6938,7 +6938,7 @@ Function80b8: ; 80b8 ; 80e7 -Function80e7: ; 80e7 +Function80e7:: ; 80e7 call Function2707 and a ret nz @@ -7082,7 +7082,7 @@ Function81c9: ; 81c9 ret ; 81ca -Function81ca: ; 81ca +Function81ca:: ; 81ca nop ld a, [$d151] cp $ff @@ -7394,7 +7394,7 @@ Function8388: ; 8388 ; 839e -Function839e: ; 839e +Function839e:: ; 839e push bc ld a, c call Function18de @@ -7478,7 +7478,7 @@ Function839e: ; 839e ret ; 8417 -Function8417: ; 8417 +Function8417:: ; 8417 ld a, d call GetMapObject ld hl, $0000 @@ -7637,7 +7637,7 @@ Function849d: ; 849d ret ; 84d9 -_Sine: ; 84d9 +_Sine:: ; 84d9 ; A simple sine function. ; Return d * sin(e) in hl. @@ -7696,7 +7696,7 @@ x set x + $100 * $40000 ; 854b -GetPredefPointer: ; 854b +GetPredefPointer:: ; 854b ; Return the bank and address of PredefID in a and PredefAddress. ; Save hl for later (back in Predef) @@ -7811,7 +7811,7 @@ INCLUDE "engine/color.asm" SECTION "bank3", ROMX, BANK[$3] -Functionc000: ; c000 +Functionc000:: ; c000 ld a, [TimeOfDay] ld hl, Datac012 ld de, 2 @@ -7833,7 +7833,7 @@ Datac012: ; c012 db $ff ; c01b -Functionc01b: ; c01b +Functionc01b:: ; c01b ld hl, SpecialsPointers add hl, de add hl, de @@ -8326,7 +8326,7 @@ Functionc3fc: ; c3fc ; c403 -Functionc403: ; c403 +Functionc403:: ; c403 ld a, c and a jr nz, .asm_c410 @@ -8473,7 +8473,7 @@ SpecialTrainerHouse: ; 0xc4b9 ld [ScriptVar], a jp CloseSRAM -_PrintNum: ; c4c7 +_PrintNum:: ; c4c7 push bc bit 5, b jr z, .asm_c4d9 @@ -9392,7 +9392,7 @@ CheckDirection: ; c9cb ; c9e7 -TrySurfOW: ; c9e7 +TrySurfOW:: ; c9e7 ; Checking a tile in the overworld. ; Return carry if surfing is allowed. @@ -9634,7 +9634,7 @@ UnknownText_0xcb51: ; 0xcb51 db "@" ; 0xcb56 -TryWaterfallOW: ; cb56 +TryWaterfallOW:: ; cb56 ld d, WATERFALL call CheckPartyMove jr c, .asm_cb74 @@ -10105,7 +10105,7 @@ Functionce1d: ; ce1d ret ; ce3e -TryWhirlpoolOW: ; ce3e +TryWhirlpoolOW:: ; ce3e ld d, WHIRLPOOL call CheckPartyMove jr c, .asm_ce5c @@ -10206,7 +10206,7 @@ UnknownScript_0xcec3: ; 0xcec3 end ; 0xcec9 -TryHeadbuttOW: ; cec9 +TryHeadbuttOW:: ; cec9 ld d, $1d call CheckPartyMove jr c, .asm_ceda @@ -10453,7 +10453,7 @@ Functiond121: ; d121 INCBIN "baserom.gbc",$d13e,$d186 - $d13e -TryCutOW: ; d186 +TryCutOW:: ; d186 ld d, CUT call CheckPartyMove jr c, .asm_d19f @@ -10511,7 +10511,7 @@ UnknownText_0xd1d0: ; 0xd1d0 ; 0xd1d5 -_ReceiveItem: ; d1d5 +_ReceiveItem:: ; d1d5 call Functiond27b jp nz, Functiond29c push hl @@ -10558,7 +10558,7 @@ Functiond201: ; d201 ; d20d -_TossItem: ; d20d +_TossItem:: ; d20d call Functiond27b jr nz, .asm_d241 push hl @@ -10606,7 +10606,7 @@ _TossItem: ; d20d jp Functiond2ff ; d244 -_CheckItem: ; d244 +_CheckItem:: ; d244 call Functiond27b jr nz, .asm_d278 push hl @@ -11001,7 +11001,7 @@ Functiond3fb: ; d3fb -GetTMHMNumber: ; d407 +GetTMHMNumber:: ; d407 ; Return the number of a TM/HM by item id c. ld a, c @@ -11045,7 +11045,7 @@ GetNumberedTMHM: ; d417 ; d427 -_CheckTossableItem: ; d427 +_CheckTossableItem:: ; d427 ; Return 1 in $d142 and carry if CurItem can't be removed from the bag. ld a, 4 call GetItemAttr @@ -11065,7 +11065,7 @@ CheckSelectableItem: ; d432 ret ; d43d -CheckItemPocket: ; d43d +CheckItemPocket:: ; d43d ; Return the pocket for CurItem in $d142. ld a, 5 call GetItemAttr @@ -11145,7 +11145,7 @@ GetItemPrice: ; d486 ; no known jump sources -Functiond497: ; d497 (3:5497) +Functiond497:: ; d497 (3:5497) ld a, [$d150] and a ret z @@ -11179,7 +11179,7 @@ Functiond497: ; d497 (3:5497) ret ; no known jump sources -Functiond4d2: ; d4d2 (3:54d2) +Functiond4d2:: ; d4d2 (3:54d2) ld a, [$d14e] ld d, a ld a, [$d14f] @@ -12915,7 +12915,7 @@ ShiftBoxMon: ; df47 ret ; df8c -Functiondf8c: ; df8c +Functiondf8c:: ; df8c ld a, [CurPartySpecies] push af callab GetPreEvolution @@ -13393,7 +13393,7 @@ Functione17b: ; e17b ret ; e277 -Functione277: ; e277 +Functione277:: ; e277 push de push bc xor a @@ -15172,7 +15172,7 @@ Function113da: ; 113da ret ; 113e5 -Function113e5: ; 113e5 +Function113e5:: ; 113e5 xor a ld [$d464], a @@ -15257,7 +15257,7 @@ Function1144c: ; 1144c jp Function11413 ; 11452 -Function11452: ; 11452 +Function11452:: ; 11452 ld hl, $dc1c call Function11420 ret nc @@ -15317,7 +15317,7 @@ Function11490: ; 11490 ; no known jump sources -Function114a4: ; 114a4 (4:54a4) +Function114a4:: ; 114a4 (4:54a4) ld hl, $dc35 call Function115db ld a, [$cfd7] @@ -15357,7 +15357,7 @@ Function114dd: ; 114dd ret ; 114e7 -Function114e7: ; 114e7 +Function114e7:: ; 114e7 ld hl, $dc23 call Function115cf call Function115c8 @@ -17086,7 +17086,7 @@ UnknownScript_0x122c1: ; 0x122c1 end ; 0x122ce -UnknownScript_0x122ce: ; 0x122ce +UnknownScript_0x122ce:: ; 0x122ce 3callasm Function122f8 iffalse UnknownScript_0x122e3 disappear $fe @@ -17363,7 +17363,7 @@ Function124a3: ; 124a3 INCBIN "baserom.gbc",$124c1,$124c8 - $124c1 -UnknownScript_0x124c8: ; 0x124c8 +UnknownScript_0x124c8:: ; 0x124c8 refreshscreen $0 3callasm Function124fa 2writetext UnknownText_0x124f5 @@ -17461,7 +17461,7 @@ Function12580: ; 12580 INCBIN "baserom.gbc",$12599,$125cd - $12599 -StartMenu: ; 125cd +StartMenu:: ; 125cd call Function1fbf @@ -19352,7 +19352,7 @@ Function132fe: ; 132fe ; 13327 -SelectMenu: ; 13327 +SelectMenu:: ; 13327 call CheckRegisteredItem jr c, .NotRegistered @@ -19543,7 +19543,7 @@ UseRegisteredItem: ; 133c3 ; 1342d -Function1342d: ; 1342d +Function1342d:: ; 1342d call Function1344a call Function1347d jr c, .asm_13448 @@ -19816,7 +19816,7 @@ Function135db: ; 135db ret ; 135eb -UnknownScript_0x135eb: ; 0x135eb +UnknownScript_0x135eb:: ; 0x135eb writecode $3, $6 battlecheck startbattle @@ -19854,7 +19854,7 @@ INCBIN "baserom.gbc",$13619,$1364f - $13619 ret -Function1365b: ; 1365b +Function1365b:: ; 1365b ld a, c ld de, .table2 - .table1 ld hl, .table1 @@ -20419,7 +20419,7 @@ Function14019: ; 14019 -GetTimeOfDay: ; 14032 +GetTimeOfDay:: ; 14032 ; get time of day based on the current hour ld a, [hHours] ; hour ld hl, TimesOfDay @@ -20488,7 +20488,7 @@ Function1406a: ; 1406a -StartClock: ; 14089 +StartClock:: ; 14089 call GetClock call Function1409b call FixDays @@ -20551,7 +20551,7 @@ Function140ae: ; 140ae -Function140ed: ; 140ed +Function140ed:: ; 140ed call GetClock call FixDays ld hl, hRTCSeconds @@ -20605,7 +20605,7 @@ Function1412a: ; 1412a ret ; 14135 -Function14135: ; 14135 +Function14135:: ; 14135 call GetPlayerSprite ld a, [UsedSprites] ld [$ffbd], a @@ -20618,7 +20618,7 @@ Function14135: ; 14135 INCBIN "baserom.gbc",$14146,$14168 - $14146 -Function14168: ; 14168 +Function14168:: ; 14168 call Function1416f call Function14209 ret @@ -20866,7 +20866,7 @@ GetMonSprite: ; 14259 ; 142a7 -Function142a7: ; 142a7 +Function142a7:: ; 142a7 cp SPRITE_POKEMON jr nc, .asm_142c2 @@ -20892,7 +20892,7 @@ Function142a7: ; 142a7 ; 142c4 -_GetSpritePalette: ; 142c4 +_GetSpritePalette:: ; 142c4 ld a, c call GetMonSprite jr c, .asm_142d8 @@ -21250,7 +21250,7 @@ Function14418: ; 14418 ret ; 1442f -Function1442f: ; 1442f +Function1442f:: ; 1442f ld a, c ld bc, $0006 ld hl, $444d @@ -22018,7 +22018,7 @@ INCLUDE "gfx/overworld/sprite_headers.asm" ; 1499a -Function1499a: ; 1499a +Function1499a:: ; 1499a ld a, [StandingTile] cp $60 jr z, .asm_149ad @@ -22035,7 +22035,7 @@ Function1499a: ; 1499a ret ; 149af -Function149af: ; 149af +Function149af:: ; 149af ld a, [StandingTile] cp $70 jr z, .asm_149c4 @@ -22063,7 +22063,7 @@ Function149c6: ; 149c6 INCBIN "baserom.gbc",$149d3,$149dd - $149d3 -Function149dd: ; 149dd +Function149dd:: ; 149dd ld a, [StandingTile] ld hl, $49ea ld de, $0001 @@ -22084,7 +22084,7 @@ Function149f5: ; 149f5 INCBIN "baserom.gbc",$14a00,$14a07 - $14a00 -Function14a07: ; 14a07 +Function14a07:: ; 14a07 ld a, [StandingTile] ld de, $001f cp $71 @@ -23206,7 +23206,7 @@ IsSpawnPoint: ; 15344 ; 15363 -RunMapSetupScript: ; 15363 +RunMapSetupScript:: ; 15363 ld a, [$ff9f] and $f dec a @@ -24278,7 +24278,7 @@ Function15a20: ; 15a20 INCBIN "baserom.gbc",$15a27,$15a45 - $15a27 -OpenMartDialog: ; 15a45 +OpenMartDialog:: ; 15a45 call GetMart ld a, c ld [EngineBuffer1], a @@ -25039,7 +25039,7 @@ Function15fcd: ; 15fcd ret ; 15fd7 -Function15fd7: ; 15fd7 +Function15fd7:: ; 15fd7 ld a, $3 call Function16053 ld bc, $5ff7 @@ -25067,7 +25067,7 @@ Function15fd7: ; 15fd7 INCBIN "baserom.gbc",$15ff7,$15ffa - $15ff7 -Function15ffa: ; 15ffa +Function15ffa:: ; 15ffa ld a, $3 call Function16035 jr nc, .asm_16009 @@ -25085,7 +25085,7 @@ Function15ffa: ; 15ffa ret ; 1600b -Function1600b: ; 1600b +Function1600b:: ; 1600b ld a, $3 Function1600d: ; 1600d push hl @@ -25197,7 +25197,7 @@ Function16055: ; 16055 ret ; 1606f -Function1606f: ; 1606f +Function1606f:: ; 1606f ld a, $2 ld de, Coins call Function16055 @@ -25222,7 +25222,7 @@ Function1606f: ; 1606f INCBIN "baserom.gbc",$1608d,$1608f - $1608d -Function1608f: ; 1608f +Function1608f:: ; 1608f ld a, $2 ld de, Coins call Function16037 @@ -25239,7 +25239,7 @@ Function1608f: ; 1608f ret ; 160a1 -Function160a1: ; 160a1 +Function160a1:: ; 160a1 ld a, $2 ld de, Coins jp Function1600d @@ -26320,7 +26320,7 @@ Function16ed6: ; 16ed6 ret ; 16f3e -Function16f3e: ; 16f3e +Function16f3e:: ; 16f3e ld de, PartySpecies ld hl, PartyMon1Happiness ld c, 0 @@ -26345,7 +26345,7 @@ Function16f3e: ; 16f3e jr .loop ; 16f5e -Function16f5e: ; 16f5e +Function16f5e:: ; 16f5e call ResetWindow call Function1d6e call Function16f70 @@ -27300,7 +27300,7 @@ SECTION "bank9", ROMX, BANK[$9] INCBIN "baserom.gbc",$24000,$2400e - $24000 -Function2400e: ; 2400e +Function2400e:: ; 2400e ld hl, Function1c66 ld a, [$cf94] rst FarCall @@ -27311,7 +27311,7 @@ Function2400e: ; 2400e ret ; 24022 -Function24022: ; 24022 +Function24022:: ; 24022 ld hl, Function1c66 ld a, [$cf94] rst FarCall @@ -27323,7 +27323,7 @@ Function24022: ; 24022 ret ; 2403c -Function2403c: ; 2403c +Function2403c:: ; 2403c ld hl, Function1c66 ld a, [$cf94] rst FarCall @@ -27563,9 +27563,9 @@ Function24193: ; 24193 ; 241a8 -Function241a8: ; 241a8 +Function241a8:: ; 241a8 call asm_24329 -Function241ab: ; 241ab +Function241ab:: ; 241ab ld hl, $cfa6 res 7, [hl] ld a, [hBGMapMode] @@ -27849,7 +27849,7 @@ asm_24329 ret ; 24374 -Function24374: ; 24374 +Function24374:: ; 24374 ld a, [rSVBK] push af ld a, $7 @@ -27940,7 +27940,7 @@ Function243e7: ; 243e7 ret ; 243e8 -Function243e8: ; 243e8 +Function243e8:: ; 243e8 xor a ld [hBGMapMode], a ld a, [rSVBK] @@ -28027,7 +28027,7 @@ UnknownText_0x24468: ; 24468 db "@" ; 2446d -Function2446d: ; 2446d +Function2446d:: ; 2446d ld a, [$cf91] ld b, a ld hl, $cfa1 @@ -28109,7 +28109,7 @@ Function244c3: ; 0x244c3 ret ; 0x244e3 -Function244e3: ; 244e3 +Function244e3:: ; 244e3 ld hl, $4547 call Function1d3c call Function1cbb @@ -28141,7 +28141,7 @@ Function244e3: ; 244e3 ret ; 24528 -Function24528: ; 24528 +Function24528:: ; 24528 ld hl, $4547 call Function1d3c call Function1ce1 @@ -28231,7 +28231,7 @@ Function245a7: ; 245a7 (9:45a7) ret -Function245af: ; 245af +Function245af:: ; 245af xor a ld [$cf73], a ld [hBGMapMode], a @@ -28247,7 +28247,7 @@ Function245af: ; 245af ret ; 245cb -Function245cb: ; 245cb +Function245cb:: ; 245cb .asm_245cb call Function24609 jp c, Function245d6 @@ -31138,7 +31138,7 @@ Function26f0c: ; 26f0c INCBIN "baserom.gbc",$26f19,$26f59 - $26f19 -Function26f59: ; 26f59 +Function26f59:: ; 26f59 ld a, b ld hl, Table26f5f rst JumpTable @@ -34580,7 +34580,7 @@ Function2a0cf: ; 2a0cf ret ; 2a0e7 -Function2a0e7: ; 2a0e7 +Function2a0e7:: ; 2a0e7 ; Try to trigger a wild encounter. call Function2a103 jr nc, .asm_2a0f8 @@ -34623,7 +34623,7 @@ Function2a111: ; 2a111 ret ; 2a124 -Function2a124: ; 2a124 +Function2a124:: ; 2a124 ; Pokemon March and Ruins of Alph signal double encounter rate. ; Pokemon Lullaby halves encounter rate. ld a, [CurMusic] @@ -34641,7 +34641,7 @@ Function2a124: ; 2a124 ret ; 2a138 -Function2a138: ; 2a138 +Function2a138:: ; 2a138 ; Cleanse Tag halves encounter rate. ld hl, PartyMon1Item ld de, PartyMon2 - PartyMon1 @@ -34757,7 +34757,7 @@ Function2a14f: ; 2a14f INCBIN "baserom.gbc",$2a1cb,$2a1df - $2a1cb -Function2a1df: ; 2a1df +Function2a1df:: ; 2a1df ld a, [$dca1] and a jr z, .asm_2a1fe @@ -35841,7 +35841,7 @@ Function2c1b2: ; 2c1b2 ; 2c1ef -TrainerClassNames: ; 2c1ef +TrainerClassNames:: ; 2c1ef db "LEADER@" db "LEADER@" db "LEADER@" @@ -38267,7 +38267,7 @@ Function3991b: ; 3991b (e:591b) ret -Function39939: ; 39939 +Function39939:: ; 39939 ld a, [$cfc0] bit 0, a ld hl, $d26b @@ -38278,7 +38278,7 @@ Function39939: ; 39939 ld a, [OtherTrainerClass] ld c, a -Function3994c: ; 3994c +Function3994c:: ; 3994c ld a, c cp $c jr nz, .asm_3996d @@ -41627,7 +41627,7 @@ Function44333: ; 44333 rlca rlca and $3 - ld hl, $4351 + ld hl, PokedexEntryBanks ld d, $0 ld e, a add hl, de @@ -41637,7 +41637,14 @@ Function44333: ; 44333 ret ; 44351 -INCBIN "baserom.gbc",$44351,$44378 - $44351 +PokedexEntryBanks: ; 44351 + db BANK(PokedexEntries1) + db BANK(PokedexEntries2) + db BANK(PokedexEntries3) + db BANK(PokedexEntries4) +; 44355 + +INCBIN "baserom.gbc", $44355, $44378 - $44355 PokedexDataPointerTable: ; 0x44378 @@ -41770,7 +41777,7 @@ Function44648: ; 44648 jp CloseSRAM ; 44654 -Function44654: ; 44654 +Function44654:: ; 44654 push bc push de callba Function50000 @@ -41835,7 +41842,7 @@ Function44654: ; 44654 ret ; 446cc -Function446cc: ; 446cc +Function446cc:: ; 446cc ld a, [PartyCount] dec a push af @@ -44162,7 +44169,7 @@ Function49384: ; 49384 (12:5384) INCBIN "baserom.gbc",$493e1,$49409 - $493e1 -Function49409: ; 49409 +Function49409:: ; 49409 ld hl, $5418 ld de, $d038 ld bc, $0008 @@ -44174,7 +44181,7 @@ Function49409: ; 49409 INCBIN "baserom.gbc",$49418,$49420 - $49418 ; no known jump sources -Function49420: ; 49420 (12:5420) +Function49420:: ; 49420 (12:5420) ld hl, $56bd ld de, $d030 ld bc, $8 @@ -46948,7 +46955,7 @@ Function4ae5e: ; 4ae5e SECTION "bank13", ROMX, BANK[$13] -Function4c000: ; 4c000 +Function4c000:: ; 4c000 ld hl, TileMap ld de, AttrMap ld b, $12 @@ -46995,7 +47002,7 @@ Function4c000: ; 4c000 ret ; 4c03f -Function4c03f: ; 4c03f +Function4c03f:: ; 4c03f ld hl, BGMapBuffer ld de, BGMapPalBuffer .asm_4c045 @@ -47039,7 +47046,7 @@ Function4c03f: ; 4c03f INCLUDE "tilesets/palette_maps.asm" -TileCollisionTable: ; 4ce1f +TileCollisionTable:: ; 4ce1f ; 00 land ; 01 water ; 0f wall @@ -47259,7 +47266,7 @@ Function4cf80: ; 4cf80 (13:4f80) ret -Function4cffe: ; 4cffe +Function4cffe:: ; 4cffe ld a, $1 call GetSRAMBank ld a, [$a008] @@ -47844,7 +47851,7 @@ Function4d54c: ; 4d54c INCBIN "baserom.gbc",$4d580,$4d596 - $4d580 -Tilesets: +Tilesets:: INCLUDE "tilesets/tileset_headers.asm" @@ -49675,7 +49682,7 @@ Function4e53f: ; 4e53f ret ; 4e554 -Function4e554: ; 4e554 +Function4e554:: ; 4e554 ld a, [BattleType] dec a ld c, a @@ -51256,7 +51263,7 @@ Function505c1: ; 505c1 ret ; 505da -Function505da: ; 505da +Function505da:: ; 505da ld a, [PartyCount] and a jr z, .asm_5062c @@ -53365,10 +53372,10 @@ Function513e0: ; 513e0 ret ; 51424 -BaseData: +BaseData:: INCLUDE "stats/base_stats.asm" -PokemonNames: +PokemonNames:: INCLUDE "stats/pokemon_names.asm" INCBIN "baserom.gbc",$53d84,$53e2e - $53d84 @@ -53384,7 +53391,7 @@ INCLUDE "text/phone/extra.asm" SECTION "bank20", ROMX, BANK[$20] -DoPlayerMovement: ; 80000 +DoPlayerMovement:: ; 80000 call GetMovementInput ld a, $3e ; standing @@ -54192,7 +54199,7 @@ WaterToLandSprite: ; 803f9 ; 80404 -Function80404: ; 80404 +Function80404:: ; 80404 ld a, [$d04e] cp 0 jr z, .asm_80420 @@ -54215,7 +54222,7 @@ Function80404: ; 80404 ; 80422 -Function80422: ; 80422 +Function80422:: ; 80422 ld hl, $c2de ld a, $3e ; standing cp [hl] @@ -54228,7 +54235,7 @@ Function80422: ; 80422 -EngineFlagAction: ; 80430 +EngineFlagAction:: ; 80430 ; Do action b on engine flag de ; ; b = 0: reset flag @@ -54320,7 +54327,7 @@ INCLUDE "engine/engine_flags.asm" ; no known jump sources -Function80648: ; 80648 (20:4648) +Function80648:: ; 80648 (20:4648) ld a, c cp $1b jr c, .asm_8064e @@ -54373,7 +54380,7 @@ INCBIN "baserom.gbc",$80671,$806e1 - $80671 INCBIN "baserom.gbc",$806ff,$80730 - $806ff -BattleText: +BattleText:: INCLUDE "text/battle.asm" INCBIN "baserom.gbc",$818ac,$81fe3 - $818ac @@ -55820,7 +55827,7 @@ String84a25: ; 84a25 INCLUDE "battle/anim_gfx.asm" -HallOfFame: ; 0x8640e +HallOfFame:: ; 0x8640e call Function8648e ld a, [StatusFlags] push af @@ -55853,7 +55860,7 @@ HallOfFame: ; 0x8640e ret ; 0x86455 -Function86455: ; 86455 +Function86455:: ; 86455 ld a, $0 ld [MusicFadeIDLo], a ld a, $0 @@ -61568,7 +61575,7 @@ Function8b2a9: ; 8b2a9 INCBIN "baserom.gbc",$8b2bb,$8b342 - $8b2bb -Function8b342: ; 8b342 +Function8b342:: ; 8b342 call GetSecondaryMapHeaderPointer ld d, h ld e, l @@ -62505,7 +62512,7 @@ Function8c000: ; 8c000 ; 8c001 -Function8c001: ; 8c001 +Function8c001:: ; 8c001 call UpdateTime ld a, [TimeOfDay] ld [CurTimeOfDay], a @@ -62515,7 +62522,7 @@ Function8c001: ; 8c001 ; 8c011 -_TimeOfDayPals: ; 8c011 +_TimeOfDayPals:: ; 8c011 ; return carry if pals are changed ; forced pals? @@ -62616,14 +62623,14 @@ _TimeOfDayPals: ; 8c011 ; 8c070 -_UpdateTimePals: ; 8c070 +_UpdateTimePals:: ; 8c070 ld c, $9 ; normal call GetTimePalFade call DmgToCgbTimePals ret ; 8c079 -Function8c079: ; 8c079 +Function8c079:: ; 8c079 ld c, $12 call GetTimePalFade ld b, $4 @@ -62631,7 +62638,7 @@ Function8c079: ; 8c079 ret ; 8c084 -Function8c084: ; 8c084 +Function8c084:: ; 8c084 call Function8c0c1 ld c, $9 call GetTimePalFade @@ -64628,7 +64635,7 @@ Function8cfa8: ; 8cfa8 (23:4fa8) .asm_8cfd5 ret -Function8cfd6: ; 8cfd6 +Function8cfd6:: ; 8cfd6 push de push af ld hl, $c314 @@ -64894,7 +64901,7 @@ Function8d109: ; 8d109 ret ; 8d120 -Function8d120: ; 8d120 +Function8d120:: ; 8d120 ld hl, $0001 add hl, bc ld [hl], a @@ -66271,7 +66278,7 @@ INCLUDE "menu/mon_icons.asm" SECTION "bank24", ROMX, BANK[$24] -Function90000: ; 90000 +Function90000:: ; 90000 call Function9001c jr c, .asm_9000d call Function9002d @@ -66286,7 +66293,7 @@ Function90000: ; 90000 ; 9000f -Function9000f: ; 9000f +Function9000f:: ; 9000f call Function9001c jr nc, .asm_90017 xor a @@ -66298,7 +66305,7 @@ Function9000f: ; 9000f ret ; 90019 -Function90019: ; 90019 +Function90019:: ; 90019 jp Function9001c ; 9001c @@ -66389,7 +66396,7 @@ Function90069: ; 90069 ; no known jump sources -Function90074: ; 90074 (24:4074) +Function90074:: ; 90074 (24:4074) call CheckStandingOnEntrance jr z, .asm_900a4 call Function900a6 @@ -66508,7 +66515,7 @@ Function900de: ; 900de (24:40de) ret ; no known jump sources -Function90136: ; 90136 (24:4136) +Function90136:: ; 90136 (24:4136) ld a, [$dc31] and a jr z, .asm_90171 @@ -66687,7 +66694,7 @@ Function90292: ; 90292 (24:4292) ret -Function9029a: ; 9029a +Function9029a:: ; 9029a ld a, b ld [DefaultFlypoint], a ld a, e @@ -66735,7 +66742,7 @@ Function902e3: ; 902e3 (24:42e3) jr asm_902f1 -Function902eb: ; 902eb +Function902eb:: ; 902eb call Function9031d call Function90355 asm_902f1: @@ -71477,7 +71484,7 @@ INCLUDE "tilesets/data_5.asm" SECTION "bank2E", ROMX, BANK[$2E] -Functionb8000: ; b8000 +Functionb8000:: ; b8000 xor a ld [hBGMapMode], a callba Functionb800a @@ -71577,7 +71584,7 @@ Functionb8089: ; b8089 ; no known jump sources -Functionb8098: ; b8098 (2e:4098) +Functionb8098:: ; b8098 (2e:4098) ld hl, $c2da ld a, [hl] and a @@ -73801,7 +73808,7 @@ INCLUDE "engine/std_scripts.asm" INCBIN "baserom.gbc",$bd0d0,$be66a - $bd0d0 -UnknownScript_0xbe66a: ; 0xbe66a +UnknownScript_0xbe66a:: ; 0xbe66a faceplayer trainerstatus $2 iftrue $6698 @@ -73810,7 +73817,7 @@ UnknownScript_0xbe66a: ; 0xbe66a 2jump UnknownScript_0xbe68a ; 0xbe675 -UnknownScript_0xbe675: ; 0xbe675 +UnknownScript_0xbe675:: ; 0xbe675 loadtrainerdata playrammusic showemote $0, $fe, 30 @@ -73900,7 +73907,7 @@ Functioncbce5: ; cbce5 ret ; cbd2e -TheEndGFX: ; cbd2e +TheEndGFX:: ; cbd2e INCBIN "gfx/credits/theend.2bpp" ; cbe2e @@ -77548,7 +77555,7 @@ Functione37e3: ; e37e3 (38:77e3) SECTION "bank39", ROMX, BANK[$39] -CopyrightGFX: ; e4000 +CopyrightGFX:: ; e4000 INCBIN "gfx/misc/copyright.2bpp" ; e41d0 @@ -80241,7 +80248,7 @@ INCBIN "gfx/misc/town_map.lz" INCBIN "baserom.gbc", $f8ea3, $fb449 - $f8ea3 -Functionfb449: ; fb449 +Functionfb449:: ; fb449 ld de, $4200 ld hl, VTiles1 ld bc, Function3e80 @@ -80269,7 +80276,7 @@ Functionfb449: ; fb449 -Functionfb48a: ; fb48a +Functionfb48a:: ; fb48a ld de, $5214 ld hl, $9600 ld bc, $3e01 @@ -80285,7 +80292,7 @@ Functionfb48a: ; fb48a jr Functionfb4cc ; fb4b0 -Functionfb4b0: ; fb4b0 +Functionfb4b0:: ; fb4b0 ld de, $5424 ld hl, $9610 ld b, $3e @@ -80294,7 +80301,7 @@ Functionfb4b0: ; fb4b0 ret ; fb4be -Functionfb4be: ; fb4be +Functionfb4be:: ; fb4be ld de, $4600 ld hl, $9600 ld bc, $3e19 @@ -81101,7 +81108,7 @@ TRADE_WRONG EQU 2 TRADE_COMPLETE EQU 3 TRADE_AFTER EQU 4 -NPCTrade: ; fcba8 +NPCTrade:: ; fcba8 ld a, e ld [$cf63], a call Functionfcc59 @@ -81704,7 +81711,7 @@ TradeAfterText3: ; 0xfcfe7 ; 0xfcfec -Functionfcfec: ; fcfec +Functionfcfec:: ; fcfec ld a, [$d45c] and a ret nz @@ -84522,7 +84529,7 @@ INCBIN "baserom.gbc",$103898,$10389d - $103898 SECTION "bank41", ROMX, BANK[$41] -Function104000: ; 104000 +Function104000:: ; 104000 ld hl, $4006 jp Function104177 ; 104006 @@ -84530,7 +84537,7 @@ Function104000: ; 104000 INCBIN "baserom.gbc",$104006,$10402d - $104006 -Function10402d: ; 10402d +Function10402d:: ; 10402d ld hl, $4033 jp Function104177 ; 104033 @@ -84559,7 +84566,7 @@ Function104047: ; 104047 ret -Function104061: ; 104061 +Function104061:: ; 104061 ld hl, $4067 jp Function104177 ; 104067 @@ -84596,7 +84603,7 @@ Function104099: ; 104099 INCBIN "baserom.gbc",$1040a2,$104110 - $1040a2 -Function104110: ; 104110 +Function104110:: ; 104110 ld hl, $4116 jp Function104177 ; 104116 @@ -84803,7 +84810,7 @@ asm_104265: ; 104265 (41:4265) ret -Function104284: ; 104284 +Function104284:: ; 104284 ld a, [rSVBK] push af ld a, $6 @@ -84837,7 +84844,7 @@ Function104284: ; 104284 ret ; 1042b2 -Function1042b2: ; 1042b2 +Function1042b2:: ; 1042b2 .asm_1042b2 ld a, c cp $10 @@ -85287,7 +85294,7 @@ Function1047f0: ; 1047f0 ret ; no known jump sources -Function104820: ; 104820 (41:4820) +Function104820:: ; 104820 (41:4820) ld a, [$d151] cp $ff ret z @@ -85340,7 +85347,7 @@ Function104820: ; 104820 (41:4820) ret -Function10486d: ; 10486d +Function10486d:: ; 10486d ld hl, OverworldMap ld a, [XCoord] bit 0, a @@ -87454,7 +87461,7 @@ UpdateUsedMoves: ; 105ed0 -Mobile_HallOfFame2: ; 0x105ef6 +Mobile_HallOfFame2:: ; 0x105ef6 ret ; 105ef7 @@ -87757,7 +87764,7 @@ Function10606b: ; 10606b INCBIN "baserom.gbc",$106071,$106078 - $106071 -Mobile_HallOfFame: ; 0x106078 +Mobile_HallOfFame:: ; 0x106078 ret Function106079: ; 106079 @@ -88062,7 +88069,7 @@ Function1061c0: ; 1061c0 (41:61c0) INCBIN "baserom.gbc",$1061cd,$1061ef - $1061cd -Function1061ef: ; 1061ef +Function1061ef:: ; 1061ef push bc xor a ld [hProduct], a @@ -88275,7 +88282,7 @@ Function106462: ; 106462 INCBIN "baserom.gbc",$106463,$106464 - $106463 -Function106464: ; 106464 +Function106464:: ; 106464 ld de, $5214 ld hl, $9600 ld bc, $3e01 @@ -88300,7 +88307,7 @@ Function106464: ; 106464 INCBIN "baserom.gbc",$10649b,$106594 - $10649b -Function106594: ; 106594 +Function106594:: ; 106594 ld de, $65ad ld hl, VTiles1 ld bc, $4180 @@ -88602,7 +88609,7 @@ SECTION "bank45", ROMX, BANK[$45] INCBIN "baserom.gbc",$114000,$114243 - $114000 -Function114243: ; 114243 +Function114243:: ; 114243 ld a, $a ld [MBC3SRamEnable], a ld a, [$ff8c] @@ -91869,7 +91876,7 @@ INCBIN "baserom.gbc",$11ba44,$11bc9e - $11ba44 SECTION "bank47", ROMX, BANK[$47] -Function11c000: ; 11c000 +Function11c000:: ; 11c000 ld a, [rSVBK] push af ld a, $3 @@ -96923,7 +96930,7 @@ INCBIN "gfx/mobile/pokemon_news.2bpp" INCBIN "baserom.gbc", $17eb7e, $17f036 - $17eb7e -Function17f036: ; 17f036 +Function17f036:: ; 17f036 ld a, $6 call GetSRAMBank inc de @@ -98156,13 +98163,13 @@ SECTION "bank72", ROMX, BANK[$72] ; Item names & descriptions -ItemNames: +ItemNames:: INCLUDE "items/item_names.asm" INCLUDE "items/item_descriptions.asm" -MoveNames: +MoveNames:: INCLUDE "battle/move_names.asm" @@ -98738,7 +98745,7 @@ Function1de27f: ; 1de27f -Function1de28a: ; 1de28a +Function1de28a:: ; 1de28a ld hl, DudeAutoInput_A jr Function1de299 ; 1de28f diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index cff5376cc..d89da246b 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -202,7 +202,7 @@ ScientistMarcScript: ; 0x5e5eb end ; 0x5e5f3 -MapRadioTower3FSignpost2Script: ; 0x5e5f3 +MapRadioTower3FSignpost2Script:: ; 0x5e5f3 loadfont 2writetext UnknownText_0x5eaa4 closetext diff --git a/maps/Route36.asm b/maps/Route36.asm index cf28ae207..caec11daa 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -67,7 +67,7 @@ UnknownScript_0x19404a: ; 0x19404a ; fallthrough ; 0x194053 -WateredWeirdTreeScript: ; 0x194053 +WateredWeirdTreeScript:: ; 0x194053 loadfont 2writetext UnknownText_0x194290 closetext diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index f5a9da725..b5463207a 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -468,7 +468,7 @@ UnknownScript_0x7c2cd: ; 0x7c2cd end ; 0x7c2d6 -MapWarehouseEntranceSignpost0Script: ; 0x7c2d6 +MapWarehouseEntranceSignpost0Script:: ; 0x7c2d6 loadfont checkevent EVENT_USED_BASEMENT_KEY iftrue UnknownScript_0x7c2fa diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 3fe5565bf..7576dc26e 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -1,4 +1,4 @@ -MapGroupPointers: ; 0x94000 +MapGroupPointers:: ; 0x94000 ; pointers to the first map header of each map group dw MapGroup1 dw MapGroup2 @@ -30,7 +30,7 @@ MapGroupPointers: ; 0x94000 MapGroup1: -OlivinePokeCenter1F_MapHeader: ; 0x94034 +OlivinePokeCenter1F_MapHeader:: ; 0x94034 ; bank, tileset, permission db BANK(OlivinePokeCenter1F_SecondMapHeader), $7, 3 @@ -43,7 +43,7 @@ OlivinePokeCenter1F_MapHeader: ; 0x94034 ; had to convert 0x->$ (duh..) ; 0x9403d -OlivineGym_MapHeader: ; 0x9403d +OlivineGym_MapHeader:: ; 0x9403d ; bank, tileset, permission db BANK(OlivineGym_SecondMapHeader), $12, 3 diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 23c511737..70e7d69ad 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -2974,7 +2974,7 @@ RuinsofAlphHoOhChamber_SecondMapHeader: ; 0x958c4 db 0 ; 0x958d0 -RuinsofAlphKabutoChamber_SecondMapHeader: ; 0x958d0 +RuinsofAlphKabutoChamber_SecondMapHeader:: ; 0x958d0 ; border block db $0 @@ -3014,7 +3014,7 @@ RuinsofAlphOmanyteChamber_SecondMapHeader: ; 0x958dc db 0 ; 0x958e8 -RuinsofAlphAerodactylChamber_SecondMapHeader: ; 0x958e8 +RuinsofAlphAerodactylChamber_SecondMapHeader:: ; 0x958e8 ; border block db $0 diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 4512c893e..2e27422fb 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -8,7 +8,7 @@ INCBIN "gfx/misc/mobile_adapter.2bpp" ; no known jump sources -Function17a68f: ; 17a68f (5e:668f) +Function17a68f:: ; 17a68f (5e:668f) call Function17a6a8 call Function17a751 ld hl, $d088 diff --git a/preprocessor.py b/preprocessor.py index f5bc08637..ed79259d2 100644 --- a/preprocessor.py +++ b/preprocessor.py @@ -66,7 +66,6 @@ def setup_processor(): def main(): processor = setup_processor() processor.preprocess() - processor.update_globals # only run against stdin when not included as a module if __name__ == "__main__": diff --git a/prequeue.py b/prequeue.py index a91f1b336..8125f7035 100644 --- a/prequeue.py +++ b/prequeue.py @@ -23,8 +23,6 @@ def preprocess_queue(filenames=sys.argv[1:]): sys.stdout = open(dest, 'w') processor.preprocess() - processor.update_globals() - sys.stdin = stdin sys.stdout = stdout diff --git a/stats/base_stats.asm b/stats/base_stats.asm index 47459af94..3050af95e 100644 --- a/stats/base_stats.asm +++ b/stats/base_stats.asm @@ -1,6 +1,6 @@ -BaseData0: +BaseData0:: -BulbasaurBaseData: ; 0x51424 +BulbasaurBaseData:: ; 0x51424 db BULBASAUR ; 001 db 45, 49, 49, 45, 65, 65 @@ -31,9 +31,9 @@ BulbasaurBaseData: ; 0x51424 db %00000000 ; end -BaseData1: +BaseData1:: -IvysaurBaseData: ; 0x51444 +IvysaurBaseData:: ; 0x51444 db IVYSAUR ; 002 db 60, 62, 63, 60, 80, 80 @@ -64,7 +64,7 @@ IvysaurBaseData: ; 0x51444 db %00000000 ; end -VenusaurBaseData: ; 0x51464 +VenusaurBaseData:: ; 0x51464 db VENUSAUR ; 003 db 80, 82, 83, 80, 100, 100 @@ -95,7 +95,7 @@ VenusaurBaseData: ; 0x51464 db %00000000 ; end -CharmanderBaseData: ; 0x51484 +CharmanderBaseData:: ; 0x51484 db CHARMANDER ; 004 db 39, 52, 43, 65, 60, 50 @@ -126,7 +126,7 @@ CharmanderBaseData: ; 0x51484 db %00000010 ; end -CharmeleonBaseData: ; 0x514a4 +CharmeleonBaseData:: ; 0x514a4 db CHARMELEON ; 005 db 58, 64, 58, 80, 80, 65 @@ -157,7 +157,7 @@ CharmeleonBaseData: ; 0x514a4 db %00000010 ; end -CharizardBaseData: ; 0x514c4 +CharizardBaseData:: ; 0x514c4 db CHARIZARD ; 006 db 78, 84, 78, 100, 109, 85 @@ -188,7 +188,7 @@ CharizardBaseData: ; 0x514c4 db %00000010 ; end -SquirtleBaseData: ; 0x514e4 +SquirtleBaseData:: ; 0x514e4 db SQUIRTLE ; 007 db 44, 48, 65, 43, 50, 64 @@ -219,7 +219,7 @@ SquirtleBaseData: ; 0x514e4 db %00001001 ; end -WartortleBaseData: ; 0x51504 +WartortleBaseData:: ; 0x51504 db WARTORTLE ; 008 db 59, 63, 80, 58, 65, 80 @@ -250,7 +250,7 @@ WartortleBaseData: ; 0x51504 db %00001001 ; end -BlastoiseBaseData: ; 0x51524 +BlastoiseBaseData:: ; 0x51524 db BLASTOISE ; 009 db 79, 83, 100, 78, 85, 105 @@ -281,7 +281,7 @@ BlastoiseBaseData: ; 0x51524 db %00001001 ; end -CaterpieBaseData: ; 0x51544 +CaterpieBaseData:: ; 0x51544 db CATERPIE ; 010 db 45, 30, 35, 45, 20, 20 @@ -312,7 +312,7 @@ CaterpieBaseData: ; 0x51544 db %00000000 ; end -MetapodBaseData: ; 0x51564 +MetapodBaseData:: ; 0x51564 db METAPOD ; 011 db 50, 20, 55, 30, 25, 25 @@ -343,7 +343,7 @@ MetapodBaseData: ; 0x51564 db %00000000 ; end -ButterfreeBaseData: ; 0x51584 +ButterfreeBaseData:: ; 0x51584 db BUTTERFREE ; 012 db 60, 45, 50, 70, 80, 80 @@ -374,7 +374,7 @@ ButterfreeBaseData: ; 0x51584 db %00000000 ; end -WeedleBaseData: ; 0x515a4 +WeedleBaseData:: ; 0x515a4 db WEEDLE ; 013 db 40, 35, 30, 50, 20, 20 @@ -405,7 +405,7 @@ WeedleBaseData: ; 0x515a4 db %00000000 ; end -KakunaBaseData: ; 0x515c4 +KakunaBaseData:: ; 0x515c4 db KAKUNA ; 014 db 45, 25, 50, 35, 25, 25 @@ -436,7 +436,7 @@ KakunaBaseData: ; 0x515c4 db %00000000 ; end -BeedrillBaseData: ; 0x515e4 +BeedrillBaseData:: ; 0x515e4 db BEEDRILL ; 015 db 65, 80, 40, 75, 45, 80 @@ -467,7 +467,7 @@ BeedrillBaseData: ; 0x515e4 db %00000000 ; end -PidgeyBaseData: ; 0x51604 +PidgeyBaseData:: ; 0x51604 db PIDGEY ; 016 db 40, 45, 40, 56, 35, 35 @@ -498,7 +498,7 @@ PidgeyBaseData: ; 0x51604 db %00000000 ; end -PidgeottoBaseData: ; 0x51624 +PidgeottoBaseData:: ; 0x51624 db PIDGEOTTO ; 017 db 63, 60, 55, 71, 50, 50 @@ -529,7 +529,7 @@ PidgeottoBaseData: ; 0x51624 db %00000000 ; end -PidgeotBaseData: ; 0x51644 +PidgeotBaseData:: ; 0x51644 db PIDGEOT ; 018 db 83, 80, 75, 91, 70, 70 @@ -560,7 +560,7 @@ PidgeotBaseData: ; 0x51644 db %00000000 ; end -RattataBaseData: ; 0x51664 +RattataBaseData:: ; 0x51664 db RATTATA ; 019 db 30, 56, 35, 72, 25, 35 @@ -591,7 +591,7 @@ RattataBaseData: ; 0x51664 db %00000000 ; end -RaticateBaseData: ; 0x51684 +RaticateBaseData:: ; 0x51684 db RATICATE ; 020 db 55, 81, 60, 97, 50, 70 @@ -622,7 +622,7 @@ RaticateBaseData: ; 0x51684 db %00001100 ; end -SpearowBaseData: ; 0x516a4 +SpearowBaseData:: ; 0x516a4 db SPEAROW ; 021 db 40, 60, 30, 70, 31, 31 @@ -653,7 +653,7 @@ SpearowBaseData: ; 0x516a4 db %00000000 ; end -FearowBaseData: ; 0x516c4 +FearowBaseData:: ; 0x516c4 db FEAROW ; 022 db 65, 90, 65, 100, 61, 61 @@ -684,7 +684,7 @@ FearowBaseData: ; 0x516c4 db %00000000 ; end -EkansBaseData: ; 0x516e4 +EkansBaseData:: ; 0x516e4 db EKANS ; 023 db 35, 60, 44, 55, 40, 54 @@ -715,7 +715,7 @@ EkansBaseData: ; 0x516e4 db %00000000 ; end -ArbokBaseData: ; 0x51704 +ArbokBaseData:: ; 0x51704 db ARBOK ; 024 db 60, 85, 69, 80, 65, 79 @@ -746,7 +746,7 @@ ArbokBaseData: ; 0x51704 db %00000000 ; end -PikachuBaseData: ; 0x51724 +PikachuBaseData:: ; 0x51724 db PIKACHU ; 025 db 35, 55, 30, 90, 50, 40 @@ -777,7 +777,7 @@ PikachuBaseData: ; 0x51724 db %00000100 ; end -RaichuBaseData: ; 0x51744 +RaichuBaseData:: ; 0x51744 db RAICHU ; 026 db 60, 90, 55, 100, 90, 80 @@ -808,7 +808,7 @@ RaichuBaseData: ; 0x51744 db %00000100 ; end -SandshrewBaseData: ; 0x51764 +SandshrewBaseData:: ; 0x51764 db SANDSHREW ; 027 db 50, 75, 85, 40, 20, 30 @@ -839,7 +839,7 @@ SandshrewBaseData: ; 0x51764 db %00000000 ; end -SandslashBaseData: ; 0x51784 +SandslashBaseData:: ; 0x51784 db SANDSLASH ; 028 db 75, 100, 110, 65, 45, 55 @@ -870,7 +870,7 @@ SandslashBaseData: ; 0x51784 db %00000000 ; end -Nidoran_FBaseData: ; 0x517a4 +Nidoran_FBaseData:: ; 0x517a4 db NIDORAN_F ; 029 db 55, 47, 52, 41, 40, 40 @@ -901,7 +901,7 @@ Nidoran_FBaseData: ; 0x517a4 db %00000100 ; end -NidorinaBaseData: ; 0x517c4 +NidorinaBaseData:: ; 0x517c4 db NIDORINA ; 030 db 70, 62, 67, 56, 55, 55 @@ -932,7 +932,7 @@ NidorinaBaseData: ; 0x517c4 db %00001100 ; end -NidoqueenBaseData: ; 0x517e4 +NidoqueenBaseData:: ; 0x517e4 db NIDOQUEEN ; 031 db 90, 82, 87, 76, 75, 85 @@ -963,7 +963,7 @@ NidoqueenBaseData: ; 0x517e4 db %00001110 ; end -Nidoran_MBaseData: ; 0x51804 +Nidoran_MBaseData:: ; 0x51804 db NIDORAN_M ; 032 db 46, 57, 40, 50, 40, 40 @@ -994,7 +994,7 @@ Nidoran_MBaseData: ; 0x51804 db %00000100 ; end -NidorinoBaseData: ; 0x51824 +NidorinoBaseData:: ; 0x51824 db NIDORINO ; 033 db 61, 72, 57, 65, 55, 55 @@ -1025,7 +1025,7 @@ NidorinoBaseData: ; 0x51824 db %00001100 ; end -NidokingBaseData: ; 0x51844 +NidokingBaseData:: ; 0x51844 db NIDOKING ; 034 db 81, 92, 77, 85, 85, 75 @@ -1056,7 +1056,7 @@ NidokingBaseData: ; 0x51844 db %00001110 ; end -ClefairyBaseData: ; 0x51864 +ClefairyBaseData:: ; 0x51864 db CLEFAIRY ; 035 db 70, 45, 48, 35, 60, 65 @@ -1087,7 +1087,7 @@ ClefairyBaseData: ; 0x51864 db %00001110 ; end -ClefableBaseData: ; 0x51884 +ClefableBaseData:: ; 0x51884 db CLEFABLE ; 036 db 95, 70, 73, 60, 85, 90 @@ -1118,7 +1118,7 @@ ClefableBaseData: ; 0x51884 db %00001110 ; end -VulpixBaseData: ; 0x518a4 +VulpixBaseData:: ; 0x518a4 db VULPIX ; 037 db 38, 41, 40, 65, 50, 65 @@ -1149,7 +1149,7 @@ VulpixBaseData: ; 0x518a4 db %00000010 ; end -NinetalesBaseData: ; 0x518c4 +NinetalesBaseData:: ; 0x518c4 db NINETALES ; 038 db 73, 76, 75, 100, 81, 100 @@ -1180,7 +1180,7 @@ NinetalesBaseData: ; 0x518c4 db %00000010 ; end -JigglypuffBaseData: ; 0x518e4 +JigglypuffBaseData:: ; 0x518e4 db JIGGLYPUFF ; 039 db 115, 45, 20, 20, 45, 25 @@ -1211,7 +1211,7 @@ JigglypuffBaseData: ; 0x518e4 db %00001110 ; end -WigglytuffBaseData: ; 0x51904 +WigglytuffBaseData:: ; 0x51904 db WIGGLYTUFF ; 040 db 140, 70, 45, 45, 75, 50 @@ -1242,7 +1242,7 @@ WigglytuffBaseData: ; 0x51904 db %00001110 ; end -ZubatBaseData: ; 0x51924 +ZubatBaseData:: ; 0x51924 db ZUBAT ; 041 db 40, 45, 35, 55, 30, 40 @@ -1273,7 +1273,7 @@ ZubatBaseData: ; 0x51924 db %00000000 ; end -GolbatBaseData: ; 0x51944 +GolbatBaseData:: ; 0x51944 db GOLBAT ; 042 db 75, 80, 70, 90, 65, 75 @@ -1304,7 +1304,7 @@ GolbatBaseData: ; 0x51944 db %00000000 ; end -OddishBaseData: ; 0x51964 +OddishBaseData:: ; 0x51964 db ODDISH ; 043 db 45, 50, 55, 30, 75, 65 @@ -1335,7 +1335,7 @@ OddishBaseData: ; 0x51964 db %00000000 ; end -GloomBaseData: ; 0x51984 +GloomBaseData:: ; 0x51984 db GLOOM ; 044 db 60, 65, 70, 40, 85, 75 @@ -1366,7 +1366,7 @@ GloomBaseData: ; 0x51984 db %00000000 ; end -VileplumeBaseData: ; 0x519a4 +VileplumeBaseData:: ; 0x519a4 db VILEPLUME ; 045 db 75, 80, 85, 50, 100, 90 @@ -1397,7 +1397,7 @@ VileplumeBaseData: ; 0x519a4 db %00000000 ; end -ParasBaseData: ; 0x519c4 +ParasBaseData:: ; 0x519c4 db PARAS ; 046 db 35, 70, 55, 25, 45, 55 @@ -1428,7 +1428,7 @@ ParasBaseData: ; 0x519c4 db %00000000 ; end -ParasectBaseData: ; 0x519e4 +ParasectBaseData:: ; 0x519e4 db PARASECT ; 047 db 60, 95, 80, 30, 60, 80 @@ -1459,7 +1459,7 @@ ParasectBaseData: ; 0x519e4 db %00000000 ; end -VenonatBaseData: ; 0x51a04 +VenonatBaseData:: ; 0x51a04 db VENONAT ; 048 db 60, 55, 50, 45, 40, 55 @@ -1490,7 +1490,7 @@ VenonatBaseData: ; 0x51a04 db %00000000 ; end -VenomothBaseData: ; 0x51a24 +VenomothBaseData:: ; 0x51a24 db VENOMOTH ; 049 db 70, 65, 60, 90, 90, 75 @@ -1521,7 +1521,7 @@ VenomothBaseData: ; 0x51a24 db %00000000 ; end -DiglettBaseData: ; 0x51a44 +DiglettBaseData:: ; 0x51a44 db DIGLETT ; 050 db 10, 55, 25, 95, 35, 45 @@ -1552,7 +1552,7 @@ DiglettBaseData: ; 0x51a44 db %00000000 ; end -DugtrioBaseData: ; 0x51a64 +DugtrioBaseData:: ; 0x51a64 db DUGTRIO ; 051 db 35, 80, 50, 120, 50, 70 @@ -1583,7 +1583,7 @@ DugtrioBaseData: ; 0x51a64 db %00000000 ; end -MeowthBaseData: ; 0x51a84 +MeowthBaseData:: ; 0x51a84 db MEOWTH ; 052 db 40, 45, 35, 90, 40, 40 @@ -1614,7 +1614,7 @@ MeowthBaseData: ; 0x51a84 db %00000100 ; end -PersianBaseData: ; 0x51aa4 +PersianBaseData:: ; 0x51aa4 db PERSIAN ; 053 db 65, 70, 60, 115, 65, 65 @@ -1645,7 +1645,7 @@ PersianBaseData: ; 0x51aa4 db %00000100 ; end -PsyduckBaseData: ; 0x51ac4 +PsyduckBaseData:: ; 0x51ac4 db PSYDUCK ; 054 db 50, 52, 48, 55, 65, 50 @@ -1676,7 +1676,7 @@ PsyduckBaseData: ; 0x51ac4 db %00001001 ; end -GolduckBaseData: ; 0x51ae4 +GolduckBaseData:: ; 0x51ae4 db GOLDUCK ; 055 db 80, 82, 78, 85, 95, 80 @@ -1707,7 +1707,7 @@ GolduckBaseData: ; 0x51ae4 db %00001001 ; end -MankeyBaseData: ; 0x51b04 +MankeyBaseData:: ; 0x51b04 db MANKEY ; 056 db 40, 80, 35, 70, 35, 45 @@ -1738,7 +1738,7 @@ MankeyBaseData: ; 0x51b04 db %00000100 ; end -PrimeapeBaseData: ; 0x51b24 +PrimeapeBaseData:: ; 0x51b24 db PRIMEAPE ; 057 db 65, 105, 60, 95, 60, 70 @@ -1769,7 +1769,7 @@ PrimeapeBaseData: ; 0x51b24 db %00000100 ; end -GrowlitheBaseData: ; 0x51b44 +GrowlitheBaseData:: ; 0x51b44 db GROWLITHE ; 058 db 55, 70, 45, 60, 70, 50 @@ -1800,7 +1800,7 @@ GrowlitheBaseData: ; 0x51b44 db %00000010 ; end -ArcanineBaseData: ; 0x51b64 +ArcanineBaseData:: ; 0x51b64 db ARCANINE ; 059 db 90, 110, 80, 95, 100, 80 @@ -1831,7 +1831,7 @@ ArcanineBaseData: ; 0x51b64 db %00000010 ; end -PoliwagBaseData: ; 0x51b84 +PoliwagBaseData:: ; 0x51b84 db POLIWAG ; 060 db 40, 50, 40, 90, 40, 40 @@ -1862,7 +1862,7 @@ PoliwagBaseData: ; 0x51b84 db %00001001 ; end -PoliwhirlBaseData: ; 0x51ba4 +PoliwhirlBaseData:: ; 0x51ba4 db POLIWHIRL ; 061 db 65, 65, 65, 90, 50, 50 @@ -1893,7 +1893,7 @@ PoliwhirlBaseData: ; 0x51ba4 db %00001001 ; end -PoliwrathBaseData: ; 0x51bc4 +PoliwrathBaseData:: ; 0x51bc4 db POLIWRATH ; 062 db 90, 85, 95, 70, 70, 90 @@ -1924,7 +1924,7 @@ PoliwrathBaseData: ; 0x51bc4 db %00001001 ; end -AbraBaseData: ; 0x51be4 +AbraBaseData:: ; 0x51be4 db ABRA ; 063 db 25, 20, 15, 90, 105, 55 @@ -1955,7 +1955,7 @@ AbraBaseData: ; 0x51be4 db %00000000 ; end -KadabraBaseData: ; 0x51c04 +KadabraBaseData:: ; 0x51c04 db KADABRA ; 064 db 40, 35, 30, 105, 120, 70 @@ -1986,7 +1986,7 @@ KadabraBaseData: ; 0x51c04 db %00000000 ; end -AlakazamBaseData: ; 0x51c24 +AlakazamBaseData:: ; 0x51c24 db ALAKAZAM ; 065 db 55, 50, 45, 120, 135, 85 @@ -2017,7 +2017,7 @@ AlakazamBaseData: ; 0x51c24 db %00000000 ; end -MachopBaseData: ; 0x51c44 +MachopBaseData:: ; 0x51c44 db MACHOP ; 066 db 70, 80, 50, 35, 35, 35 @@ -2048,7 +2048,7 @@ MachopBaseData: ; 0x51c44 db %00000010 ; end -MachokeBaseData: ; 0x51c64 +MachokeBaseData:: ; 0x51c64 db MACHOKE ; 067 db 80, 100, 70, 45, 50, 60 @@ -2079,7 +2079,7 @@ MachokeBaseData: ; 0x51c64 db %00000010 ; end -MachampBaseData: ; 0x51c84 +MachampBaseData:: ; 0x51c84 db MACHAMP ; 068 db 90, 130, 80, 55, 65, 85 @@ -2110,7 +2110,7 @@ MachampBaseData: ; 0x51c84 db %00000010 ; end -BellsproutBaseData: ; 0x51ca4 +BellsproutBaseData:: ; 0x51ca4 db BELLSPROUT ; 069 db 50, 75, 35, 40, 70, 30 @@ -2141,7 +2141,7 @@ BellsproutBaseData: ; 0x51ca4 db %00000000 ; end -WeepinbellBaseData: ; 0x51cc4 +WeepinbellBaseData:: ; 0x51cc4 db WEEPINBELL ; 070 db 65, 90, 50, 55, 85, 45 @@ -2172,7 +2172,7 @@ WeepinbellBaseData: ; 0x51cc4 db %00000000 ; end -VictreebelBaseData: ; 0x51ce4 +VictreebelBaseData:: ; 0x51ce4 db VICTREEBEL ; 071 db 80, 105, 65, 70, 100, 60 @@ -2203,7 +2203,7 @@ VictreebelBaseData: ; 0x51ce4 db %00000000 ; end -TentacoolBaseData: ; 0x51d04 +TentacoolBaseData:: ; 0x51d04 db TENTACOOL ; 072 db 40, 40, 35, 70, 50, 100 @@ -2234,7 +2234,7 @@ TentacoolBaseData: ; 0x51d04 db %00001000 ; end -TentacruelBaseData: ; 0x51d24 +TentacruelBaseData:: ; 0x51d24 db TENTACRUEL ; 073 db 80, 70, 65, 100, 80, 120 @@ -2265,7 +2265,7 @@ TentacruelBaseData: ; 0x51d24 db %00001000 ; end -GeodudeBaseData: ; 0x51d44 +GeodudeBaseData:: ; 0x51d44 db GEODUDE ; 074 db 40, 80, 100, 20, 30, 30 @@ -2296,7 +2296,7 @@ GeodudeBaseData: ; 0x51d44 db %00000010 ; end -GravelerBaseData: ; 0x51d64 +GravelerBaseData:: ; 0x51d64 db GRAVELER ; 075 db 55, 95, 115, 35, 45, 45 @@ -2327,7 +2327,7 @@ GravelerBaseData: ; 0x51d64 db %00000010 ; end -GolemBaseData: ; 0x51d84 +GolemBaseData:: ; 0x51d84 db GOLEM ; 076 db 80, 110, 130, 45, 55, 65 @@ -2358,7 +2358,7 @@ GolemBaseData: ; 0x51d84 db %00000010 ; end -PonytaBaseData: ; 0x51da4 +PonytaBaseData:: ; 0x51da4 db PONYTA ; 077 db 50, 85, 55, 90, 65, 65 @@ -2389,7 +2389,7 @@ PonytaBaseData: ; 0x51da4 db %00000010 ; end -RapidashBaseData: ; 0x51dc4 +RapidashBaseData:: ; 0x51dc4 db RAPIDASH ; 078 db 65, 100, 70, 105, 80, 80 @@ -2420,7 +2420,7 @@ RapidashBaseData: ; 0x51dc4 db %00000010 ; end -SlowpokeBaseData: ; 0x51de4 +SlowpokeBaseData:: ; 0x51de4 db SLOWPOKE ; 079 db 90, 65, 65, 15, 40, 40 @@ -2451,7 +2451,7 @@ SlowpokeBaseData: ; 0x51de4 db %00001010 ; end -SlowbroBaseData: ; 0x51e04 +SlowbroBaseData:: ; 0x51e04 db SLOWBRO ; 080 db 95, 75, 110, 30, 100, 80 @@ -2482,7 +2482,7 @@ SlowbroBaseData: ; 0x51e04 db %00001010 ; end -MagnemiteBaseData: ; 0x51e24 +MagnemiteBaseData:: ; 0x51e24 db MAGNEMITE ; 081 db 25, 35, 70, 45, 95, 55 @@ -2513,7 +2513,7 @@ MagnemiteBaseData: ; 0x51e24 db %00000100 ; end -MagnetonBaseData: ; 0x51e44 +MagnetonBaseData:: ; 0x51e44 db MAGNETON ; 082 db 50, 60, 95, 70, 120, 70 @@ -2544,7 +2544,7 @@ MagnetonBaseData: ; 0x51e44 db %00000100 ; end -Farfetch_DBaseData: ; 0x51e64 +Farfetch_DBaseData:: ; 0x51e64 db FARFETCH_D ; 083 db 52, 65, 55, 60, 58, 62 @@ -2575,7 +2575,7 @@ Farfetch_DBaseData: ; 0x51e64 db %00000000 ; end -DoduoBaseData: ; 0x51e84 +DoduoBaseData:: ; 0x51e84 db DODUO ; 084 db 35, 85, 45, 75, 35, 35 @@ -2606,7 +2606,7 @@ DoduoBaseData: ; 0x51e84 db %00000000 ; end -DodrioBaseData: ; 0x51ea4 +DodrioBaseData:: ; 0x51ea4 db DODRIO ; 085 db 60, 110, 70, 100, 60, 60 @@ -2637,7 +2637,7 @@ DodrioBaseData: ; 0x51ea4 db %00000000 ; end -SeelBaseData: ; 0x51ec4 +SeelBaseData:: ; 0x51ec4 db SEEL ; 086 db 65, 45, 55, 45, 45, 70 @@ -2668,7 +2668,7 @@ SeelBaseData: ; 0x51ec4 db %00001001 ; end -DewgongBaseData: ; 0x51ee4 +DewgongBaseData:: ; 0x51ee4 db DEWGONG ; 087 db 90, 70, 80, 70, 70, 95 @@ -2699,7 +2699,7 @@ DewgongBaseData: ; 0x51ee4 db %00001001 ; end -GrimerBaseData: ; 0x51f04 +GrimerBaseData:: ; 0x51f04 db GRIMER ; 088 db 80, 80, 50, 25, 40, 50 @@ -2730,7 +2730,7 @@ GrimerBaseData: ; 0x51f04 db %00000110 ; end -MukBaseData: ; 0x51f24 +MukBaseData:: ; 0x51f24 db MUK ; 089 db 105, 105, 75, 50, 65, 100 @@ -2761,7 +2761,7 @@ MukBaseData: ; 0x51f24 db %00000110 ; end -ShellderBaseData: ; 0x51f44 +ShellderBaseData:: ; 0x51f44 db SHELLDER ; 090 db 30, 65, 100, 40, 45, 25 @@ -2792,7 +2792,7 @@ ShellderBaseData: ; 0x51f44 db %00001000 ; end -CloysterBaseData: ; 0x51f64 +CloysterBaseData:: ; 0x51f64 db CLOYSTER ; 091 db 50, 95, 180, 70, 85, 45 @@ -2823,7 +2823,7 @@ CloysterBaseData: ; 0x51f64 db %00001000 ; end -GastlyBaseData: ; 0x51f84 +GastlyBaseData:: ; 0x51f84 db GASTLY ; 092 db 30, 35, 30, 80, 100, 35 @@ -2854,7 +2854,7 @@ GastlyBaseData: ; 0x51f84 db %00000100 ; end -HaunterBaseData: ; 0x51fa4 +HaunterBaseData:: ; 0x51fa4 db HAUNTER ; 093 db 45, 50, 45, 95, 115, 55 @@ -2885,7 +2885,7 @@ HaunterBaseData: ; 0x51fa4 db %00000100 ; end -GengarBaseData: ; 0x51fc4 +GengarBaseData:: ; 0x51fc4 db GENGAR ; 094 db 60, 65, 60, 110, 130, 75 @@ -2916,7 +2916,7 @@ GengarBaseData: ; 0x51fc4 db %00000100 ; end -OnixBaseData: ; 0x51fe4 +OnixBaseData:: ; 0x51fe4 db ONIX ; 095 db 35, 45, 160, 70, 30, 45 @@ -2947,7 +2947,7 @@ OnixBaseData: ; 0x51fe4 db %00000000 ; end -DrowzeeBaseData: ; 0x52004 +DrowzeeBaseData:: ; 0x52004 db DROWZEE ; 096 db 60, 48, 45, 42, 43, 90 @@ -2978,7 +2978,7 @@ DrowzeeBaseData: ; 0x52004 db %00000000 ; end -HypnoBaseData: ; 0x52024 +HypnoBaseData:: ; 0x52024 db HYPNO ; 097 db 85, 73, 70, 67, 73, 115 @@ -3009,7 +3009,7 @@ HypnoBaseData: ; 0x52024 db %00000000 ; end -KrabbyBaseData: ; 0x52044 +KrabbyBaseData:: ; 0x52044 db KRABBY ; 098 db 30, 105, 90, 50, 25, 25 @@ -3040,7 +3040,7 @@ KrabbyBaseData: ; 0x52044 db %00001000 ; end -KinglerBaseData: ; 0x52064 +KinglerBaseData:: ; 0x52064 db KINGLER ; 099 db 55, 130, 115, 75, 50, 50 @@ -3071,7 +3071,7 @@ KinglerBaseData: ; 0x52064 db %00001000 ; end -VoltorbBaseData: ; 0x52084 +VoltorbBaseData:: ; 0x52084 db VOLTORB ; 100 db 40, 30, 50, 100, 55, 55 @@ -3102,7 +3102,7 @@ VoltorbBaseData: ; 0x52084 db %00000100 ; end -ElectrodeBaseData: ; 0x520a4 +ElectrodeBaseData:: ; 0x520a4 db ELECTRODE ; 101 db 60, 50, 70, 140, 80, 80 @@ -3133,7 +3133,7 @@ ElectrodeBaseData: ; 0x520a4 db %00000100 ; end -ExeggcuteBaseData: ; 0x520c4 +ExeggcuteBaseData:: ; 0x520c4 db EXEGGCUTE ; 102 db 60, 40, 80, 40, 60, 45 @@ -3164,7 +3164,7 @@ ExeggcuteBaseData: ; 0x520c4 db %00000000 ; end -ExeggutorBaseData: ; 0x520e4 +ExeggutorBaseData:: ; 0x520e4 db EXEGGUTOR ; 103 db 95, 95, 85, 55, 125, 65 @@ -3195,7 +3195,7 @@ ExeggutorBaseData: ; 0x520e4 db %00000000 ; end -CuboneBaseData: ; 0x52104 +CuboneBaseData:: ; 0x52104 db CUBONE ; 104 db 50, 50, 95, 35, 40, 50 @@ -3226,7 +3226,7 @@ CuboneBaseData: ; 0x52104 db %00001010 ; end -MarowakBaseData: ; 0x52124 +MarowakBaseData:: ; 0x52124 db MAROWAK ; 105 db 60, 80, 110, 45, 50, 80 @@ -3257,7 +3257,7 @@ MarowakBaseData: ; 0x52124 db %00001010 ; end -HitmonleeBaseData: ; 0x52144 +HitmonleeBaseData:: ; 0x52144 db HITMONLEE ; 106 db 50, 120, 53, 87, 35, 110 @@ -3288,7 +3288,7 @@ HitmonleeBaseData: ; 0x52144 db %00000000 ; end -HitmonchanBaseData: ; 0x52164 +HitmonchanBaseData:: ; 0x52164 db HITMONCHAN ; 107 db 50, 105, 79, 76, 35, 110 @@ -3319,7 +3319,7 @@ HitmonchanBaseData: ; 0x52164 db %00000000 ; end -LickitungBaseData: ; 0x52184 +LickitungBaseData:: ; 0x52184 db LICKITUNG ; 108 db 90, 55, 75, 30, 60, 75 @@ -3350,7 +3350,7 @@ LickitungBaseData: ; 0x52184 db %00001110 ; end -KoffingBaseData: ; 0x521a4 +KoffingBaseData:: ; 0x521a4 db KOFFING ; 109 db 40, 65, 95, 35, 60, 45 @@ -3381,7 +3381,7 @@ KoffingBaseData: ; 0x521a4 db %00000110 ; end -WeezingBaseData: ; 0x521c4 +WeezingBaseData:: ; 0x521c4 db WEEZING ; 110 db 65, 90, 120, 60, 85, 70 @@ -3412,7 +3412,7 @@ WeezingBaseData: ; 0x521c4 db %00000110 ; end -RhyhornBaseData: ; 0x521e4 +RhyhornBaseData:: ; 0x521e4 db RHYHORN ; 111 db 80, 85, 95, 25, 30, 30 @@ -3443,7 +3443,7 @@ RhyhornBaseData: ; 0x521e4 db %00001110 ; end -RhydonBaseData: ; 0x52204 +RhydonBaseData:: ; 0x52204 db RHYDON ; 112 db 105, 130, 120, 40, 45, 45 @@ -3474,7 +3474,7 @@ RhydonBaseData: ; 0x52204 db %00001110 ; end -ChanseyBaseData: ; 0x52224 +ChanseyBaseData:: ; 0x52224 db CHANSEY ; 113 db 250, 05, 05, 50, 35, 105 @@ -3505,7 +3505,7 @@ ChanseyBaseData: ; 0x52224 db %00001110 ; end -TangelaBaseData: ; 0x52244 +TangelaBaseData:: ; 0x52244 db TANGELA ; 114 db 65, 55, 115, 60, 100, 40 @@ -3536,7 +3536,7 @@ TangelaBaseData: ; 0x52244 db %00000000 ; end -KangaskhanBaseData: ; 0x52264 +KangaskhanBaseData:: ; 0x52264 db KANGASKHAN ; 115 db 105, 95, 80, 90, 40, 80 @@ -3567,7 +3567,7 @@ KangaskhanBaseData: ; 0x52264 db %00001110 ; end -HorseaBaseData: ; 0x52284 +HorseaBaseData:: ; 0x52284 db HORSEA ; 116 db 30, 40, 70, 60, 70, 25 @@ -3598,7 +3598,7 @@ HorseaBaseData: ; 0x52284 db %00001001 ; end -SeadraBaseData: ; 0x522a4 +SeadraBaseData:: ; 0x522a4 db SEADRA ; 117 db 55, 65, 95, 85, 95, 45 @@ -3629,7 +3629,7 @@ SeadraBaseData: ; 0x522a4 db %00001001 ; end -GoldeenBaseData: ; 0x522c4 +GoldeenBaseData:: ; 0x522c4 db GOLDEEN ; 118 db 45, 67, 60, 63, 35, 50 @@ -3660,7 +3660,7 @@ GoldeenBaseData: ; 0x522c4 db %00001001 ; end -SeakingBaseData: ; 0x522e4 +SeakingBaseData:: ; 0x522e4 db SEAKING ; 119 db 80, 92, 65, 68, 65, 80 @@ -3691,7 +3691,7 @@ SeakingBaseData: ; 0x522e4 db %00001001 ; end -StaryuBaseData: ; 0x52304 +StaryuBaseData:: ; 0x52304 db STARYU ; 120 db 30, 45, 55, 85, 70, 55 @@ -3722,7 +3722,7 @@ StaryuBaseData: ; 0x52304 db %00001101 ; end -StarmieBaseData: ; 0x52324 +StarmieBaseData:: ; 0x52324 db STARMIE ; 121 db 60, 75, 85, 115, 100, 85 @@ -3753,7 +3753,7 @@ StarmieBaseData: ; 0x52324 db %00001101 ; end -Mr__MimeBaseData: ; 0x52344 +Mr__MimeBaseData:: ; 0x52344 db MR__MIME ; 122 db 40, 45, 65, 90, 100, 120 @@ -3784,7 +3784,7 @@ Mr__MimeBaseData: ; 0x52344 db %00000100 ; end -ScytherBaseData: ; 0x52364 +ScytherBaseData:: ; 0x52364 db SCYTHER ; 123 db 70, 110, 80, 105, 55, 80 @@ -3815,7 +3815,7 @@ ScytherBaseData: ; 0x52364 db %00000000 ; end -JynxBaseData: ; 0x52384 +JynxBaseData:: ; 0x52384 db JYNX ; 124 db 65, 50, 35, 95, 115, 95 @@ -3846,7 +3846,7 @@ JynxBaseData: ; 0x52384 db %00001000 ; end -ElectabuzzBaseData: ; 0x523a4 +ElectabuzzBaseData:: ; 0x523a4 db ELECTABUZZ ; 125 db 65, 83, 57, 105, 95, 85 @@ -3877,7 +3877,7 @@ ElectabuzzBaseData: ; 0x523a4 db %00000100 ; end -MagmarBaseData: ; 0x523c4 +MagmarBaseData:: ; 0x523c4 db MAGMAR ; 126 db 65, 95, 57, 93, 100, 85 @@ -3908,7 +3908,7 @@ MagmarBaseData: ; 0x523c4 db %00000010 ; end -PinsirBaseData: ; 0x523e4 +PinsirBaseData:: ; 0x523e4 db PINSIR ; 127 db 65, 125, 100, 85, 55, 70 @@ -3939,7 +3939,7 @@ PinsirBaseData: ; 0x523e4 db %00000000 ; end -TaurosBaseData: ; 0x52404 +TaurosBaseData:: ; 0x52404 db TAUROS ; 128 db 75, 100, 95, 110, 40, 70 @@ -3970,7 +3970,7 @@ TaurosBaseData: ; 0x52404 db %00001110 ; end -MagikarpBaseData: ; 0x52424 +MagikarpBaseData:: ; 0x52424 db MAGIKARP ; 129 db 20, 10, 55, 80, 15, 20 @@ -4001,7 +4001,7 @@ MagikarpBaseData: ; 0x52424 db %00000000 ; end -GyaradosBaseData: ; 0x52444 +GyaradosBaseData:: ; 0x52444 db GYARADOS ; 130 db 95, 125, 79, 81, 60, 100 @@ -4032,7 +4032,7 @@ GyaradosBaseData: ; 0x52444 db %00001111 ; end -LaprasBaseData: ; 0x52464 +LaprasBaseData:: ; 0x52464 db LAPRAS ; 131 db 130, 85, 80, 60, 85, 95 @@ -4063,7 +4063,7 @@ LaprasBaseData: ; 0x52464 db %00001100 ; end -DittoBaseData: ; 0x52484 +DittoBaseData:: ; 0x52484 db DITTO ; 132 db 48, 48, 48, 48, 48, 48 @@ -4094,7 +4094,7 @@ DittoBaseData: ; 0x52484 db %00000000 ; end -EeveeBaseData: ; 0x524a4 +EeveeBaseData:: ; 0x524a4 db EEVEE ; 133 db 55, 55, 50, 55, 45, 65 @@ -4125,7 +4125,7 @@ EeveeBaseData: ; 0x524a4 db %00000000 ; end -VaporeonBaseData: ; 0x524c4 +VaporeonBaseData:: ; 0x524c4 db VAPOREON ; 134 db 130, 65, 60, 65, 110, 95 @@ -4156,7 +4156,7 @@ VaporeonBaseData: ; 0x524c4 db %00001001 ; end -JolteonBaseData: ; 0x524e4 +JolteonBaseData:: ; 0x524e4 db JOLTEON ; 135 db 65, 65, 60, 130, 110, 95 @@ -4187,7 +4187,7 @@ JolteonBaseData: ; 0x524e4 db %00000100 ; end -FlareonBaseData: ; 0x52504 +FlareonBaseData:: ; 0x52504 db FLAREON ; 136 db 65, 130, 60, 65, 95, 110 @@ -4218,7 +4218,7 @@ FlareonBaseData: ; 0x52504 db %00000010 ; end -PorygonBaseData: ; 0x52524 +PorygonBaseData:: ; 0x52524 db PORYGON ; 137 db 65, 60, 70, 40, 85, 75 @@ -4249,7 +4249,7 @@ PorygonBaseData: ; 0x52524 db %00001100 ; end -OmanyteBaseData: ; 0x52544 +OmanyteBaseData:: ; 0x52544 db OMANYTE ; 138 db 35, 40, 100, 35, 90, 55 @@ -4280,7 +4280,7 @@ OmanyteBaseData: ; 0x52544 db %00001000 ; end -OmastarBaseData: ; 0x52564 +OmastarBaseData:: ; 0x52564 db OMASTAR ; 139 db 70, 60, 125, 55, 115, 70 @@ -4311,7 +4311,7 @@ OmastarBaseData: ; 0x52564 db %00001000 ; end -KabutoBaseData: ; 0x52584 +KabutoBaseData:: ; 0x52584 db KABUTO ; 140 db 30, 80, 90, 55, 55, 45 @@ -4342,7 +4342,7 @@ KabutoBaseData: ; 0x52584 db %00001000 ; end -KabutopsBaseData: ; 0x525a4 +KabutopsBaseData:: ; 0x525a4 db KABUTOPS ; 141 db 60, 115, 105, 80, 65, 70 @@ -4373,7 +4373,7 @@ KabutopsBaseData: ; 0x525a4 db %00001000 ; end -AerodactylBaseData: ; 0x525c4 +AerodactylBaseData:: ; 0x525c4 db AERODACTYL ; 142 db 80, 105, 65, 130, 60, 75 @@ -4404,7 +4404,7 @@ AerodactylBaseData: ; 0x525c4 db %00000010 ; end -SnorlaxBaseData: ; 0x525e4 +SnorlaxBaseData:: ; 0x525e4 db SNORLAX ; 143 db 160, 110, 65, 30, 65, 110 @@ -4435,7 +4435,7 @@ SnorlaxBaseData: ; 0x525e4 db %00001110 ; end -ArticunoBaseData: ; 0x52604 +ArticunoBaseData:: ; 0x52604 db ARTICUNO ; 144 db 90, 85, 100, 85, 95, 125 @@ -4466,7 +4466,7 @@ ArticunoBaseData: ; 0x52604 db %00001000 ; end -ZapdosBaseData: ; 0x52624 +ZapdosBaseData:: ; 0x52624 db ZAPDOS ; 145 db 90, 90, 85, 100, 125, 90 @@ -4497,7 +4497,7 @@ ZapdosBaseData: ; 0x52624 db %00000100 ; end -MoltresBaseData: ; 0x52644 +MoltresBaseData:: ; 0x52644 db MOLTRES ; 146 db 90, 100, 90, 90, 125, 85 @@ -4528,7 +4528,7 @@ MoltresBaseData: ; 0x52644 db %00000010 ; end -DratiniBaseData: ; 0x52664 +DratiniBaseData:: ; 0x52664 db DRATINI ; 147 db 41, 64, 45, 50, 50, 50 @@ -4559,7 +4559,7 @@ DratiniBaseData: ; 0x52664 db %00001111 ; end -DragonairBaseData: ; 0x52684 +DragonairBaseData:: ; 0x52684 db DRAGONAIR ; 148 db 61, 84, 65, 70, 70, 70 @@ -4590,7 +4590,7 @@ DragonairBaseData: ; 0x52684 db %00001111 ; end -DragoniteBaseData: ; 0x526a4 +DragoniteBaseData:: ; 0x526a4 db DRAGONITE ; 149 db 91, 134, 95, 80, 100, 100 @@ -4621,7 +4621,7 @@ DragoniteBaseData: ; 0x526a4 db %00001111 ; end -MewtwoBaseData: ; 0x526c4 +MewtwoBaseData:: ; 0x526c4 db MEWTWO ; 150 db 106, 110, 90, 130, 154, 90 @@ -4652,7 +4652,7 @@ MewtwoBaseData: ; 0x526c4 db %00001110 ; end -MewBaseData: ; 0x526e4 +MewBaseData:: ; 0x526e4 db MEW ; 151 db 100, 100, 100, 100, 100, 100 @@ -4683,7 +4683,7 @@ MewBaseData: ; 0x526e4 db %00001111 ; end -ChikoritaBaseData: ; 0x52704 +ChikoritaBaseData:: ; 0x52704 db CHIKORITA ; 152 db 45, 49, 65, 45, 49, 65 @@ -4714,7 +4714,7 @@ ChikoritaBaseData: ; 0x52704 db %00000000 ; end -BayleefBaseData: ; 0x52724 +BayleefBaseData:: ; 0x52724 db BAYLEEF ; 153 db 60, 62, 80, 60, 63, 80 @@ -4745,7 +4745,7 @@ BayleefBaseData: ; 0x52724 db %00000000 ; end -MeganiumBaseData: ; 0x52744 +MeganiumBaseData:: ; 0x52744 db MEGANIUM ; 154 db 80, 82, 100, 80, 83, 100 @@ -4776,7 +4776,7 @@ MeganiumBaseData: ; 0x52744 db %00000000 ; end -CyndaquilBaseData: ; 0x52764 +CyndaquilBaseData:: ; 0x52764 db CYNDAQUIL ; 155 db 39, 52, 43, 65, 60, 50 @@ -4807,7 +4807,7 @@ CyndaquilBaseData: ; 0x52764 db %00000010 ; end -QuilavaBaseData: ; 0x52784 +QuilavaBaseData:: ; 0x52784 db QUILAVA ; 156 db 58, 64, 58, 80, 80, 65 @@ -4838,7 +4838,7 @@ QuilavaBaseData: ; 0x52784 db %00000010 ; end -TyphlosionBaseData: ; 0x527a4 +TyphlosionBaseData:: ; 0x527a4 db TYPHLOSION ; 157 db 78, 84, 78, 100, 109, 85 @@ -4869,7 +4869,7 @@ TyphlosionBaseData: ; 0x527a4 db %00000010 ; end -TotodileBaseData: ; 0x527c4 +TotodileBaseData:: ; 0x527c4 db TOTODILE ; 158 db 50, 65, 64, 43, 44, 48 @@ -4900,7 +4900,7 @@ TotodileBaseData: ; 0x527c4 db %00001000 ; end -CroconawBaseData: ; 0x527e4 +CroconawBaseData:: ; 0x527e4 db CROCONAW ; 159 db 65, 80, 80, 58, 59, 63 @@ -4931,7 +4931,7 @@ CroconawBaseData: ; 0x527e4 db %00001000 ; end -FeraligatrBaseData: ; 0x52804 +FeraligatrBaseData:: ; 0x52804 db FERALIGATR ; 160 db 85, 105, 100, 78, 79, 83 @@ -4962,7 +4962,7 @@ FeraligatrBaseData: ; 0x52804 db %00001000 ; end -SentretBaseData: ; 0x52824 +SentretBaseData:: ; 0x52824 db SENTRET ; 161 db 35, 46, 34, 20, 35, 45 @@ -4993,7 +4993,7 @@ SentretBaseData: ; 0x52824 db %00000000 ; end -FurretBaseData: ; 0x52844 +FurretBaseData:: ; 0x52844 db FURRET ; 162 db 85, 76, 64, 90, 45, 55 @@ -5024,7 +5024,7 @@ FurretBaseData: ; 0x52844 db %00000000 ; end -HoothootBaseData: ; 0x52864 +HoothootBaseData:: ; 0x52864 db HOOTHOOT ; 163 db 60, 30, 30, 50, 36, 56 @@ -5055,7 +5055,7 @@ HoothootBaseData: ; 0x52864 db %00000000 ; end -NoctowlBaseData: ; 0x52884 +NoctowlBaseData:: ; 0x52884 db NOCTOWL ; 164 db 100, 50, 50, 70, 76, 96 @@ -5086,7 +5086,7 @@ NoctowlBaseData: ; 0x52884 db %00000000 ; end -LedybaBaseData: ; 0x528a4 +LedybaBaseData:: ; 0x528a4 db LEDYBA ; 165 db 40, 20, 30, 55, 40, 80 @@ -5117,7 +5117,7 @@ LedybaBaseData: ; 0x528a4 db %00000000 ; end -LedianBaseData: ; 0x528c4 +LedianBaseData:: ; 0x528c4 db LEDIAN ; 166 db 55, 35, 50, 85, 55, 110 @@ -5148,7 +5148,7 @@ LedianBaseData: ; 0x528c4 db %00000000 ; end -SpinarakBaseData: ; 0x528e4 +SpinarakBaseData:: ; 0x528e4 db SPINARAK ; 167 db 40, 60, 40, 30, 40, 40 @@ -5179,7 +5179,7 @@ SpinarakBaseData: ; 0x528e4 db %00000000 ; end -AriadosBaseData: ; 0x52904 +AriadosBaseData:: ; 0x52904 db ARIADOS ; 168 db 70, 90, 70, 40, 60, 60 @@ -5210,7 +5210,7 @@ AriadosBaseData: ; 0x52904 db %00000000 ; end -CrobatBaseData: ; 0x52924 +CrobatBaseData:: ; 0x52924 db CROBAT ; 169 db 85, 90, 80, 130, 70, 80 @@ -5241,7 +5241,7 @@ CrobatBaseData: ; 0x52924 db %00000000 ; end -ChinchouBaseData: ; 0x52944 +ChinchouBaseData:: ; 0x52944 db CHINCHOU ; 170 db 75, 38, 38, 67, 56, 56 @@ -5272,7 +5272,7 @@ ChinchouBaseData: ; 0x52944 db %00001101 ; end -LanturnBaseData: ; 0x52964 +LanturnBaseData:: ; 0x52964 db LANTURN ; 171 db 125, 58, 58, 67, 76, 76 @@ -5303,7 +5303,7 @@ LanturnBaseData: ; 0x52964 db %00001101 ; end -PichuBaseData: ; 0x52984 +PichuBaseData:: ; 0x52984 db PICHU ; 172 db 20, 40, 15, 60, 35, 35 @@ -5334,7 +5334,7 @@ PichuBaseData: ; 0x52984 db %00000100 ; end -CleffaBaseData: ; 0x529a4 +CleffaBaseData:: ; 0x529a4 db CLEFFA ; 173 db 50, 25, 28, 15, 45, 55 @@ -5365,7 +5365,7 @@ CleffaBaseData: ; 0x529a4 db %00000010 ; end -IgglybuffBaseData: ; 0x529c4 +IgglybuffBaseData:: ; 0x529c4 db IGGLYBUFF ; 174 db 90, 30, 15, 15, 40, 20 @@ -5396,7 +5396,7 @@ IgglybuffBaseData: ; 0x529c4 db %00000010 ; end -TogepiBaseData: ; 0x529e4 +TogepiBaseData:: ; 0x529e4 db TOGEPI ; 175 db 35, 20, 65, 20, 40, 65 @@ -5427,7 +5427,7 @@ TogepiBaseData: ; 0x529e4 db %00000010 ; end -TogeticBaseData: ; 0x52a04 +TogeticBaseData:: ; 0x52a04 db TOGETIC ; 176 db 55, 40, 85, 40, 80, 105 @@ -5458,7 +5458,7 @@ TogeticBaseData: ; 0x52a04 db %00000010 ; end -NatuBaseData: ; 0x52a24 +NatuBaseData:: ; 0x52a24 db NATU ; 177 db 40, 50, 45, 70, 70, 45 @@ -5489,7 +5489,7 @@ NatuBaseData: ; 0x52a24 db %00000000 ; end -XatuBaseData: ; 0x52a44 +XatuBaseData:: ; 0x52a44 db XATU ; 178 db 65, 75, 70, 95, 95, 70 @@ -5520,7 +5520,7 @@ XatuBaseData: ; 0x52a44 db %00000000 ; end -MareepBaseData: ; 0x52a64 +MareepBaseData:: ; 0x52a64 db MAREEP ; 179 db 55, 40, 40, 35, 65, 45 @@ -5551,7 +5551,7 @@ MareepBaseData: ; 0x52a64 db %00000100 ; end -FlaaffyBaseData: ; 0x52a84 +FlaaffyBaseData:: ; 0x52a84 db FLAAFFY ; 180 db 70, 55, 55, 45, 80, 60 @@ -5582,7 +5582,7 @@ FlaaffyBaseData: ; 0x52a84 db %00000100 ; end -AmpharosBaseData: ; 0x52aa4 +AmpharosBaseData:: ; 0x52aa4 db AMPHAROS ; 181 db 90, 75, 75, 55, 115, 90 @@ -5613,7 +5613,7 @@ AmpharosBaseData: ; 0x52aa4 db %00000100 ; end -BellossomBaseData: ; 0x52ac4 +BellossomBaseData:: ; 0x52ac4 db BELLOSSOM ; 182 db 75, 80, 85, 50, 90, 100 @@ -5644,7 +5644,7 @@ BellossomBaseData: ; 0x52ac4 db %00000000 ; end -MarillBaseData: ; 0x52ae4 +MarillBaseData:: ; 0x52ae4 db MARILL ; 183 db 70, 20, 50, 40, 20, 50 @@ -5675,7 +5675,7 @@ MarillBaseData: ; 0x52ae4 db %00001001 ; end -AzumarillBaseData: ; 0x52b04 +AzumarillBaseData:: ; 0x52b04 db AZUMARILL ; 184 db 100, 50, 80, 50, 50, 80 @@ -5706,7 +5706,7 @@ AzumarillBaseData: ; 0x52b04 db %00001001 ; end -SudowoodoBaseData: ; 0x52b24 +SudowoodoBaseData:: ; 0x52b24 db SUDOWOODO ; 185 db 70, 100, 115, 30, 30, 65 @@ -5737,7 +5737,7 @@ SudowoodoBaseData: ; 0x52b24 db %00000000 ; end -PolitoedBaseData: ; 0x52b44 +PolitoedBaseData:: ; 0x52b44 db POLITOED ; 186 db 90, 75, 75, 70, 90, 100 @@ -5768,7 +5768,7 @@ PolitoedBaseData: ; 0x52b44 db %00001001 ; end -HoppipBaseData: ; 0x52b64 +HoppipBaseData:: ; 0x52b64 db HOPPIP ; 187 db 35, 35, 40, 50, 35, 55 @@ -5799,7 +5799,7 @@ HoppipBaseData: ; 0x52b64 db %00000000 ; end -SkiploomBaseData: ; 0x52b84 +SkiploomBaseData:: ; 0x52b84 db SKIPLOOM ; 188 db 55, 45, 50, 80, 45, 65 @@ -5830,7 +5830,7 @@ SkiploomBaseData: ; 0x52b84 db %00000000 ; end -JumpluffBaseData: ; 0x52ba4 +JumpluffBaseData:: ; 0x52ba4 db JUMPLUFF ; 189 db 75, 55, 70, 110, 55, 85 @@ -5861,7 +5861,7 @@ JumpluffBaseData: ; 0x52ba4 db %00000000 ; end -AipomBaseData: ; 0x52bc4 +AipomBaseData:: ; 0x52bc4 db AIPOM ; 190 db 55, 70, 55, 85, 40, 55 @@ -5892,7 +5892,7 @@ AipomBaseData: ; 0x52bc4 db %00000100 ; end -SunkernBaseData: ; 0x52be4 +SunkernBaseData:: ; 0x52be4 db SUNKERN ; 191 db 30, 30, 30, 30, 30, 30 @@ -5923,7 +5923,7 @@ SunkernBaseData: ; 0x52be4 db %00000000 ; end -SunfloraBaseData: ; 0x52c04 +SunfloraBaseData:: ; 0x52c04 db SUNFLORA ; 192 db 75, 75, 55, 30, 105, 85 @@ -5954,7 +5954,7 @@ SunfloraBaseData: ; 0x52c04 db %00000000 ; end -YanmaBaseData: ; 0x52c24 +YanmaBaseData:: ; 0x52c24 db YANMA ; 193 db 65, 65, 45, 95, 75, 45 @@ -5985,7 +5985,7 @@ YanmaBaseData: ; 0x52c24 db %00000000 ; end -WooperBaseData: ; 0x52c44 +WooperBaseData:: ; 0x52c44 db WOOPER ; 194 db 55, 45, 45, 15, 25, 25 @@ -6016,7 +6016,7 @@ WooperBaseData: ; 0x52c44 db %00001000 ; end -QuagsireBaseData: ; 0x52c64 +QuagsireBaseData:: ; 0x52c64 db QUAGSIRE ; 195 db 95, 85, 85, 35, 65, 65 @@ -6047,7 +6047,7 @@ QuagsireBaseData: ; 0x52c64 db %00001000 ; end -EspeonBaseData: ; 0x52c84 +EspeonBaseData:: ; 0x52c84 db ESPEON ; 196 db 65, 65, 60, 110, 130, 95 @@ -6078,7 +6078,7 @@ EspeonBaseData: ; 0x52c84 db %00000000 ; end -UmbreonBaseData: ; 0x52ca4 +UmbreonBaseData:: ; 0x52ca4 db UMBREON ; 197 db 95, 65, 110, 65, 60, 130 @@ -6109,7 +6109,7 @@ UmbreonBaseData: ; 0x52ca4 db %00000000 ; end -MurkrowBaseData: ; 0x52cc4 +MurkrowBaseData:: ; 0x52cc4 db MURKROW ; 198 db 60, 85, 42, 91, 85, 42 @@ -6140,7 +6140,7 @@ MurkrowBaseData: ; 0x52cc4 db %00000000 ; end -SlowkingBaseData: ; 0x52ce4 +SlowkingBaseData:: ; 0x52ce4 db SLOWKING ; 199 db 95, 75, 80, 30, 100, 110 @@ -6171,7 +6171,7 @@ SlowkingBaseData: ; 0x52ce4 db %00001010 ; end -MisdreavusBaseData: ; 0x52d04 +MisdreavusBaseData:: ; 0x52d04 db MISDREAVUS ; 200 db 60, 60, 60, 85, 85, 85 @@ -6202,7 +6202,7 @@ MisdreavusBaseData: ; 0x52d04 db %00000100 ; end -UnownBaseData: ; 0x52d24 +UnownBaseData:: ; 0x52d24 db UNOWN ; 201 db 48, 72, 48, 48, 72, 48 @@ -6233,7 +6233,7 @@ UnownBaseData: ; 0x52d24 db %00000000 ; end -WobbuffetBaseData: ; 0x52d44 +WobbuffetBaseData:: ; 0x52d44 db WOBBUFFET ; 202 db 190, 33, 58, 33, 33, 58 @@ -6264,7 +6264,7 @@ WobbuffetBaseData: ; 0x52d44 db %00000000 ; end -GirafarigBaseData: ; 0x52d64 +GirafarigBaseData:: ; 0x52d64 db GIRAFARIG ; 203 db 70, 80, 65, 85, 90, 65 @@ -6295,7 +6295,7 @@ GirafarigBaseData: ; 0x52d64 db %00000100 ; end -PinecoBaseData: ; 0x52d84 +PinecoBaseData:: ; 0x52d84 db PINECO ; 204 db 50, 65, 90, 15, 35, 35 @@ -6326,7 +6326,7 @@ PinecoBaseData: ; 0x52d84 db %00000000 ; end -ForretressBaseData: ; 0x52da4 +ForretressBaseData:: ; 0x52da4 db FORRETRESS ; 205 db 75, 90, 140, 40, 60, 60 @@ -6357,7 +6357,7 @@ ForretressBaseData: ; 0x52da4 db %00000000 ; end -DunsparceBaseData: ; 0x52dc4 +DunsparceBaseData:: ; 0x52dc4 db DUNSPARCE ; 206 db 100, 70, 70, 45, 65, 65 @@ -6388,7 +6388,7 @@ DunsparceBaseData: ; 0x52dc4 db %00000110 ; end -GligarBaseData: ; 0x52de4 +GligarBaseData:: ; 0x52de4 db GLIGAR ; 207 db 65, 75, 105, 85, 35, 65 @@ -6419,7 +6419,7 @@ GligarBaseData: ; 0x52de4 db %00000000 ; end -SteelixBaseData: ; 0x52e04 +SteelixBaseData:: ; 0x52e04 db STEELIX ; 208 db 75, 85, 200, 30, 55, 65 @@ -6450,7 +6450,7 @@ SteelixBaseData: ; 0x52e04 db %00000000 ; end -SnubbullBaseData: ; 0x52e24 +SnubbullBaseData:: ; 0x52e24 db SNUBBULL ; 209 db 60, 80, 50, 30, 40, 40 @@ -6481,7 +6481,7 @@ SnubbullBaseData: ; 0x52e24 db %00000100 ; end -GranbullBaseData: ; 0x52e44 +GranbullBaseData:: ; 0x52e44 db GRANBULL ; 210 db 90, 120, 75, 45, 60, 60 @@ -6512,7 +6512,7 @@ GranbullBaseData: ; 0x52e44 db %00000100 ; end -QwilfishBaseData: ; 0x52e64 +QwilfishBaseData:: ; 0x52e64 db QWILFISH ; 211 db 65, 95, 75, 85, 55, 55 @@ -6543,7 +6543,7 @@ QwilfishBaseData: ; 0x52e64 db %00001001 ; end -ScizorBaseData: ; 0x52e84 +ScizorBaseData:: ; 0x52e84 db SCIZOR ; 212 db 70, 130, 100, 65, 55, 80 @@ -6574,7 +6574,7 @@ ScizorBaseData: ; 0x52e84 db %00000000 ; end -ShuckleBaseData: ; 0x52ea4 +ShuckleBaseData:: ; 0x52ea4 db SHUCKLE ; 213 db 20, 10, 230, 05, 10, 230 @@ -6605,7 +6605,7 @@ ShuckleBaseData: ; 0x52ea4 db %00000000 ; end -HeracrossBaseData: ; 0x52ec4 +HeracrossBaseData:: ; 0x52ec4 db HERACROSS ; 214 db 80, 125, 75, 85, 40, 95 @@ -6636,7 +6636,7 @@ HeracrossBaseData: ; 0x52ec4 db %00000000 ; end -SneaselBaseData: ; 0x52ee4 +SneaselBaseData:: ; 0x52ee4 db SNEASEL ; 215 db 55, 95, 55, 115, 35, 75 @@ -6667,7 +6667,7 @@ SneaselBaseData: ; 0x52ee4 db %00001000 ; end -TeddiursaBaseData: ; 0x52f04 +TeddiursaBaseData:: ; 0x52f04 db TEDDIURSA ; 216 db 60, 80, 50, 40, 50, 50 @@ -6698,7 +6698,7 @@ TeddiursaBaseData: ; 0x52f04 db %00000000 ; end -UrsaringBaseData: ; 0x52f24 +UrsaringBaseData:: ; 0x52f24 db URSARING ; 217 db 90, 130, 75, 55, 75, 75 @@ -6729,7 +6729,7 @@ UrsaringBaseData: ; 0x52f24 db %00000000 ; end -SlugmaBaseData: ; 0x52f44 +SlugmaBaseData:: ; 0x52f44 db SLUGMA ; 218 db 40, 40, 40, 20, 70, 40 @@ -6760,7 +6760,7 @@ SlugmaBaseData: ; 0x52f44 db %00000010 ; end -MagcargoBaseData: ; 0x52f64 +MagcargoBaseData:: ; 0x52f64 db MAGCARGO ; 219 db 50, 50, 120, 30, 80, 80 @@ -6791,7 +6791,7 @@ MagcargoBaseData: ; 0x52f64 db %00000010 ; end -SwinubBaseData: ; 0x52f84 +SwinubBaseData:: ; 0x52f84 db SWINUB ; 220 db 50, 50, 40, 50, 30, 30 @@ -6822,7 +6822,7 @@ SwinubBaseData: ; 0x52f84 db %00001000 ; end -PiloswineBaseData: ; 0x52fa4 +PiloswineBaseData:: ; 0x52fa4 db PILOSWINE ; 221 db 100, 100, 80, 50, 60, 60 @@ -6853,7 +6853,7 @@ PiloswineBaseData: ; 0x52fa4 db %00001000 ; end -CorsolaBaseData: ; 0x52fc4 +CorsolaBaseData:: ; 0x52fc4 db CORSOLA ; 222 db 55, 55, 85, 35, 65, 85 @@ -6884,7 +6884,7 @@ CorsolaBaseData: ; 0x52fc4 db %00001000 ; end -RemoraidBaseData: ; 0x52fe4 +RemoraidBaseData:: ; 0x52fe4 db REMORAID ; 223 db 35, 65, 35, 65, 65, 35 @@ -6915,7 +6915,7 @@ RemoraidBaseData: ; 0x52fe4 db %00001010 ; end -OctilleryBaseData: ; 0x53004 +OctilleryBaseData:: ; 0x53004 db OCTILLERY ; 224 db 75, 105, 75, 45, 105, 75 @@ -6946,7 +6946,7 @@ OctilleryBaseData: ; 0x53004 db %00001010 ; end -DelibirdBaseData: ; 0x53024 +DelibirdBaseData:: ; 0x53024 db DELIBIRD ; 225 db 45, 55, 45, 75, 65, 45 @@ -6977,7 +6977,7 @@ DelibirdBaseData: ; 0x53024 db %00001000 ; end -MantineBaseData: ; 0x53044 +MantineBaseData:: ; 0x53044 db MANTINE ; 226 db 65, 40, 70, 70, 80, 140 @@ -7008,7 +7008,7 @@ MantineBaseData: ; 0x53044 db %00001001 ; end -SkarmoryBaseData: ; 0x53064 +SkarmoryBaseData:: ; 0x53064 db SKARMORY ; 227 db 65, 80, 140, 70, 40, 70 @@ -7039,7 +7039,7 @@ SkarmoryBaseData: ; 0x53064 db %00000000 ; end -HoundourBaseData: ; 0x53084 +HoundourBaseData:: ; 0x53084 db HOUNDOUR ; 228 db 45, 60, 30, 65, 80, 50 @@ -7070,7 +7070,7 @@ HoundourBaseData: ; 0x53084 db %00000010 ; end -HoundoomBaseData: ; 0x530a4 +HoundoomBaseData:: ; 0x530a4 db HOUNDOOM ; 229 db 75, 90, 50, 95, 110, 80 @@ -7101,7 +7101,7 @@ HoundoomBaseData: ; 0x530a4 db %00000010 ; end -KingdraBaseData: ; 0x530c4 +KingdraBaseData:: ; 0x530c4 db KINGDRA ; 230 db 75, 95, 95, 85, 95, 95 @@ -7132,7 +7132,7 @@ KingdraBaseData: ; 0x530c4 db %00001001 ; end -PhanpyBaseData: ; 0x530e4 +PhanpyBaseData:: ; 0x530e4 db PHANPY ; 231 db 90, 60, 60, 40, 40, 40 @@ -7163,7 +7163,7 @@ PhanpyBaseData: ; 0x530e4 db %00000000 ; end -DonphanBaseData: ; 0x53104 +DonphanBaseData:: ; 0x53104 db DONPHAN ; 232 db 90, 120, 120, 50, 60, 60 @@ -7194,7 +7194,7 @@ DonphanBaseData: ; 0x53104 db %00000000 ; end -Porygon2BaseData: ; 0x53124 +Porygon2BaseData:: ; 0x53124 db PORYGON2 ; 233 db 85, 80, 90, 60, 105, 95 @@ -7225,7 +7225,7 @@ Porygon2BaseData: ; 0x53124 db %00001100 ; end -StantlerBaseData: ; 0x53144 +StantlerBaseData:: ; 0x53144 db STANTLER ; 234 db 73, 95, 62, 85, 85, 65 @@ -7256,7 +7256,7 @@ StantlerBaseData: ; 0x53144 db %00000000 ; end -SmeargleBaseData: ; 0x53164 +SmeargleBaseData:: ; 0x53164 db SMEARGLE ; 235 db 55, 20, 35, 75, 20, 45 @@ -7287,7 +7287,7 @@ SmeargleBaseData: ; 0x53164 db %00000000 ; end -TyrogueBaseData: ; 0x53184 +TyrogueBaseData:: ; 0x53184 db TYROGUE ; 236 db 35, 35, 35, 35, 35, 35 @@ -7318,7 +7318,7 @@ TyrogueBaseData: ; 0x53184 db %00000000 ; end -HitmontopBaseData: ; 0x531a4 +HitmontopBaseData:: ; 0x531a4 db HITMONTOP ; 237 db 50, 95, 95, 70, 35, 110 @@ -7349,7 +7349,7 @@ HitmontopBaseData: ; 0x531a4 db %00000000 ; end -SmoochumBaseData: ; 0x531c4 +SmoochumBaseData:: ; 0x531c4 db SMOOCHUM ; 238 db 45, 30, 15, 65, 85, 65 @@ -7380,7 +7380,7 @@ SmoochumBaseData: ; 0x531c4 db %00001000 ; end -ElekidBaseData: ; 0x531e4 +ElekidBaseData:: ; 0x531e4 db ELEKID ; 239 db 45, 63, 37, 95, 65, 55 @@ -7411,7 +7411,7 @@ ElekidBaseData: ; 0x531e4 db %00000100 ; end -MagbyBaseData: ; 0x53204 +MagbyBaseData:: ; 0x53204 db MAGBY ; 240 db 45, 75, 37, 83, 70, 55 @@ -7442,7 +7442,7 @@ MagbyBaseData: ; 0x53204 db %00000010 ; end -MiltankBaseData: ; 0x53224 +MiltankBaseData:: ; 0x53224 db MILTANK ; 241 db 95, 80, 105, 100, 40, 70 @@ -7473,7 +7473,7 @@ MiltankBaseData: ; 0x53224 db %00001100 ; end -BlisseyBaseData: ; 0x53244 +BlisseyBaseData:: ; 0x53244 db BLISSEY ; 242 db 255, 10, 10, 55, 75, 135 @@ -7504,7 +7504,7 @@ BlisseyBaseData: ; 0x53244 db %00001110 ; end -RaikouBaseData: ; 0x53264 +RaikouBaseData:: ; 0x53264 db RAIKOU ; 243 db 90, 85, 75, 115, 115, 100 @@ -7535,7 +7535,7 @@ RaikouBaseData: ; 0x53264 db %00000100 ; end -EnteiBaseData: ; 0x53284 +EnteiBaseData:: ; 0x53284 db ENTEI ; 244 db 115, 115, 85, 100, 90, 75 @@ -7566,7 +7566,7 @@ EnteiBaseData: ; 0x53284 db %00000010 ; end -SuicuneBaseData: ; 0x532a4 +SuicuneBaseData:: ; 0x532a4 db SUICUNE ; 245 db 100, 75, 115, 85, 90, 115 @@ -7597,7 +7597,7 @@ SuicuneBaseData: ; 0x532a4 db %00001001 ; end -LarvitarBaseData: ; 0x532c4 +LarvitarBaseData:: ; 0x532c4 db LARVITAR ; 246 db 50, 64, 50, 41, 45, 50 @@ -7628,7 +7628,7 @@ LarvitarBaseData: ; 0x532c4 db %00000000 ; end -PupitarBaseData: ; 0x532e4 +PupitarBaseData:: ; 0x532e4 db PUPITAR ; 247 db 70, 84, 70, 51, 65, 70 @@ -7659,7 +7659,7 @@ PupitarBaseData: ; 0x532e4 db %00000000 ; end -TyranitarBaseData: ; 0x53304 +TyranitarBaseData:: ; 0x53304 db TYRANITAR ; 248 db 100, 134, 110, 61, 95, 100 @@ -7690,7 +7690,7 @@ TyranitarBaseData: ; 0x53304 db %00001110 ; end -LugiaBaseData: ; 0x53324 +LugiaBaseData:: ; 0x53324 db LUGIA ; 249 db 106, 90, 130, 110, 90, 154 @@ -7721,7 +7721,7 @@ LugiaBaseData: ; 0x53324 db %00001101 ; end -Ho_OhBaseData: ; 0x53344 +Ho_OhBaseData:: ; 0x53344 db HO_OH ; 250 db 106, 130, 90, 90, 110, 154 @@ -7752,7 +7752,7 @@ Ho_OhBaseData: ; 0x53344 db %00000110 ; end -CelebiBaseData: ; 0x53364 +CelebiBaseData:: ; 0x53364 db CELEBI ; 251 db 100, 100, 100, 100, 100, 100 diff --git a/stats/evos_attacks.asm b/stats/evos_attacks.asm index 9dcc64ed6..eaebcc84a 100644 --- a/stats/evos_attacks.asm +++ b/stats/evos_attacks.asm @@ -1,4 +1,4 @@ -EvosAttacks: +EvosAttacks:: BulbasaurEvosAttacks: db EVOLVE_LEVEL,16,IVYSAUR diff --git a/stats/evos_attacks_pointers.asm b/stats/evos_attacks_pointers.asm index 6ecd74893..4ce10b105 100644 --- a/stats/evos_attacks_pointers.asm +++ b/stats/evos_attacks_pointers.asm @@ -2,7 +2,7 @@ ; These are grouped together since they're both checked at level-up. -EvosAttacksPointers: ; 0x425b1 +EvosAttacksPointers:: ; 0x425b1 dw BulbasaurEvosAttacks dw IvysaurEvosAttacks dw VenusaurEvosAttacks diff --git a/stats/pokedex/entries.asm b/stats/pokedex/entries.asm index 7cfaa254d..3d063b93f 100644 --- a/stats/pokedex/entries.asm +++ b/stats/pokedex/entries.asm @@ -1,24 +1,24 @@ SECTION "Pokedex Entries 001-064", ROMX, BANK[POKEDEX_ENTRIES_1] -PokedexEntries1: +PokedexEntries1:: INCLUDE "stats/pokedex/entries_1.asm" SECTION "Pokedex Entries 065-128", ROMX, BANK[POKEDEX_ENTRIES_2] -PokedexEntries2: +PokedexEntries2:: INCLUDE "stats/pokedex/entries_2.asm" SECTION "Pokedex Entries 129-192", ROMX, BANK[POKEDEX_ENTRIES_3] -PokedexEntries3: +PokedexEntries3:: INCLUDE "stats/pokedex/entries_3.asm" SECTION "Pokedex Entries 193-251", ROMX, BANK[POKEDEX_ENTRIES_4] -PokedexEntries4: +PokedexEntries4:: INCLUDE "stats/pokedex/entries_4.asm" diff --git a/stats/pokedex/entries_1.asm b/stats/pokedex/entries_1.asm index 81f1608f4..cd3b95c0b 100644 --- a/stats/pokedex/entries_1.asm +++ b/stats/pokedex/entries_1.asm @@ -1,64 +1,64 @@ -BulbasaurPokedexEntry: INCLUDE "stats/pokedex/entries/001.asm" -IvysaurPokedexEntry: INCLUDE "stats/pokedex/entries/002.asm" -VenusaurPokedexEntry: INCLUDE "stats/pokedex/entries/003.asm" -CharmanderPokedexEntry: INCLUDE "stats/pokedex/entries/004.asm" -CharmeleonPokedexEntry: INCLUDE "stats/pokedex/entries/005.asm" -CharizardPokedexEntry: INCLUDE "stats/pokedex/entries/006.asm" -SquirtlePokedexEntry: INCLUDE "stats/pokedex/entries/007.asm" -WartortlePokedexEntry: INCLUDE "stats/pokedex/entries/008.asm" -BlastoisePokedexEntry: INCLUDE "stats/pokedex/entries/009.asm" -CaterpiePokedexEntry: INCLUDE "stats/pokedex/entries/010.asm" -MetapodPokedexEntry: INCLUDE "stats/pokedex/entries/011.asm" -ButterfreePokedexEntry: INCLUDE "stats/pokedex/entries/012.asm" -WeedlePokedexEntry: INCLUDE "stats/pokedex/entries/013.asm" -KakunaPokedexEntry: INCLUDE "stats/pokedex/entries/014.asm" -BeedrillPokedexEntry: INCLUDE "stats/pokedex/entries/015.asm" -PidgeyPokedexEntry: INCLUDE "stats/pokedex/entries/016.asm" -PidgeottoPokedexEntry: INCLUDE "stats/pokedex/entries/017.asm" -PidgeotPokedexEntry: INCLUDE "stats/pokedex/entries/018.asm" -RattataPokedexEntry: INCLUDE "stats/pokedex/entries/019.asm" -RaticatePokedexEntry: INCLUDE "stats/pokedex/entries/020.asm" -SpearowPokedexEntry: INCLUDE "stats/pokedex/entries/021.asm" -FearowPokedexEntry: INCLUDE "stats/pokedex/entries/022.asm" -EkansPokedexEntry: INCLUDE "stats/pokedex/entries/023.asm" -ArbokPokedexEntry: INCLUDE "stats/pokedex/entries/024.asm" -PikachuPokedexEntry: INCLUDE "stats/pokedex/entries/025.asm" -RaichuPokedexEntry: INCLUDE "stats/pokedex/entries/026.asm" -SandshrewPokedexEntry: INCLUDE "stats/pokedex/entries/027.asm" -SandslashPokedexEntry: INCLUDE "stats/pokedex/entries/028.asm" -NidoranFPokedexEntry: INCLUDE "stats/pokedex/entries/029.asm" -NidorinaPokedexEntry: INCLUDE "stats/pokedex/entries/030.asm" -NidoqueenPokedexEntry: INCLUDE "stats/pokedex/entries/031.asm" -NidoranMPokedexEntry: INCLUDE "stats/pokedex/entries/032.asm" -NidorinoPokedexEntry: INCLUDE "stats/pokedex/entries/033.asm" -NidokingPokedexEntry: INCLUDE "stats/pokedex/entries/034.asm" -ClefairyPokedexEntry: INCLUDE "stats/pokedex/entries/035.asm" -ClefablePokedexEntry: INCLUDE "stats/pokedex/entries/036.asm" -VulpixPokedexEntry: INCLUDE "stats/pokedex/entries/037.asm" -NinetalesPokedexEntry: INCLUDE "stats/pokedex/entries/038.asm" -JigglypuffPokedexEntry: INCLUDE "stats/pokedex/entries/039.asm" -WigglytuffPokedexEntry: INCLUDE "stats/pokedex/entries/040.asm" -ZubatPokedexEntry: INCLUDE "stats/pokedex/entries/041.asm" -GolbatPokedexEntry: INCLUDE "stats/pokedex/entries/042.asm" -OddishPokedexEntry: INCLUDE "stats/pokedex/entries/043.asm" -GloomPokedexEntry: INCLUDE "stats/pokedex/entries/044.asm" -VileplumePokedexEntry: INCLUDE "stats/pokedex/entries/045.asm" -ParasPokedexEntry: INCLUDE "stats/pokedex/entries/046.asm" -ParasectPokedexEntry: INCLUDE "stats/pokedex/entries/047.asm" -VenonatPokedexEntry: INCLUDE "stats/pokedex/entries/048.asm" -VenomothPokedexEntry: INCLUDE "stats/pokedex/entries/049.asm" -DiglettPokedexEntry: INCLUDE "stats/pokedex/entries/050.asm" -DugtrioPokedexEntry: INCLUDE "stats/pokedex/entries/051.asm" -MeowthPokedexEntry: INCLUDE "stats/pokedex/entries/052.asm" -PersianPokedexEntry: INCLUDE "stats/pokedex/entries/053.asm" -PsyduckPokedexEntry: INCLUDE "stats/pokedex/entries/054.asm" -GolduckPokedexEntry: INCLUDE "stats/pokedex/entries/055.asm" -MankeyPokedexEntry: INCLUDE "stats/pokedex/entries/056.asm" -PrimeapePokedexEntry: INCLUDE "stats/pokedex/entries/057.asm" -GrowlithePokedexEntry: INCLUDE "stats/pokedex/entries/058.asm" -ArcaninePokedexEntry: INCLUDE "stats/pokedex/entries/059.asm" -PoliwagPokedexEntry: INCLUDE "stats/pokedex/entries/060.asm" -PoliwhirlPokedexEntry: INCLUDE "stats/pokedex/entries/061.asm" -PoliwrathPokedexEntry: INCLUDE "stats/pokedex/entries/062.asm" -AbraPokedexEntry: INCLUDE "stats/pokedex/entries/063.asm" -KadabraPokedexEntry: INCLUDE "stats/pokedex/entries/064.asm" +BulbasaurPokedexEntry:: INCLUDE "stats/pokedex/entries/001.asm" +IvysaurPokedexEntry:: INCLUDE "stats/pokedex/entries/002.asm" +VenusaurPokedexEntry:: INCLUDE "stats/pokedex/entries/003.asm" +CharmanderPokedexEntry:: INCLUDE "stats/pokedex/entries/004.asm" +CharmeleonPokedexEntry:: INCLUDE "stats/pokedex/entries/005.asm" +CharizardPokedexEntry:: INCLUDE "stats/pokedex/entries/006.asm" +SquirtlePokedexEntry:: INCLUDE "stats/pokedex/entries/007.asm" +WartortlePokedexEntry:: INCLUDE "stats/pokedex/entries/008.asm" +BlastoisePokedexEntry:: INCLUDE "stats/pokedex/entries/009.asm" +CaterpiePokedexEntry:: INCLUDE "stats/pokedex/entries/010.asm" +MetapodPokedexEntry:: INCLUDE "stats/pokedex/entries/011.asm" +ButterfreePokedexEntry:: INCLUDE "stats/pokedex/entries/012.asm" +WeedlePokedexEntry:: INCLUDE "stats/pokedex/entries/013.asm" +KakunaPokedexEntry:: INCLUDE "stats/pokedex/entries/014.asm" +BeedrillPokedexEntry:: INCLUDE "stats/pokedex/entries/015.asm" +PidgeyPokedexEntry:: INCLUDE "stats/pokedex/entries/016.asm" +PidgeottoPokedexEntry:: INCLUDE "stats/pokedex/entries/017.asm" +PidgeotPokedexEntry:: INCLUDE "stats/pokedex/entries/018.asm" +RattataPokedexEntry:: INCLUDE "stats/pokedex/entries/019.asm" +RaticatePokedexEntry:: INCLUDE "stats/pokedex/entries/020.asm" +SpearowPokedexEntry:: INCLUDE "stats/pokedex/entries/021.asm" +FearowPokedexEntry:: INCLUDE "stats/pokedex/entries/022.asm" +EkansPokedexEntry:: INCLUDE "stats/pokedex/entries/023.asm" +ArbokPokedexEntry:: INCLUDE "stats/pokedex/entries/024.asm" +PikachuPokedexEntry:: INCLUDE "stats/pokedex/entries/025.asm" +RaichuPokedexEntry:: INCLUDE "stats/pokedex/entries/026.asm" +SandshrewPokedexEntry:: INCLUDE "stats/pokedex/entries/027.asm" +SandslashPokedexEntry:: INCLUDE "stats/pokedex/entries/028.asm" +NidoranFPokedexEntry:: INCLUDE "stats/pokedex/entries/029.asm" +NidorinaPokedexEntry:: INCLUDE "stats/pokedex/entries/030.asm" +NidoqueenPokedexEntry:: INCLUDE "stats/pokedex/entries/031.asm" +NidoranMPokedexEntry:: INCLUDE "stats/pokedex/entries/032.asm" +NidorinoPokedexEntry:: INCLUDE "stats/pokedex/entries/033.asm" +NidokingPokedexEntry:: INCLUDE "stats/pokedex/entries/034.asm" +ClefairyPokedexEntry:: INCLUDE "stats/pokedex/entries/035.asm" +ClefablePokedexEntry:: INCLUDE "stats/pokedex/entries/036.asm" +VulpixPokedexEntry:: INCLUDE "stats/pokedex/entries/037.asm" +NinetalesPokedexEntry:: INCLUDE "stats/pokedex/entries/038.asm" +JigglypuffPokedexEntry:: INCLUDE "stats/pokedex/entries/039.asm" +WigglytuffPokedexEntry:: INCLUDE "stats/pokedex/entries/040.asm" +ZubatPokedexEntry:: INCLUDE "stats/pokedex/entries/041.asm" +GolbatPokedexEntry:: INCLUDE "stats/pokedex/entries/042.asm" +OddishPokedexEntry:: INCLUDE "stats/pokedex/entries/043.asm" +GloomPokedexEntry:: INCLUDE "stats/pokedex/entries/044.asm" +VileplumePokedexEntry:: INCLUDE "stats/pokedex/entries/045.asm" +ParasPokedexEntry:: INCLUDE "stats/pokedex/entries/046.asm" +ParasectPokedexEntry:: INCLUDE "stats/pokedex/entries/047.asm" +VenonatPokedexEntry:: INCLUDE "stats/pokedex/entries/048.asm" +VenomothPokedexEntry:: INCLUDE "stats/pokedex/entries/049.asm" +DiglettPokedexEntry:: INCLUDE "stats/pokedex/entries/050.asm" +DugtrioPokedexEntry:: INCLUDE "stats/pokedex/entries/051.asm" +MeowthPokedexEntry:: INCLUDE "stats/pokedex/entries/052.asm" +PersianPokedexEntry:: INCLUDE "stats/pokedex/entries/053.asm" +PsyduckPokedexEntry:: INCLUDE "stats/pokedex/entries/054.asm" +GolduckPokedexEntry:: INCLUDE "stats/pokedex/entries/055.asm" +MankeyPokedexEntry:: INCLUDE "stats/pokedex/entries/056.asm" +PrimeapePokedexEntry:: INCLUDE "stats/pokedex/entries/057.asm" +GrowlithePokedexEntry:: INCLUDE "stats/pokedex/entries/058.asm" +ArcaninePokedexEntry:: INCLUDE "stats/pokedex/entries/059.asm" +PoliwagPokedexEntry:: INCLUDE "stats/pokedex/entries/060.asm" +PoliwhirlPokedexEntry:: INCLUDE "stats/pokedex/entries/061.asm" +PoliwrathPokedexEntry:: INCLUDE "stats/pokedex/entries/062.asm" +AbraPokedexEntry:: INCLUDE "stats/pokedex/entries/063.asm" +KadabraPokedexEntry:: INCLUDE "stats/pokedex/entries/064.asm" diff --git a/stats/pokedex/entries_2.asm b/stats/pokedex/entries_2.asm index f69066aad..b4291a891 100644 --- a/stats/pokedex/entries_2.asm +++ b/stats/pokedex/entries_2.asm @@ -1,64 +1,64 @@ -AlakazamPokedexEntry: INCLUDE "stats/pokedex/entries/065.asm" -MachopPokedexEntry: INCLUDE "stats/pokedex/entries/066.asm" -MachokePokedexEntry: INCLUDE "stats/pokedex/entries/067.asm" -MachampPokedexEntry: INCLUDE "stats/pokedex/entries/068.asm" -BellsproutPokedexEntry: INCLUDE "stats/pokedex/entries/069.asm" -WeepinbellPokedexEntry: INCLUDE "stats/pokedex/entries/070.asm" -VictreebelPokedexEntry: INCLUDE "stats/pokedex/entries/071.asm" -TentacoolPokedexEntry: INCLUDE "stats/pokedex/entries/072.asm" -TentacruelPokedexEntry: INCLUDE "stats/pokedex/entries/073.asm" -GeodudePokedexEntry: INCLUDE "stats/pokedex/entries/074.asm" -GravelerPokedexEntry: INCLUDE "stats/pokedex/entries/075.asm" -GolemPokedexEntry: INCLUDE "stats/pokedex/entries/076.asm" -PonytaPokedexEntry: INCLUDE "stats/pokedex/entries/077.asm" -RapidashPokedexEntry: INCLUDE "stats/pokedex/entries/078.asm" -SlowpokePokedexEntry: INCLUDE "stats/pokedex/entries/079.asm" -SlowbroPokedexEntry: INCLUDE "stats/pokedex/entries/080.asm" -MagnemitePokedexEntry: INCLUDE "stats/pokedex/entries/081.asm" -MagnetonPokedexEntry: INCLUDE "stats/pokedex/entries/082.asm" -FarfetchDPokedexEntry: INCLUDE "stats/pokedex/entries/083.asm" -DoduoPokedexEntry: INCLUDE "stats/pokedex/entries/084.asm" -DodrioPokedexEntry: INCLUDE "stats/pokedex/entries/085.asm" -SeelPokedexEntry: INCLUDE "stats/pokedex/entries/086.asm" -DewgongPokedexEntry: INCLUDE "stats/pokedex/entries/087.asm" -GrimerPokedexEntry: INCLUDE "stats/pokedex/entries/088.asm" -MukPokedexEntry: INCLUDE "stats/pokedex/entries/089.asm" -ShellderPokedexEntry: INCLUDE "stats/pokedex/entries/090.asm" -CloysterPokedexEntry: INCLUDE "stats/pokedex/entries/091.asm" -GastlyPokedexEntry: INCLUDE "stats/pokedex/entries/092.asm" -HaunterPokedexEntry: INCLUDE "stats/pokedex/entries/093.asm" -GengarPokedexEntry: INCLUDE "stats/pokedex/entries/094.asm" -OnixPokedexEntry: INCLUDE "stats/pokedex/entries/095.asm" -DrowzeePokedexEntry: INCLUDE "stats/pokedex/entries/096.asm" -HypnoPokedexEntry: INCLUDE "stats/pokedex/entries/097.asm" -KrabbyPokedexEntry: INCLUDE "stats/pokedex/entries/098.asm" -KinglerPokedexEntry: INCLUDE "stats/pokedex/entries/099.asm" -VoltorbPokedexEntry: INCLUDE "stats/pokedex/entries/100.asm" -ElectrodePokedexEntry: INCLUDE "stats/pokedex/entries/101.asm" -ExeggcutePokedexEntry: INCLUDE "stats/pokedex/entries/102.asm" -ExeggutorPokedexEntry: INCLUDE "stats/pokedex/entries/103.asm" -CubonePokedexEntry: INCLUDE "stats/pokedex/entries/104.asm" -MarowakPokedexEntry: INCLUDE "stats/pokedex/entries/105.asm" -HitmonleePokedexEntry: INCLUDE "stats/pokedex/entries/106.asm" -HitmonchanPokedexEntry: INCLUDE "stats/pokedex/entries/107.asm" -LickitungPokedexEntry: INCLUDE "stats/pokedex/entries/108.asm" -KoffingPokedexEntry: INCLUDE "stats/pokedex/entries/109.asm" -WeezingPokedexEntry: INCLUDE "stats/pokedex/entries/110.asm" -RhyhornPokedexEntry: INCLUDE "stats/pokedex/entries/111.asm" -RhydonPokedexEntry: INCLUDE "stats/pokedex/entries/112.asm" -ChanseyPokedexEntry: INCLUDE "stats/pokedex/entries/113.asm" -TangelaPokedexEntry: INCLUDE "stats/pokedex/entries/114.asm" -KangaskhanPokedexEntry: INCLUDE "stats/pokedex/entries/115.asm" -HorseaPokedexEntry: INCLUDE "stats/pokedex/entries/116.asm" -SeadraPokedexEntry: INCLUDE "stats/pokedex/entries/117.asm" -GoldeenPokedexEntry: INCLUDE "stats/pokedex/entries/118.asm" -SeakingPokedexEntry: INCLUDE "stats/pokedex/entries/119.asm" -StaryuPokedexEntry: INCLUDE "stats/pokedex/entries/120.asm" -StarmiePokedexEntry: INCLUDE "stats/pokedex/entries/121.asm" -MrMimePokedexEntry: INCLUDE "stats/pokedex/entries/122.asm" -ScytherPokedexEntry: INCLUDE "stats/pokedex/entries/123.asm" -JynxPokedexEntry: INCLUDE "stats/pokedex/entries/124.asm" -ElectabuzzPokedexEntry: INCLUDE "stats/pokedex/entries/125.asm" -MagmarPokedexEntry: INCLUDE "stats/pokedex/entries/126.asm" -PinsirPokedexEntry: INCLUDE "stats/pokedex/entries/127.asm" -TaurosPokedexEntry: INCLUDE "stats/pokedex/entries/128.asm" +AlakazamPokedexEntry:: INCLUDE "stats/pokedex/entries/065.asm" +MachopPokedexEntry:: INCLUDE "stats/pokedex/entries/066.asm" +MachokePokedexEntry:: INCLUDE "stats/pokedex/entries/067.asm" +MachampPokedexEntry:: INCLUDE "stats/pokedex/entries/068.asm" +BellsproutPokedexEntry:: INCLUDE "stats/pokedex/entries/069.asm" +WeepinbellPokedexEntry:: INCLUDE "stats/pokedex/entries/070.asm" +VictreebelPokedexEntry:: INCLUDE "stats/pokedex/entries/071.asm" +TentacoolPokedexEntry:: INCLUDE "stats/pokedex/entries/072.asm" +TentacruelPokedexEntry:: INCLUDE "stats/pokedex/entries/073.asm" +GeodudePokedexEntry:: INCLUDE "stats/pokedex/entries/074.asm" +GravelerPokedexEntry:: INCLUDE "stats/pokedex/entries/075.asm" +GolemPokedexEntry:: INCLUDE "stats/pokedex/entries/076.asm" +PonytaPokedexEntry:: INCLUDE "stats/pokedex/entries/077.asm" +RapidashPokedexEntry:: INCLUDE "stats/pokedex/entries/078.asm" +SlowpokePokedexEntry:: INCLUDE "stats/pokedex/entries/079.asm" +SlowbroPokedexEntry:: INCLUDE "stats/pokedex/entries/080.asm" +MagnemitePokedexEntry:: INCLUDE "stats/pokedex/entries/081.asm" +MagnetonPokedexEntry:: INCLUDE "stats/pokedex/entries/082.asm" +FarfetchDPokedexEntry:: INCLUDE "stats/pokedex/entries/083.asm" +DoduoPokedexEntry:: INCLUDE "stats/pokedex/entries/084.asm" +DodrioPokedexEntry:: INCLUDE "stats/pokedex/entries/085.asm" +SeelPokedexEntry:: INCLUDE "stats/pokedex/entries/086.asm" +DewgongPokedexEntry:: INCLUDE "stats/pokedex/entries/087.asm" +GrimerPokedexEntry:: INCLUDE "stats/pokedex/entries/088.asm" +MukPokedexEntry:: INCLUDE "stats/pokedex/entries/089.asm" +ShellderPokedexEntry:: INCLUDE "stats/pokedex/entries/090.asm" +CloysterPokedexEntry:: INCLUDE "stats/pokedex/entries/091.asm" +GastlyPokedexEntry:: INCLUDE "stats/pokedex/entries/092.asm" +HaunterPokedexEntry:: INCLUDE "stats/pokedex/entries/093.asm" +GengarPokedexEntry:: INCLUDE "stats/pokedex/entries/094.asm" +OnixPokedexEntry:: INCLUDE "stats/pokedex/entries/095.asm" +DrowzeePokedexEntry:: INCLUDE "stats/pokedex/entries/096.asm" +HypnoPokedexEntry:: INCLUDE "stats/pokedex/entries/097.asm" +KrabbyPokedexEntry:: INCLUDE "stats/pokedex/entries/098.asm" +KinglerPokedexEntry:: INCLUDE "stats/pokedex/entries/099.asm" +VoltorbPokedexEntry:: INCLUDE "stats/pokedex/entries/100.asm" +ElectrodePokedexEntry:: INCLUDE "stats/pokedex/entries/101.asm" +ExeggcutePokedexEntry:: INCLUDE "stats/pokedex/entries/102.asm" +ExeggutorPokedexEntry:: INCLUDE "stats/pokedex/entries/103.asm" +CubonePokedexEntry:: INCLUDE "stats/pokedex/entries/104.asm" +MarowakPokedexEntry:: INCLUDE "stats/pokedex/entries/105.asm" +HitmonleePokedexEntry:: INCLUDE "stats/pokedex/entries/106.asm" +HitmonchanPokedexEntry:: INCLUDE "stats/pokedex/entries/107.asm" +LickitungPokedexEntry:: INCLUDE "stats/pokedex/entries/108.asm" +KoffingPokedexEntry:: INCLUDE "stats/pokedex/entries/109.asm" +WeezingPokedexEntry:: INCLUDE "stats/pokedex/entries/110.asm" +RhyhornPokedexEntry:: INCLUDE "stats/pokedex/entries/111.asm" +RhydonPokedexEntry:: INCLUDE "stats/pokedex/entries/112.asm" +ChanseyPokedexEntry:: INCLUDE "stats/pokedex/entries/113.asm" +TangelaPokedexEntry:: INCLUDE "stats/pokedex/entries/114.asm" +KangaskhanPokedexEntry:: INCLUDE "stats/pokedex/entries/115.asm" +HorseaPokedexEntry:: INCLUDE "stats/pokedex/entries/116.asm" +SeadraPokedexEntry:: INCLUDE "stats/pokedex/entries/117.asm" +GoldeenPokedexEntry:: INCLUDE "stats/pokedex/entries/118.asm" +SeakingPokedexEntry:: INCLUDE "stats/pokedex/entries/119.asm" +StaryuPokedexEntry:: INCLUDE "stats/pokedex/entries/120.asm" +StarmiePokedexEntry:: INCLUDE "stats/pokedex/entries/121.asm" +MrMimePokedexEntry:: INCLUDE "stats/pokedex/entries/122.asm" +ScytherPokedexEntry:: INCLUDE "stats/pokedex/entries/123.asm" +JynxPokedexEntry:: INCLUDE "stats/pokedex/entries/124.asm" +ElectabuzzPokedexEntry:: INCLUDE "stats/pokedex/entries/125.asm" +MagmarPokedexEntry:: INCLUDE "stats/pokedex/entries/126.asm" +PinsirPokedexEntry:: INCLUDE "stats/pokedex/entries/127.asm" +TaurosPokedexEntry:: INCLUDE "stats/pokedex/entries/128.asm" diff --git a/stats/pokedex/entries_3.asm b/stats/pokedex/entries_3.asm index 63e78f4e3..2526951ba 100644 --- a/stats/pokedex/entries_3.asm +++ b/stats/pokedex/entries_3.asm @@ -1,64 +1,64 @@ -MagikarpPokedexEntry: INCLUDE "stats/pokedex/entries/129.asm" -GyaradosPokedexEntry: INCLUDE "stats/pokedex/entries/130.asm" -LaprasPokedexEntry: INCLUDE "stats/pokedex/entries/131.asm" -DittoPokedexEntry: INCLUDE "stats/pokedex/entries/132.asm" -EeveePokedexEntry: INCLUDE "stats/pokedex/entries/133.asm" -VaporeonPokedexEntry: INCLUDE "stats/pokedex/entries/134.asm" -JolteonPokedexEntry: INCLUDE "stats/pokedex/entries/135.asm" -FlareonPokedexEntry: INCLUDE "stats/pokedex/entries/136.asm" -PorygonPokedexEntry: INCLUDE "stats/pokedex/entries/137.asm" -OmanytePokedexEntry: INCLUDE "stats/pokedex/entries/138.asm" -OmastarPokedexEntry: INCLUDE "stats/pokedex/entries/139.asm" -KabutoPokedexEntry: INCLUDE "stats/pokedex/entries/140.asm" -KabutopsPokedexEntry: INCLUDE "stats/pokedex/entries/141.asm" -AerodactylPokedexEntry: INCLUDE "stats/pokedex/entries/142.asm" -SnorlaxPokedexEntry: INCLUDE "stats/pokedex/entries/143.asm" -ArticunoPokedexEntry: INCLUDE "stats/pokedex/entries/144.asm" -ZapdosPokedexEntry: INCLUDE "stats/pokedex/entries/145.asm" -MoltresPokedexEntry: INCLUDE "stats/pokedex/entries/146.asm" -DratiniPokedexEntry: INCLUDE "stats/pokedex/entries/147.asm" -DragonairPokedexEntry: INCLUDE "stats/pokedex/entries/148.asm" -DragonitePokedexEntry: INCLUDE "stats/pokedex/entries/149.asm" -MewtwoPokedexEntry: INCLUDE "stats/pokedex/entries/150.asm" -MewPokedexEntry: INCLUDE "stats/pokedex/entries/151.asm" -ChikoritaPokedexEntry: INCLUDE "stats/pokedex/entries/152.asm" -BayleefPokedexEntry: INCLUDE "stats/pokedex/entries/153.asm" -MeganiumPokedexEntry: INCLUDE "stats/pokedex/entries/154.asm" -CyndaquilPokedexEntry: INCLUDE "stats/pokedex/entries/155.asm" -QuilavaPokedexEntry: INCLUDE "stats/pokedex/entries/156.asm" -TyphlosionPokedexEntry: INCLUDE "stats/pokedex/entries/157.asm" -TotodilePokedexEntry: INCLUDE "stats/pokedex/entries/158.asm" -CroconawPokedexEntry: INCLUDE "stats/pokedex/entries/159.asm" -FeraligatrPokedexEntry: INCLUDE "stats/pokedex/entries/160.asm" -SentretPokedexEntry: INCLUDE "stats/pokedex/entries/161.asm" -FurretPokedexEntry: INCLUDE "stats/pokedex/entries/162.asm" -HoothootPokedexEntry: INCLUDE "stats/pokedex/entries/163.asm" -NoctowlPokedexEntry: INCLUDE "stats/pokedex/entries/164.asm" -LedybaPokedexEntry: INCLUDE "stats/pokedex/entries/165.asm" -LedianPokedexEntry: INCLUDE "stats/pokedex/entries/166.asm" -SpinarakPokedexEntry: INCLUDE "stats/pokedex/entries/167.asm" -AriadosPokedexEntry: INCLUDE "stats/pokedex/entries/168.asm" -CrobatPokedexEntry: INCLUDE "stats/pokedex/entries/169.asm" -ChinchouPokedexEntry: INCLUDE "stats/pokedex/entries/170.asm" -LanturnPokedexEntry: INCLUDE "stats/pokedex/entries/171.asm" -PichuPokedexEntry: INCLUDE "stats/pokedex/entries/172.asm" -CleffaPokedexEntry: INCLUDE "stats/pokedex/entries/173.asm" -IgglybuffPokedexEntry: INCLUDE "stats/pokedex/entries/174.asm" -TogepiPokedexEntry: INCLUDE "stats/pokedex/entries/175.asm" -TogeticPokedexEntry: INCLUDE "stats/pokedex/entries/176.asm" -NatuPokedexEntry: INCLUDE "stats/pokedex/entries/177.asm" -XatuPokedexEntry: INCLUDE "stats/pokedex/entries/178.asm" -MareepPokedexEntry: INCLUDE "stats/pokedex/entries/179.asm" -FlaaffyPokedexEntry: INCLUDE "stats/pokedex/entries/180.asm" -AmpharosPokedexEntry: INCLUDE "stats/pokedex/entries/181.asm" -BellossomPokedexEntry: INCLUDE "stats/pokedex/entries/182.asm" -MarillPokedexEntry: INCLUDE "stats/pokedex/entries/183.asm" -AzumarillPokedexEntry: INCLUDE "stats/pokedex/entries/184.asm" -SudowoodoPokedexEntry: INCLUDE "stats/pokedex/entries/185.asm" -PolitoedPokedexEntry: INCLUDE "stats/pokedex/entries/186.asm" -HoppipPokedexEntry: INCLUDE "stats/pokedex/entries/187.asm" -SkiploomPokedexEntry: INCLUDE "stats/pokedex/entries/188.asm" -JumpluffPokedexEntry: INCLUDE "stats/pokedex/entries/189.asm" -AipomPokedexEntry: INCLUDE "stats/pokedex/entries/190.asm" -SunkernPokedexEntry: INCLUDE "stats/pokedex/entries/191.asm" -SunfloraPokedexEntry: INCLUDE "stats/pokedex/entries/192.asm" +MagikarpPokedexEntry:: INCLUDE "stats/pokedex/entries/129.asm" +GyaradosPokedexEntry:: INCLUDE "stats/pokedex/entries/130.asm" +LaprasPokedexEntry:: INCLUDE "stats/pokedex/entries/131.asm" +DittoPokedexEntry:: INCLUDE "stats/pokedex/entries/132.asm" +EeveePokedexEntry:: INCLUDE "stats/pokedex/entries/133.asm" +VaporeonPokedexEntry:: INCLUDE "stats/pokedex/entries/134.asm" +JolteonPokedexEntry:: INCLUDE "stats/pokedex/entries/135.asm" +FlareonPokedexEntry:: INCLUDE "stats/pokedex/entries/136.asm" +PorygonPokedexEntry:: INCLUDE "stats/pokedex/entries/137.asm" +OmanytePokedexEntry:: INCLUDE "stats/pokedex/entries/138.asm" +OmastarPokedexEntry:: INCLUDE "stats/pokedex/entries/139.asm" +KabutoPokedexEntry:: INCLUDE "stats/pokedex/entries/140.asm" +KabutopsPokedexEntry:: INCLUDE "stats/pokedex/entries/141.asm" +AerodactylPokedexEntry:: INCLUDE "stats/pokedex/entries/142.asm" +SnorlaxPokedexEntry:: INCLUDE "stats/pokedex/entries/143.asm" +ArticunoPokedexEntry:: INCLUDE "stats/pokedex/entries/144.asm" +ZapdosPokedexEntry:: INCLUDE "stats/pokedex/entries/145.asm" +MoltresPokedexEntry:: INCLUDE "stats/pokedex/entries/146.asm" +DratiniPokedexEntry:: INCLUDE "stats/pokedex/entries/147.asm" +DragonairPokedexEntry:: INCLUDE "stats/pokedex/entries/148.asm" +DragonitePokedexEntry:: INCLUDE "stats/pokedex/entries/149.asm" +MewtwoPokedexEntry:: INCLUDE "stats/pokedex/entries/150.asm" +MewPokedexEntry:: INCLUDE "stats/pokedex/entries/151.asm" +ChikoritaPokedexEntry:: INCLUDE "stats/pokedex/entries/152.asm" +BayleefPokedexEntry:: INCLUDE "stats/pokedex/entries/153.asm" +MeganiumPokedexEntry:: INCLUDE "stats/pokedex/entries/154.asm" +CyndaquilPokedexEntry:: INCLUDE "stats/pokedex/entries/155.asm" +QuilavaPokedexEntry:: INCLUDE "stats/pokedex/entries/156.asm" +TyphlosionPokedexEntry:: INCLUDE "stats/pokedex/entries/157.asm" +TotodilePokedexEntry:: INCLUDE "stats/pokedex/entries/158.asm" +CroconawPokedexEntry:: INCLUDE "stats/pokedex/entries/159.asm" +FeraligatrPokedexEntry:: INCLUDE "stats/pokedex/entries/160.asm" +SentretPokedexEntry:: INCLUDE "stats/pokedex/entries/161.asm" +FurretPokedexEntry:: INCLUDE "stats/pokedex/entries/162.asm" +HoothootPokedexEntry:: INCLUDE "stats/pokedex/entries/163.asm" +NoctowlPokedexEntry:: INCLUDE "stats/pokedex/entries/164.asm" +LedybaPokedexEntry:: INCLUDE "stats/pokedex/entries/165.asm" +LedianPokedexEntry:: INCLUDE "stats/pokedex/entries/166.asm" +SpinarakPokedexEntry:: INCLUDE "stats/pokedex/entries/167.asm" +AriadosPokedexEntry:: INCLUDE "stats/pokedex/entries/168.asm" +CrobatPokedexEntry:: INCLUDE "stats/pokedex/entries/169.asm" +ChinchouPokedexEntry:: INCLUDE "stats/pokedex/entries/170.asm" +LanturnPokedexEntry:: INCLUDE "stats/pokedex/entries/171.asm" +PichuPokedexEntry:: INCLUDE "stats/pokedex/entries/172.asm" +CleffaPokedexEntry:: INCLUDE "stats/pokedex/entries/173.asm" +IgglybuffPokedexEntry:: INCLUDE "stats/pokedex/entries/174.asm" +TogepiPokedexEntry:: INCLUDE "stats/pokedex/entries/175.asm" +TogeticPokedexEntry:: INCLUDE "stats/pokedex/entries/176.asm" +NatuPokedexEntry:: INCLUDE "stats/pokedex/entries/177.asm" +XatuPokedexEntry:: INCLUDE "stats/pokedex/entries/178.asm" +MareepPokedexEntry:: INCLUDE "stats/pokedex/entries/179.asm" +FlaaffyPokedexEntry:: INCLUDE "stats/pokedex/entries/180.asm" +AmpharosPokedexEntry:: INCLUDE "stats/pokedex/entries/181.asm" +BellossomPokedexEntry:: INCLUDE "stats/pokedex/entries/182.asm" +MarillPokedexEntry:: INCLUDE "stats/pokedex/entries/183.asm" +AzumarillPokedexEntry:: INCLUDE "stats/pokedex/entries/184.asm" +SudowoodoPokedexEntry:: INCLUDE "stats/pokedex/entries/185.asm" +PolitoedPokedexEntry:: INCLUDE "stats/pokedex/entries/186.asm" +HoppipPokedexEntry:: INCLUDE "stats/pokedex/entries/187.asm" +SkiploomPokedexEntry:: INCLUDE "stats/pokedex/entries/188.asm" +JumpluffPokedexEntry:: INCLUDE "stats/pokedex/entries/189.asm" +AipomPokedexEntry:: INCLUDE "stats/pokedex/entries/190.asm" +SunkernPokedexEntry:: INCLUDE "stats/pokedex/entries/191.asm" +SunfloraPokedexEntry:: INCLUDE "stats/pokedex/entries/192.asm" diff --git a/stats/pokedex/entries_4.asm b/stats/pokedex/entries_4.asm index a826bf97d..90ba19420 100644 --- a/stats/pokedex/entries_4.asm +++ b/stats/pokedex/entries_4.asm @@ -1,59 +1,59 @@ -YanmaPokedexEntry: INCLUDE "stats/pokedex/entries/193.asm" -WooperPokedexEntry: INCLUDE "stats/pokedex/entries/194.asm" -QuagsirePokedexEntry: INCLUDE "stats/pokedex/entries/195.asm" -EspeonPokedexEntry: INCLUDE "stats/pokedex/entries/196.asm" -UmbreonPokedexEntry: INCLUDE "stats/pokedex/entries/197.asm" -MurkrowPokedexEntry: INCLUDE "stats/pokedex/entries/198.asm" -SlowkingPokedexEntry: INCLUDE "stats/pokedex/entries/199.asm" -MisdreavusPokedexEntry: INCLUDE "stats/pokedex/entries/200.asm" -UnownPokedexEntry: INCLUDE "stats/pokedex/entries/201.asm" -WobbuffetPokedexEntry: INCLUDE "stats/pokedex/entries/202.asm" -GirafarigPokedexEntry: INCLUDE "stats/pokedex/entries/203.asm" -PinecoPokedexEntry: INCLUDE "stats/pokedex/entries/204.asm" -ForretressPokedexEntry: INCLUDE "stats/pokedex/entries/205.asm" -DunsparcePokedexEntry: INCLUDE "stats/pokedex/entries/206.asm" -GligarPokedexEntry: INCLUDE "stats/pokedex/entries/207.asm" -SteelixPokedexEntry: INCLUDE "stats/pokedex/entries/208.asm" -SnubbullPokedexEntry: INCLUDE "stats/pokedex/entries/209.asm" -GranbullPokedexEntry: INCLUDE "stats/pokedex/entries/210.asm" -QwilfishPokedexEntry: INCLUDE "stats/pokedex/entries/211.asm" -ScizorPokedexEntry: INCLUDE "stats/pokedex/entries/212.asm" -ShucklePokedexEntry: INCLUDE "stats/pokedex/entries/213.asm" -HeracrossPokedexEntry: INCLUDE "stats/pokedex/entries/214.asm" -SneaselPokedexEntry: INCLUDE "stats/pokedex/entries/215.asm" -TeddiursaPokedexEntry: INCLUDE "stats/pokedex/entries/216.asm" -UrsaringPokedexEntry: INCLUDE "stats/pokedex/entries/217.asm" -SlugmaPokedexEntry: INCLUDE "stats/pokedex/entries/218.asm" -MagcargoPokedexEntry: INCLUDE "stats/pokedex/entries/219.asm" -SwinubPokedexEntry: INCLUDE "stats/pokedex/entries/220.asm" -PiloswinePokedexEntry: INCLUDE "stats/pokedex/entries/221.asm" -CorsolaPokedexEntry: INCLUDE "stats/pokedex/entries/222.asm" -RemoraidPokedexEntry: INCLUDE "stats/pokedex/entries/223.asm" -OctilleryPokedexEntry: INCLUDE "stats/pokedex/entries/224.asm" -DelibirdPokedexEntry: INCLUDE "stats/pokedex/entries/225.asm" -MantinePokedexEntry: INCLUDE "stats/pokedex/entries/226.asm" -SkarmoryPokedexEntry: INCLUDE "stats/pokedex/entries/227.asm" -HoundourPokedexEntry: INCLUDE "stats/pokedex/entries/228.asm" -HoundoomPokedexEntry: INCLUDE "stats/pokedex/entries/229.asm" -KingdraPokedexEntry: INCLUDE "stats/pokedex/entries/230.asm" -PhanpyPokedexEntry: INCLUDE "stats/pokedex/entries/231.asm" -DonphanPokedexEntry: INCLUDE "stats/pokedex/entries/232.asm" -Porygon2PokedexEntry: INCLUDE "stats/pokedex/entries/233.asm" -StantlerPokedexEntry: INCLUDE "stats/pokedex/entries/234.asm" -SmearglePokedexEntry: INCLUDE "stats/pokedex/entries/235.asm" -TyroguePokedexEntry: INCLUDE "stats/pokedex/entries/236.asm" -HitmontopPokedexEntry: INCLUDE "stats/pokedex/entries/237.asm" -SmoochumPokedexEntry: INCLUDE "stats/pokedex/entries/238.asm" -ElekidPokedexEntry: INCLUDE "stats/pokedex/entries/239.asm" -MagbyPokedexEntry: INCLUDE "stats/pokedex/entries/240.asm" -MiltankPokedexEntry: INCLUDE "stats/pokedex/entries/241.asm" -BlisseyPokedexEntry: INCLUDE "stats/pokedex/entries/242.asm" -RaikouPokedexEntry: INCLUDE "stats/pokedex/entries/243.asm" -EnteiPokedexEntry: INCLUDE "stats/pokedex/entries/244.asm" -SuicunePokedexEntry: INCLUDE "stats/pokedex/entries/245.asm" -LarvitarPokedexEntry: INCLUDE "stats/pokedex/entries/246.asm" -PupitarPokedexEntry: INCLUDE "stats/pokedex/entries/247.asm" -TyranitarPokedexEntry: INCLUDE "stats/pokedex/entries/248.asm" -LugiaPokedexEntry: INCLUDE "stats/pokedex/entries/249.asm" -HoOhPokedexEntry: INCLUDE "stats/pokedex/entries/250.asm" -CelebiPokedexEntry: INCLUDE "stats/pokedex/entries/251.asm" +YanmaPokedexEntry:: INCLUDE "stats/pokedex/entries/193.asm" +WooperPokedexEntry:: INCLUDE "stats/pokedex/entries/194.asm" +QuagsirePokedexEntry:: INCLUDE "stats/pokedex/entries/195.asm" +EspeonPokedexEntry:: INCLUDE "stats/pokedex/entries/196.asm" +UmbreonPokedexEntry:: INCLUDE "stats/pokedex/entries/197.asm" +MurkrowPokedexEntry:: INCLUDE "stats/pokedex/entries/198.asm" +SlowkingPokedexEntry:: INCLUDE "stats/pokedex/entries/199.asm" +MisdreavusPokedexEntry:: INCLUDE "stats/pokedex/entries/200.asm" +UnownPokedexEntry:: INCLUDE "stats/pokedex/entries/201.asm" +WobbuffetPokedexEntry:: INCLUDE "stats/pokedex/entries/202.asm" +GirafarigPokedexEntry:: INCLUDE "stats/pokedex/entries/203.asm" +PinecoPokedexEntry:: INCLUDE "stats/pokedex/entries/204.asm" +ForretressPokedexEntry:: INCLUDE "stats/pokedex/entries/205.asm" +DunsparcePokedexEntry:: INCLUDE "stats/pokedex/entries/206.asm" +GligarPokedexEntry:: INCLUDE "stats/pokedex/entries/207.asm" +SteelixPokedexEntry:: INCLUDE "stats/pokedex/entries/208.asm" +SnubbullPokedexEntry:: INCLUDE "stats/pokedex/entries/209.asm" +GranbullPokedexEntry:: INCLUDE "stats/pokedex/entries/210.asm" +QwilfishPokedexEntry:: INCLUDE "stats/pokedex/entries/211.asm" +ScizorPokedexEntry:: INCLUDE "stats/pokedex/entries/212.asm" +ShucklePokedexEntry:: INCLUDE "stats/pokedex/entries/213.asm" +HeracrossPokedexEntry:: INCLUDE "stats/pokedex/entries/214.asm" +SneaselPokedexEntry:: INCLUDE "stats/pokedex/entries/215.asm" +TeddiursaPokedexEntry:: INCLUDE "stats/pokedex/entries/216.asm" +UrsaringPokedexEntry:: INCLUDE "stats/pokedex/entries/217.asm" +SlugmaPokedexEntry:: INCLUDE "stats/pokedex/entries/218.asm" +MagcargoPokedexEntry:: INCLUDE "stats/pokedex/entries/219.asm" +SwinubPokedexEntry:: INCLUDE "stats/pokedex/entries/220.asm" +PiloswinePokedexEntry:: INCLUDE "stats/pokedex/entries/221.asm" +CorsolaPokedexEntry:: INCLUDE "stats/pokedex/entries/222.asm" +RemoraidPokedexEntry:: INCLUDE "stats/pokedex/entries/223.asm" +OctilleryPokedexEntry:: INCLUDE "stats/pokedex/entries/224.asm" +DelibirdPokedexEntry:: INCLUDE "stats/pokedex/entries/225.asm" +MantinePokedexEntry:: INCLUDE "stats/pokedex/entries/226.asm" +SkarmoryPokedexEntry:: INCLUDE "stats/pokedex/entries/227.asm" +HoundourPokedexEntry:: INCLUDE "stats/pokedex/entries/228.asm" +HoundoomPokedexEntry:: INCLUDE "stats/pokedex/entries/229.asm" +KingdraPokedexEntry:: INCLUDE "stats/pokedex/entries/230.asm" +PhanpyPokedexEntry:: INCLUDE "stats/pokedex/entries/231.asm" +DonphanPokedexEntry:: INCLUDE "stats/pokedex/entries/232.asm" +Porygon2PokedexEntry:: INCLUDE "stats/pokedex/entries/233.asm" +StantlerPokedexEntry:: INCLUDE "stats/pokedex/entries/234.asm" +SmearglePokedexEntry:: INCLUDE "stats/pokedex/entries/235.asm" +TyroguePokedexEntry:: INCLUDE "stats/pokedex/entries/236.asm" +HitmontopPokedexEntry:: INCLUDE "stats/pokedex/entries/237.asm" +SmoochumPokedexEntry:: INCLUDE "stats/pokedex/entries/238.asm" +ElekidPokedexEntry:: INCLUDE "stats/pokedex/entries/239.asm" +MagbyPokedexEntry:: INCLUDE "stats/pokedex/entries/240.asm" +MiltankPokedexEntry:: INCLUDE "stats/pokedex/entries/241.asm" +BlisseyPokedexEntry:: INCLUDE "stats/pokedex/entries/242.asm" +RaikouPokedexEntry:: INCLUDE "stats/pokedex/entries/243.asm" +EnteiPokedexEntry:: INCLUDE "stats/pokedex/entries/244.asm" +SuicunePokedexEntry:: INCLUDE "stats/pokedex/entries/245.asm" +LarvitarPokedexEntry:: INCLUDE "stats/pokedex/entries/246.asm" +PupitarPokedexEntry:: INCLUDE "stats/pokedex/entries/247.asm" +TyranitarPokedexEntry:: INCLUDE "stats/pokedex/entries/248.asm" +LugiaPokedexEntry:: INCLUDE "stats/pokedex/entries/249.asm" +HoOhPokedexEntry:: INCLUDE "stats/pokedex/entries/250.asm" +CelebiPokedexEntry:: INCLUDE "stats/pokedex/entries/251.asm" diff --git a/text/battle.asm b/text/battle.asm index dae8c1c3b..fa4e8c47b 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -33,7 +33,7 @@ WildPokemonAppearedText2: ; 0x80793 db "appeared!", $58 ; 0x807a9 -WantsToBattleText: ; 0x807a9 +WantsToBattleText:: ; 0x807a9 db $0, $3f, $4f db "wants to battle!", $58 ; 0x807bd @@ -745,7 +745,7 @@ WontDropAnymoreText: ; 0x8128f db "drop anymore!", $58 ; 0x812ac -FledFromBattleText: ; 0x812ac +FledFromBattleText:: ; 0x812ac db $0, $5a, $4f db "fled from battle!", $58 ; 0x812c1 diff --git a/text/common_4.asm b/text/common_4.asm index 38a532e4a..76a225d17 100644 --- a/text/common_4.asm +++ b/text/common_4.asm @@ -222,26 +222,26 @@ UnknownText_0x1c46dc: ; 0x1c46dc db $0, "Corrupted event!", $58 ; 0x1c46ee -_ObjectEventText: ; 0x1c46ee +_ObjectEventText:: ; 0x1c46ee db $0, "Object event", $57 ; 0x1c46fc -UnknownText_0x1c46fc: ; 0x1c46fc +UnknownText_0x1c46fc:: ; 0x1c46fc db $0, "BG event", $57 ; 0x1c4706 -UnknownText_0x1c4706: ; 0x1c4706 +UnknownText_0x1c4706:: ; 0x1c4706 db $0, "Coordinates event", $57 ; 0x1c4719 -UnknownText_0x1c4719: ; 0x1c4719 +UnknownText_0x1c4719:: ; 0x1c4719 db $0, $52, " received", $4f db "@" text_from_ram $d0ac db $0, ".", $57 ; 0x1c472c -UnknownText_0x1c472c: ; 0x1c472c +UnknownText_0x1c472c:: ; 0x1c472c db $0, $52, " put the", $4f db "@" text_from_ram $d073 @@ -251,7 +251,7 @@ UnknownText_0x1c472c: ; 0x1c472c db $0, ".", $58 ; 0x1c474b -UnknownText_0x1c474b: ; 0x1c474b +UnknownText_0x1c474b:: ; 0x1c474b db $0, "The @" text_from_ram $d099 db $0, $4f diff --git a/tilesets/animations.asm b/tilesets/animations.asm index d56745b62..881493933 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -1,5 +1,5 @@ -_AnimateTileset: ; fc000 +_AnimateTileset:: ; fc000 ; Iterate over a given pointer array of ; animation functions (one per frame). diff --git a/tilesets/roofs.asm b/tilesets/roofs.asm index ebf92b6c1..1882e28ac 100644 --- a/tilesets/roofs.asm +++ b/tilesets/roofs.asm @@ -1,5 +1,5 @@ -LoadMapGroupRoof: ; 1c000 +LoadMapGroupRoof:: ; 1c000 ld a, [MapGroup] ld e, a ld d, 0 diff --git a/tilesets/tileset_headers.asm b/tilesets/tileset_headers.asm index 52829a427..9fb86b668 100644 --- a/tilesets/tileset_headers.asm +++ b/tilesets/tileset_headers.asm @@ -1,4 +1,4 @@ -Tileset00: ; 0x4d596 +Tileset00:: ; 0x4d596 dbw BANK(Tileset00GFX), Tileset00GFX dbw BANK(Tileset00Meta), Tileset00Meta dbw BANK(Tileset00Coll), Tileset00Coll @@ -6,7 +6,7 @@ Tileset00: ; 0x4d596 dw $0000 dw Tileset00PalMap -Tileset01: ; 0x4d5a5 +Tileset01:: ; 0x4d5a5 dbw BANK(Tileset01GFX), Tileset01GFX dbw BANK(Tileset01Meta), Tileset01Meta dbw BANK(Tileset01Coll), Tileset01Coll diff --git a/wram.asm b/wram.asm index b15e3ffa7..831a2527b 100644 --- a/wram.asm +++ b/wram.asm @@ -2,37 +2,37 @@ INCLUDE "includes.asm" SECTION "tiles0",VRAM[$8000],BANK[0] -VTiles0: +VTiles0:: SECTION "tiles1",VRAM[$8800],BANK[0] -VTiles1: +VTiles1:: SECTION "tiles2",VRAM[$9000],BANK[0] -VTiles2: +VTiles2:: SECTION "bgmap0",VRAM[$9800],BANK[0] -VBGMap0: +VBGMap0:: SECTION "bgmap1",VRAM[$9C00],BANK[0] -VBGMap1: +VBGMap1:: SECTION "WRAMBank0",WRAM0[$c000] SECTION "stack",WRAM0[$c0ff] -Stack: ; c0ff +Stack:: ; c0ff ds -$100 SECTION "audio",WRAM0[$c100] -MusicPlaying: ; c100 +MusicPlaying:: ; c100 ; nonzero if playing ds 1 -Channels: -Channel1: -Channel1MusicID: ; c101 +Channels:: +Channel1:: +Channel1MusicID:: ; c101 ds 2 -Channel1MusicBank: ; c103 +Channel1MusicBank:: ; c103 ds 1 -Channel1Flags: ; c104 +Channel1Flags:: ; c104 ; 0: on/off ; 1: subroutine ; 2: @@ -42,7 +42,7 @@ Channel1Flags: ; c104 ; 6: ; 7: ds 1 -Channel1Flags2: ; c105 +Channel1Flags2:: ; c105 ; 0: vibrato on/off ; 1: ; 2: duty cycle on/off @@ -52,7 +52,7 @@ Channel1Flags2: ; c105 ; 6: ; 7: ds 1 -Channel1Flags3: ; c106 +Channel1Flags3:: ; c106 ; 0: vibrato up/down ; 1: ; 2: @@ -62,13 +62,13 @@ Channel1Flags3: ; c106 ; 6: ; 7: ds 1 -Channel1MusicAddress: ; c107 +Channel1MusicAddress:: ; c107 ds 2 -Channel1LastMusicAddress: ; c109 +Channel1LastMusicAddress:: ; c109 ds 2 ; could have been meant as a third-level address ds 2 -Channel1NoteFlags: ; c10d +Channel1NoteFlags:: ; c10d ; 0: ; 1: ; 2: @@ -78,27 +78,27 @@ Channel1NoteFlags: ; c10d ; 6: ; 7: ds 1 -Channel1Condition: ; c10e +Channel1Condition:: ; c10e ; used for conditional jumps ds 1 -Channel1DutyCycle: ; c10f +Channel1DutyCycle:: ; c10f ; uses top 2 bits only ; 0: 12.5% ; 1: 25% ; 2: 50% ; 3: 75% ds 1 -Channel1Intensity: ; c110 +Channel1Intensity:: ; c110 ; hi: pressure ; lo: velocity ds 1 -Channel1Frequency: +Channel1Frequency:: ; 11 bits -Channel1FrequencyLo: ; c111 +Channel1FrequencyLo:: ; c111 ds 1 -Channel1FrequencyHi: ; c112 +Channel1FrequencyHi:: ; c112 ds 1 -Channel1Pitch: ; c113 +Channel1Pitch:: ; c113 ; 0: rest ; 1: C ; 2: C# @@ -113,44 +113,44 @@ Channel1Pitch: ; c113 ; b: A# ; c: B ds 1 -Channel1Octave: ; c114 +Channel1Octave:: ; c114 ; 0: highest ; 7: lowest ds 1 -Channel1StartingOctave: ; c115 +Channel1StartingOctave:: ; c115 ; raises existing octaves by this value ; used for repeating phrases in a higher octave to save space ds 1 -Channel1NoteDuration: ; c116 +Channel1NoteDuration:: ; c116 ; number of frames remaining in the current note ds 1 ; c117 ds 1 ; c118 ds 1 -Channel1LoopCount: ; c119 +Channel1LoopCount:: ; c119 ds 1 -Channel1Tempo: ; c11a +Channel1Tempo:: ; c11a ds 2 -Channel1Tracks: ; c11c +Channel1Tracks:: ; c11c ; hi: l ; lo: r ds 1 ; c11d ds 1 -Channel1VibratoDelayCount: ; c11e +Channel1VibratoDelayCount:: ; c11e ; initialized at the value in VibratoDelay ; decrements each frame ; at 0, vibrato starts ds 1 -Channel1VibratoDelay: ; c11f +Channel1VibratoDelay:: ; c11f ; number of frames a note plays until vibrato starts ds 1 -Channel1VibratoExtent: ; c120 +Channel1VibratoExtent:: ; c120 ; difference in ds 1 -Channel1VibratoRate: ; c121 +Channel1VibratoRate:: ; c121 ; counts down from a max of 15 frames ; over which the pitch is alternated ; hi: init frames @@ -169,12 +169,12 @@ Channel1VibratoRate: ; c121 ds 1 ; c127 ds 1 -Channel1CryPitch: ; c128 +Channel1CryPitch:: ; c128 ds 1 -Channel1CryEcho: ; c129 +Channel1CryEcho:: ; c129 ds 1 ds 4 -Channel1NoteLength: ; c12e +Channel1NoteLength:: ; c12e ; # frames per 16th note ds 1 ; c12f @@ -187,21 +187,21 @@ Channel1NoteLength: ; c12e ds 1 ; end -Channel2: ; c133 +Channel2:: ; c133 ds 50 -Channel3: ; c165 +Channel3:: ; c165 ds 50 -Channel4: ; c197 +Channel4:: ; c197 ds 50 -SFXChannels: -Channel5: ; c1c9 +SFXChannels:: +Channel5:: ; c1c9 ds 50 -Channel6: ; c1fb +Channel6:: ; c1fb ds 50 -Channel7: ; c22d +Channel7:: ; c22d ds 50 -Channel8: ; c25f +Channel8:: ; c25f ds 50 ; c291 @@ -219,11 +219,11 @@ Channel8: ; c25f ; c297 ds 1 -CurMusicByte: ; c298 +CurMusicByte:: ; c298 ds 1 -CurChannel: ; c299 +CurChannel:: ; c299 ds 1 -Volume: ; c29a +Volume:: ; c29a ; corresponds to $ff24 ; Channel control / ON-OFF / Volume (R/W) ; bit 7 - Vin->SO2 ON/OFF @@ -231,12 +231,12 @@ Volume: ; c29a ; bit 3 - Vin->SO1 ON/OFF ; bit 2-0 - SO1 output level (volume) (# 0-7) ds 1 -SoundOutput: ; c29b +SoundOutput:: ; c29b ; corresponds to $ff25 ; bit 4-7: ch1-4 so2 on/off ; bit 0-3: ch1-4 so1 on/off ds 1 -SoundInput: ; c29c +SoundInput:: ; c29c ; corresponds to $ff26 ; bit 7: global on/off ; bit 0: ch1 on/off @@ -245,103 +245,103 @@ SoundInput: ; c29c ; bit 3: ch4 on/off ds 1 -MusicID: -MusicIDLo: ; c29d +MusicID:: +MusicIDLo:: ; c29d ds 1 -MusicIDHi: ; c29e +MusicIDHi:: ; c29e ds 1 -MusicBank: ; c29f +MusicBank:: ; c29f ds 1 -NoiseSampleAddress: -NoiseSampleAddressLo: ; c2a0 +NoiseSampleAddress:: +NoiseSampleAddressLo:: ; c2a0 ds 1 -NoiseSampleAddressHi: ; c2a1 +NoiseSampleAddressHi:: ; c2a1 ds 1 ; noise delay? ; c2a2 ds 1 ; c2a3 ds 1 -MusicNoiseSampleSet: ; c2a4 +MusicNoiseSampleSet:: ; c2a4 ds 1 -SFXNoiseSampleSet: ; c2a5 +SFXNoiseSampleSet:: ; c2a5 ds 1 -Danger: ; c2a6 +Danger:: ; c2a6 ; bit 7: on/off ; bit 4: pitch ; bit 0-3: counter ds 1 -MusicFade: ; c2a7 +MusicFade:: ; c2a7 ; fades volume over x frames ; bit 7: fade in/out ; bit 0-5: number of frames for each volume level ; $00 = none (default) ds 1 -MusicFadeCount: ; c2a8 +MusicFadeCount:: ; c2a8 ds 1 -MusicFadeID: -MusicFadeIDLo: ; c2a9 +MusicFadeID:: +MusicFadeIDLo:: ; c2a9 ds 1 -MusicFadeIDHi: ; c2aa +MusicFadeIDHi:: ; c2aa ds 1 ds 5 -CryPitch: ; c2b0 +CryPitch:: ; c2b0 ds 1 -CryEcho: ; c2b1 +CryEcho:: ; c2b1 ds 1 -CryLength: ; c2b2 +CryLength:: ; c2b2 ds 2 -LastVolume: ; c2b4 +LastVolume:: ; c2b4 ds 1 ds 1 -SFXPriority: ; c2b6 +SFXPriority:: ; c2b6 ; if nonzero, turn off music when playing sfx ds 1 ds 6 -CryTracks: ; c2bd +CryTracks:: ; c2bd ; plays only in left or right track depending on what side the monster is on ; both tracks active outside of battle ds 1 ds 1 -CurSFX: ; c2bf +CurSFX:: ; c2bf ; id of sfx currently playing ds 1 -CurMusic: ; c2c0 +CurMusic:: ; c2c0 ; id of music currently playing ds 1 SECTION "auto",WRAM0[$c2c7] -InputType: ; c2c7 +InputType:: ; c2c7 ds 1 -AutoInputAddress: ; c2c8 +AutoInputAddress:: ; c2c8 ds 2 -AutoInputBank: ; c2ca +AutoInputBank:: ; c2ca ds 1 -AutoInputLength: ; c2cb +AutoInputLength:: ; c2cb ds 1 SECTION "linkbattle",WRAM0[$c2dc] -InLinkBattle: ; c2dc +InLinkBattle:: ; c2dc ; 0 not in link battle ; 1 link battle ; 4 mobile battle ds 1 SECTION "scriptengine",WRAM0[$c2dd] -ScriptVar: ; c2dd +ScriptVar:: ; c2dd ds 1 SECTION "tiles",WRAM0[$c2fa] -TileDown: ; c2fa +TileDown:: ; c2fa ds 1 -TileUp: ; c2fb +TileUp:: ; c2fb ds 1 -TileLeft: ; c2fc +TileLeft:: ; c2fc ds 1 -TileRight: ; c2fd +TileRight:: ; c2fd ds 1 -TilePermissions: ; c2fe +TilePermissions:: ; c2fe ; set if tile behavior prevents ; you from walking in that direction ; bit 3: down @@ -352,12 +352,12 @@ TilePermissions: ; c2fe SECTION "icons",WRAM0[$c3b6] -CurIcon: ; c3b6 +CurIcon:: ; c3b6 ds 1 SECTION "gfx",WRAM0[$c400] -Sprites: ; c400 +Sprites:: ; c400 ; 4 bytes per sprite ; 40 sprites ; struct: @@ -372,124 +372,124 @@ Sprites: ; c400 ; bit 3: vram bank (cgb only) ; bit 2-0: pal # (cgb only) ds 160 -SpritesEnd: +SpritesEnd:: -TileMap: ; c4a0 +TileMap:: ; c4a0 ; 20x18 grid of 8x8 tiles ds 360 -TileMapEnd: +TileMapEnd:: SECTION "BattleMons",WRAM0[$c608] -EnemyMoveStruct: -EnemyMoveAnimation: ; c608 +EnemyMoveStruct:: +EnemyMoveAnimation:: ; c608 ds 1 -EnemyMoveEffect: ; c609 +EnemyMoveEffect:: ; c609 ds 1 -EnemyMovePower: ; c60a +EnemyMovePower:: ; c60a ds 1 -EnemyMoveType: ; c60b +EnemyMoveType:: ; c60b ds 1 -EnemyMoveAccuracy: ; c60c +EnemyMoveAccuracy:: ; c60c ds 1 -EnemyMovePP: ; c60d +EnemyMovePP:: ; c60d ds 1 -EnemyMoveEffectChance: ; c60e +EnemyMoveEffectChance:: ; c60e ds 1 -PlayerMoveStruct: -PlayerMoveAnimation: ; c60f +PlayerMoveStruct:: +PlayerMoveAnimation:: ; c60f ds 1 -PlayerMoveEffect: ; c610 +PlayerMoveEffect:: ; c610 ds 1 -PlayerMovePower: ; c611 +PlayerMovePower:: ; c611 ds 1 -PlayerMoveType: ; c612 +PlayerMoveType:: ; c612 ds 1 -PlayerMoveAccuracy: ; c613 +PlayerMoveAccuracy:: ; c613 ds 1 -PlayerMovePP: ; c614 +PlayerMovePP:: ; c614 ds 1 -PlayerMoveEffectChance: ; c615 +PlayerMoveEffectChance:: ; c615 ds 1 -EnemyMonNick: ; c616 +EnemyMonNick:: ; c616 ds 11 -BattleMonNick: ; c621 +BattleMonNick:: ; c621 ds 11 -BattleMonSpecies: ; c62c +BattleMonSpecies:: ; c62c ds 1 -BattleMonItem: ; c62d +BattleMonItem:: ; c62d ds 1 -BattleMonMoves: -BattleMonMove1: ; c62e +BattleMonMoves:: +BattleMonMove1:: ; c62e ds 1 -BattleMonMove2: ; c62f +BattleMonMove2:: ; c62f ds 1 -BattleMonMove3: ; c630 +BattleMonMove3:: ; c630 ds 1 -BattleMonMove4: ; c631 +BattleMonMove4:: ; c631 ds 1 -BattleMonDVs: -BattleMonAtkDefDV: ; c632 +BattleMonDVs:: +BattleMonAtkDefDV:: ; c632 ds 1 -BattleMonSpdSpclDV: ; c633 +BattleMonSpdSpclDV:: ; c633 ds 1 -BattleMonPP: -BattleMonPPMove1: ; c634 +BattleMonPP:: +BattleMonPPMove1:: ; c634 ds 1 -BattleMonPPMove2: ; c635 +BattleMonPPMove2:: ; c635 ds 1 -BattleMonPPMove3: ; c636 +BattleMonPPMove3:: ; c636 ds 1 -BattleMonPPMove4: ; c637 +BattleMonPPMove4:: ; c637 ds 1 -BattleMonHappiness: ; c638 +BattleMonHappiness:: ; c638 ds 1 -BattleMonLevel: ; c639 +BattleMonLevel:: ; c639 ds 1 -BattleMonStatus: ; c63a +BattleMonStatus:: ; c63a ds 2 -BattleMonHP: ; c63c +BattleMonHP:: ; c63c ds 2 -BattleMonMaxHP: ; c63e +BattleMonMaxHP:: ; c63e ds 2 -BattleMonAtk: ; c640 +BattleMonAtk:: ; c640 ds 2 -BattleMonDef: ; c642 +BattleMonDef:: ; c642 ds 2 -BattleMonSpd: ; c644 +BattleMonSpd:: ; c644 ds 2 -BattleMonSpclAtk: ; c646 +BattleMonSpclAtk:: ; c646 ds 2 -BattleMonSpclDef: ; c648 +BattleMonSpclDef:: ; c648 ds 2 -BattleMonType1: ; c64a +BattleMonType1:: ; c64a ds 1 -BattleMonType2: ; c64b +BattleMonType2:: ; c64b ds 1 ds 10 -OTName: ; c656 +OTName:: ; c656 ds 13 -CurOTMon: ; c663 +CurOTMon:: ; c663 ds 1 ds 1 -TypeModifier: ; c665 +TypeModifier:: ; c665 ; >10: super-effective ; 10: normal ; <10: not very effective @@ -497,15 +497,15 @@ TypeModifier: ; c665 ; bit 7: stab ds 1 -CriticalHit: ; c666 +CriticalHit:: ; c666 ; nonzero for a critical hit ds 1 -AttackMissed: ; c667 +AttackMissed:: ; c667 ; nonzero for a miss ds 1 -PlayerSubStatus1: ; c668 +PlayerSubStatus1:: ; c668 ; bit ; 7 attract ; 6 encore @@ -516,7 +516,7 @@ PlayerSubStatus1: ; c668 ; 1 curse ; 0 nightmare ds 1 -PlayerSubStatus2: ; c669 +PlayerSubStatus2:: ; c669 ; bit ; 7 ; 6 @@ -527,7 +527,7 @@ PlayerSubStatus2: ; c669 ; 1 ; 0 curled ds 1 -PlayerSubStatus3: ; c66a +PlayerSubStatus3:: ; c66a ; bit ; 7 confused ; 6 flying @@ -538,7 +538,7 @@ PlayerSubStatus3: ; c66a ; 1 rollout ; 0 bide ds 1 -PlayerSubStatus4: ; c66b +PlayerSubStatus4:: ; c66b ; bit ; 7 leech seed ; 6 rage @@ -549,7 +549,7 @@ PlayerSubStatus4: ; c66b ; 1 mist ; 0 bide: unleashed energy ds 1 -PlayerSubStatus5: ; c66c +PlayerSubStatus5:: ; c66c ; bit ; 7 cant run ; 6 destiny bond @@ -561,163 +561,163 @@ PlayerSubStatus5: ; c66c ; 0 toxic ds 1 -EnemySubStatus1: ; c66d +EnemySubStatus1:: ; c66d ; see PlayerSubStatus1 ds 1 -EnemySubStatus2: ; c66e +EnemySubStatus2:: ; c66e ; see PlayerSubStatus2 ds 1 -EnemySubStatus3: ; c66f +EnemySubStatus3:: ; c66f ; see PlayerSubStatus3 ds 1 -EnemySubStatus4: ; c670 +EnemySubStatus4:: ; c670 ; see PlayerSubStatus4 ds 1 -EnemySubStatus5: ; c671 +EnemySubStatus5:: ; c671 ; see PlayerSubStatus5 ds 1 -PlayerRolloutCount: ; c672 +PlayerRolloutCount:: ; c672 ds 1 -PlayerConfuseCount: ; c673 +PlayerConfuseCount:: ; c673 ds 1 ds 1 -PlayerDisableCount: ; c675 +PlayerDisableCount:: ; c675 ds 1 -PlayerEncoreCount: ; c676 +PlayerEncoreCount:: ; c676 ds 1 -PlayerPerishCount: ; c677 +PlayerPerishCount:: ; c677 ds 1 -PlayerFuryCutterCount: ; c678 +PlayerFuryCutterCount:: ; c678 ds 1 -PlayerProtectCount: ; c679 +PlayerProtectCount:: ; c679 ds 1 -EnemyRolloutCount: ; c67a +EnemyRolloutCount:: ; c67a ds 1 -EnemyConfuseCount: ; c67b +EnemyConfuseCount:: ; c67b ds 1 ds 1 -EnemyDisableCount: ; c67d +EnemyDisableCount:: ; c67d ds 1 -EnemyEncoreCount: ; c67e +EnemyEncoreCount:: ; c67e ds 1 -EnemyPerishCount: ; c67f +EnemyPerishCount:: ; c67f ds 1 -EnemyFuryCutterCount: ; c680 +EnemyFuryCutterCount:: ; c680 ds 1 -EnemyProtectCount: ; c681 +EnemyProtectCount:: ; c681 ds 1 -PlayerDamageTaken: ; c682 +PlayerDamageTaken:: ; c682 ds 2 -EnemyDamageTaken: ; c684 +EnemyDamageTaken:: ; c684 ds 2 ds 3 ds 1 -BattleScriptBuffer: ; c68a +BattleScriptBuffer:: ; c68a ds 40 -BattleScriptBufferLoc: ; c6b2 +BattleScriptBufferLoc:: ; c6b2 ds 2 ds 2 -PlayerStats: ; c6b6 +PlayerStats:: ; c6b6 ds 10 ds 1 -EnemyStats: ; c6c1 +EnemyStats:: ; c6c1 ds 10 ds 1 -PlayerStatLevels: ; c6cc +PlayerStatLevels:: ; c6cc ; 07 neutral -PlayerAtkLevel: ; c6cc +PlayerAtkLevel:: ; c6cc ds 1 -PlayerDefLevel: ; c6cd +PlayerDefLevel:: ; c6cd ds 1 -PlayerSpdLevel: ; c6ce +PlayerSpdLevel:: ; c6ce ds 1 -PlayerSAtkLevel: ; c6cf +PlayerSAtkLevel:: ; c6cf ds 1 -PlayerSDefLevel: ; c6d0 +PlayerSDefLevel:: ; c6d0 ds 1 -PlayerAccLevel: ; c6d1 +PlayerAccLevel:: ; c6d1 ds 1 -PlayerEvaLevel: ; c6d2 +PlayerEvaLevel:: ; c6d2 ds 1 ; c6d3 ds 1 -PlayerStatLevelsEnd: +PlayerStatLevelsEnd:: -EnemyStatLevels: ; c6d4 +EnemyStatLevels:: ; c6d4 ; 07 neutral -EnemyAtkLevel: ; c6d4 +EnemyAtkLevel:: ; c6d4 ds 1 -EnemyDefLevel: ; c6d5 +EnemyDefLevel:: ; c6d5 ds 1 -EnemySpdLevel: ; c6d6 +EnemySpdLevel:: ; c6d6 ds 1 -EnemySAtkLevel: ; c6d7 +EnemySAtkLevel:: ; c6d7 ds 1 -EnemySDefLevel: ; c6d8 +EnemySDefLevel:: ; c6d8 ds 1 -EnemyAccLevel: ; c6d9 +EnemyAccLevel:: ; c6d9 ds 1 -EnemyEvaLevel: ; c6da +EnemyEvaLevel:: ; c6da ds 1 ; c6db ds 1 -EnemyTurnsTaken: ; c6dc +EnemyTurnsTaken:: ; c6dc ds 1 -PlayerTurnsTaken: ; c6dd +PlayerTurnsTaken:: ; c6dd ds 1 ds 5 -CurPlayerMove: ; c6e3 +CurPlayerMove:: ; c6e3 ds 1 -CurEnemyMove: ; c6e4 +CurEnemyMove:: ; c6e4 ds 1 -LinkBattleRNCount: ; c6e5 +LinkBattleRNCount:: ; c6e5 ; how far through the prng stream ds 1 ds 3 -CurEnemyMoveNum: ; c6e9 +CurEnemyMoveNum:: ; c6e9 ds 1 ds 10 -AlreadyDisobeyed: ; c6f4 +AlreadyDisobeyed:: ; c6f4 ds 1 -DisabledMove: ; c6f5 +DisabledMove:: ; c6f5 ds 1 -EnemyDisabledMove: ; c6f6 +EnemyDisabledMove:: ; c6f6 ds 1 ds 1 ; exists so you can't counter on switch -LastEnemyCounterMove: ; c6f8 +LastEnemyCounterMove:: ; c6f8 ds 1 -LastPlayerCounterMove: ; c6f9 +LastPlayerCounterMove:: ; c6f9 ds 1 ds 1 -AlreadyFailed: ; c6fb +AlreadyFailed:: ; c6fb ds 1 ds 3 -PlayerScreens: ; c6ff +PlayerScreens:: ; c6ff ; bit ; 4 reflect ; 3 light screen @@ -725,27 +725,27 @@ PlayerScreens: ; c6ff ; 0 spikes ds 1 -EnemyScreens: ; c700 +EnemyScreens:: ; c700 ; see PlayerScreens ds 1 ds 1 -PlayerLightScreenCount: ; c702 +PlayerLightScreenCount:: ; c702 ds 1 -PlayerReflectCount: ; c703 +PlayerReflectCount:: ; c703 ds 1 ds 2 -EnemyLightScreenCount: ; c706 +EnemyLightScreenCount:: ; c706 ds 1 -EnemyReflectCount: ; c707 +EnemyReflectCount:: ; c707 ds 1 ds 2 -Weather: ; c70a +Weather:: ; c70a ; 00 normal ; 01 rain ; 02 sun @@ -755,69 +755,69 @@ Weather: ; c70a ; 06 sandstorm subsided ds 1 -WeatherCount: ; c70b +WeatherCount:: ; c70b ; # turns remaining ds 1 -LoweredStat: ; c70c +LoweredStat:: ; c70c ds 1 -EffectFailed: ; c70d +EffectFailed:: ; c70d ds 1 -FailedMessage: ; c70e +FailedMessage:: ; c70e ds 1 ds 3 -PlayerUsedMoves: ; c712 +PlayerUsedMoves:: ; c712 ; add a move that has been used once by the player ; added in order of use ds 4 ds 5 -LastPlayerMove: ; c71b +LastPlayerMove:: ; c71b ds 1 -LastEnemyMove: ; c71c +LastEnemyMove:: ; c71c ds 1 SECTION "battle",WRAM0[$c734] -BattleEnded: ; c734 +BattleEnded:: ; c734 ds 1 SECTION "overworldmap",WRAM0[$c800] -OverworldMap: ; c800 +OverworldMap:: ; c800 ds 1300 -OverworldMapEnd: +OverworldMapEnd:: ds 12 SECTION "gfx2",WRAM0[$cd20] -CreditsPos: -BGMapBuffer: ; cd20 +CreditsPos:: +BGMapBuffer:: ; cd20 ds 2 -CreditsTimer: ; cd22 +CreditsTimer:: ; cd22 ds 1 ds 37 -BGMapPalBuffer: ; cd48 +BGMapPalBuffer:: ; cd48 ds 40 -BGMapBufferPtrs: ; cd70 +BGMapBufferPtrs:: ; cd70 ; 20 bg map addresses (16x8 tiles) ds 40 -SGBPredef: ; cd98 +SGBPredef:: ; cd98 ds 1 -PlayerHPPal: ; cd99 +PlayerHPPal:: ; cd99 ds 1 -EnemyHPPal: ; cd9a +EnemyHPPal:: ; cd9a ds 1 ds 62 -AttrMap: ; cdd9 +AttrMap:: ; cdd9 ; 20x18 grid of palettes for 8x8 tiles ; read horizontally from the top row ; bit 3: vram bank @@ -826,71 +826,71 @@ AttrMap: ; cdd9 ds 30 -MonType: ; cf5f +MonType:: ; cf5f ds 1 -CurSpecies: ; cf60 +CurSpecies:: ; cf60 ds 1 ds 6 -Requested2bpp: ; cf67 +Requested2bpp:: ; cf67 ds 1 -Requested2bppSource: ; cf68 +Requested2bppSource:: ; cf68 ds 2 -Requested2bppDest: ; cf6a +Requested2bppDest:: ; cf6a ds 2 -Requested1bpp: ; cf6c +Requested1bpp:: ; cf6c ds 1 -Requested1bppSource: ; cf6d +Requested1bppSource:: ; cf6d ds 2 -Requested1bppDest: ; cf6f +Requested1bppDest:: ; cf6f ds 2 ds 3 -MenuSelection:; cf74 +MenuSelection:: ; cf74 ds 1 SECTION "VBlank",WRAM0[$cfb1] -OverworldDelay: ; cfb1 +OverworldDelay:: ; cfb1 ds 1 -TextDelayFrames: ; cfb2 +TextDelayFrames:: ; cfb2 ds 1 -VBlankOccurred: ; cfb3 +VBlankOccurred:: ; cfb3 ds 1 -PredefID: ; cfb4 +PredefID:: ; cfb4 ds 1 -PredefTemp: ; cfb5 +PredefTemp:: ; cfb5 ds 2 -PredefAddress: ; cfb7 +PredefAddress:: ; cfb7 ds 2 ds 3 -GameTimerPause: ; cfbc +GameTimerPause:: ; cfbc ; bit 0 ds 1 SECTION "Engine",WRAM0[$cfc2] -FXAnimID: -FXAnimIDLo: ; cfc2 +FXAnimID:: +FXAnimIDLo:: ; cfc2 ds 1 -FXAnimIDHi: ; cfc3 +FXAnimIDHi:: ; cfc3 ds 1 ds 2 -TileAnimationTimer: ; cfc6 +TileAnimationTimer:: ; cfc6 ds 1 ds 5 -Options: ; cfcc +Options:: ; cfcc ; bit 0-2: number of frames to delay when printing text ; fast 1; mid 3; slow 5 ; bit 3: ? @@ -902,13 +902,13 @@ Options: ; cfcc ds 1 -TextBoxFrame: ; cfce +TextBoxFrame:: ; cfce ; bits 0-2: textbox frame 0-7 ds 1 ds 1 -GBPrinter: ; cfd0 +GBPrinter:: ; cfd0 ; bit 0-6: brightness ; lightest: $00 ; lighter: $20 @@ -917,7 +917,7 @@ GBPrinter: ; cfd0 ; darkest: $7F ds 1 -Options2: ; cfd1 +Options2:: ; cfd1 ; bit 1: menu account off/on ds 1 @@ -928,69 +928,69 @@ SECTION "WRAMBank1",WRAMX[$d000],BANK[1] ds 2 -DefaultFlypoint: ; d002 +DefaultFlypoint:: ; d002 ds 1 ; d003 ds 1 ; d004 ds 1 -StartFlypoint: ; d005 +StartFlypoint:: ; d005 ds 1 -EndFlypoint: ; d006 +EndFlypoint:: ; d006 ds 1 -MovementBuffer: ; d007 +MovementBuffer:: ; d007 ds 55 -MenuItemsList: -CurFruitTree: -CurInput: -EngineBuffer1: ; d03e +MenuItemsList:: +CurFruitTree:: +CurInput:: +EngineBuffer1:: ; d03e ds 1 -CurFruit: ; d03f +CurFruit:: ; d03f ds 1 -MartPointer: ; d040 +MartPointer:: ; d040 ds 2 -MovementAnimation: ; d042 +MovementAnimation:: ; d042 ds 1 -WalkingDirection: ; d043 +WalkingDirection:: ; d043 ds 1 -FacingDirection: ; d044 +FacingDirection:: ; d044 ds 1 -WalkingX: ; d045 +WalkingX:: ; d045 ds 1 -WalkingY: ; d046 +WalkingY:: ; d046 ds 1 -WalkingTile: ; d047 +WalkingTile:: ; d047 ds 1 ds 43 -StringBuffer1: ; d073 +StringBuffer1:: ; d073 ds 19 -StringBuffer2: ; d086 +StringBuffer2:: ; d086 ds 19 -StringBuffer3: ; d099 +StringBuffer3:: ; d099 ds 19 -StringBuffer4: ; d0ac +StringBuffer4:: ; d0ac ds 19 ds 21 -CurBattleMon: ; d0d4 +CurBattleMon:: ; d0d4 ds 1 -CurMoveNum: ; d0d5 +CurMoveNum:: ; d0d5 ds 1 ds 23 -VramState: ; d0ed +VramState:: ; d0ed ; bit 0: overworld sprite updating on/off ; bit 6: something to do with text ; bit 7: on when surf initiates @@ -999,21 +999,21 @@ VramState: ; d0ed ds 2 -CurMart: ; d0f0 +CurMart:: ; d0f0 ds 16 -CurMartEnd: +CurMartEnd:: ds 6 -CurItem: ; d106 +CurItem:: ; d106 ds 1 ds 1 -CurPartySpecies: ; d108 +CurPartySpecies:: ; d108 ds 1 -CurPartyMon: ; d109 +CurPartyMon:: ; d109 ; contains which monster in a party ; is being dealt with at the moment ; 0-5 @@ -1021,317 +1021,317 @@ CurPartyMon: ; d109 ds 4 -TempMon: -TempMonSpecies: ; d10e +TempMon:: +TempMonSpecies:: ; d10e ds 1 -TempMonItem: ; d10f +TempMonItem:: ; d10f ds 1 -TempMonMoves: ; d110 -TempMonMove1: ; d110 +TempMonMoves:: ; d110 +TempMonMove1:: ; d110 ds 1 -TempMonMove2: ; d111 +TempMonMove2:: ; d111 ds 1 -TempMonMove3: ; d112 +TempMonMove3:: ; d112 ds 1 -TempMonMove4: ; d113 +TempMonMove4:: ; d113 ds 1 -TempMonID: ; d114 +TempMonID:: ; d114 ds 2 -TempMonExp: ; d116 +TempMonExp:: ; d116 ds 3 -TempMonHPExp: ; d119 +TempMonHPExp:: ; d119 ds 2 -TempMonAtkExp: ; d11b +TempMonAtkExp:: ; d11b ds 2 -TempMonDefExp: ; d11d +TempMonDefExp:: ; d11d ds 2 -TempMonSpdExp: ; d11f +TempMonSpdExp:: ; d11f ds 2 -TempMonSpclExp: ; d121 +TempMonSpclExp:: ; d121 ds 2 -TempMonDVs: ; d123 +TempMonDVs:: ; d123 ; hp = %1000 for each dv ds 1 ; atk/def ds 1 ; spd/spc -TempMonPP: ; d125 +TempMonPP:: ; d125 ds 4 -TempMonHappiness: ; d129 +TempMonHappiness:: ; d129 ds 1 -TempMonPokerusStatus: ; d12a +TempMonPokerusStatus:: ; d12a ds 1 -TempMonCaughtData: ; d12b -TempMonCaughtTime: ; d12b -TempMonCaughtLevel: ; d12b +TempMonCaughtData:: ; d12b +TempMonCaughtTime:: ; d12b +TempMonCaughtLevel:: ; d12b ds 1 -TempMonCaughtGender: ; d12c -TempMonCaughtLocation: ; d12c +TempMonCaughtGender:: ; d12c +TempMonCaughtLocation:: ; d12c ds 1 -TempMonLevel: ; d12d +TempMonLevel:: ; d12d ds 1 -TempMonStatus: ; d12e +TempMonStatus:: ; d12e ds 1 ; d12f ds 1 -TempMonCurHP: ; d130 +TempMonCurHP:: ; d130 ds 2 -TempMonMaxHP: ; d132 +TempMonMaxHP:: ; d132 ds 2 -TempMonAtk: ; d134 +TempMonAtk:: ; d134 ds 2 -TempMonDef: ; d136 +TempMonDef:: ; d136 ds 2 -TempMonSpd: ; d138 +TempMonSpd:: ; d138 ds 2 -TempMonSpclAtk: ; d13a +TempMonSpclAtk:: ; d13a ds 2 -TempMonSpclDef: ; d13c +TempMonSpclDef:: ; d13c ds 2 -TempMonEnd: ; d13e +TempMonEnd:: ; d13e ds 3 -PartyMenuActionText: ; d141 +PartyMenuActionText:: ; d141 ds 1 ds 1 -CurPartyLevel: ; d143 +CurPartyLevel:: ; d143 ds 1 SECTION "UsedSprites",WRAMX[$d154],BANK[1] -UsedSprites: ; d154 +UsedSprites:: ; d154 ds 32 SECTION "map",WRAMX[$d19d],BANK[1] ; both are in blocks (2x2 walkable tiles, 4x4 graphics tiles) -MapHeader: ; d19d -MapBorderBlock: ; d19d +MapHeader:: ; d19d +MapBorderBlock:: ; d19d ds 1 -MapHeight: ; d19e +MapHeight:: ; d19e ds 1 -MapWidth: ; d19f +MapWidth:: ; d19f ds 1 -MapBlockDataBank: ; d1a0 +MapBlockDataBank:: ; d1a0 ds 1 -MapBlockDataPointer: ; d1a1 +MapBlockDataPointer:: ; d1a1 ds 2 -MapScriptHeaderBank: ; d1a3 +MapScriptHeaderBank:: ; d1a3 ds 1 -MapScriptHeaderPointer: ; d1a4 +MapScriptHeaderPointer:: ; d1a4 ds 2 -MapEventHeaderPointer: ; d1a6 +MapEventHeaderPointer:: ; d1a6 ds 2 ; bit set -MapConnections: ; d1a8 +MapConnections:: ; d1a8 ds 1 -NorthMapConnection: ; d1a9 -NorthConnectedMapGroup: ; d1a9 +NorthMapConnection:: ; d1a9 +NorthConnectedMapGroup:: ; d1a9 ds 1 -NorthConnectedMapNumber: ; d1aa +NorthConnectedMapNumber:: ; d1aa ds 1 -NorthConnectionStripPointer: ; d1ab +NorthConnectionStripPointer:: ; d1ab ds 2 -NorthConnectionStripLocation: ; d1ad +NorthConnectionStripLocation:: ; d1ad ds 2 -NorthConnectionStripLength: ; d1af +NorthConnectionStripLength:: ; d1af ds 1 -NorthConnectedMapWidth: ; d1b0 +NorthConnectedMapWidth:: ; d1b0 ds 1 -NorthConnectionStripYOffset: ; d1b1 +NorthConnectionStripYOffset:: ; d1b1 ds 1 -NorthConnectionStripXOffset: ; d1b2 +NorthConnectionStripXOffset:: ; d1b2 ds 1 -NorthConnectionWindow: ; d1b3 +NorthConnectionWindow:: ; d1b3 ds 2 -SouthMapConnection: ; d1b5 -SouthConnectedMapGroup: ; d1b5 +SouthMapConnection:: ; d1b5 +SouthConnectedMapGroup:: ; d1b5 ds 1 -SouthConnectedMapNumber: ; d1b6 +SouthConnectedMapNumber:: ; d1b6 ds 1 -SouthConnectionStripPointer: ; d1b7 +SouthConnectionStripPointer:: ; d1b7 ds 2 -SouthConnectionStripLocation: ; d1b9 +SouthConnectionStripLocation:: ; d1b9 ds 2 -SouthConnectionStripLength: ; d1bb +SouthConnectionStripLength:: ; d1bb ds 1 -SouthConnectedMapWidth: ; d1bc +SouthConnectedMapWidth:: ; d1bc ds 1 -SouthConnectionStripYOffset: ; d1bd +SouthConnectionStripYOffset:: ; d1bd ds 1 -SouthConnectionStripXOffset: ; d1be +SouthConnectionStripXOffset:: ; d1be ds 1 -SouthConnectionWindow: ; d1bf +SouthConnectionWindow:: ; d1bf ds 2 -WestMapConnection: ; d1c1 -WestConnectedMapGroup: ; d1c1 +WestMapConnection:: ; d1c1 +WestConnectedMapGroup:: ; d1c1 ds 1 -WestConnectedMapNumber: ; d1c2 +WestConnectedMapNumber:: ; d1c2 ds 1 -WestConnectionStripPointer: ; d1c3 +WestConnectionStripPointer:: ; d1c3 ds 2 -WestConnectionStripLocation: ; d1c5 +WestConnectionStripLocation:: ; d1c5 ds 2 -WestConnectionStripLength: ; d1c7 +WestConnectionStripLength:: ; d1c7 ds 1 -WestConnectedMapWidth: ; d1c8 +WestConnectedMapWidth:: ; d1c8 ds 1 -WestConnectionStripYOffset: ; d1c9 +WestConnectionStripYOffset:: ; d1c9 ds 1 -WestConnectionStripXOffset: ; d1ca +WestConnectionStripXOffset:: ; d1ca ds 1 -WestConnectionWindow: ; d1cb +WestConnectionWindow:: ; d1cb ds 2 -EastMapConnection: ; d1cd -EastConnectedMapGroup: ; d1cd +EastMapConnection:: ; d1cd +EastConnectedMapGroup:: ; d1cd ds 1 -EastConnectedMapNumber: ; d1ce +EastConnectedMapNumber:: ; d1ce ds 1 -EastConnectionStripPointer: ; d1cf +EastConnectionStripPointer:: ; d1cf ds 2 -EastConnectionStripLocation: ; d1d1 +EastConnectionStripLocation:: ; d1d1 ds 2 -EastConnectionStripLength: ; d1d3 +EastConnectionStripLength:: ; d1d3 ds 1 -EastConnectedMapWidth: ; d1d4 +EastConnectedMapWidth:: ; d1d4 ds 1 -EastConnectionStripYOffset: ; d1d5 +EastConnectionStripYOffset:: ; d1d5 ds 1 -EastConnectionStripXOffset: ; d1d6 +EastConnectionStripXOffset:: ; d1d6 ds 1 -EastConnectionWindow: ; d1d7 +EastConnectionWindow:: ; d1d7 ds 2 -TilesetHeader: -TilesetBank: ; d1d9 +TilesetHeader:: +TilesetBank:: ; d1d9 ds 1 -TilesetAddress: ; d1da +TilesetAddress:: ; d1da ds 2 -TilesetBlocksBank: ; d1dc +TilesetBlocksBank:: ; d1dc ds 1 -TilesetBlocksAddress: ; d1dd +TilesetBlocksAddress:: ; d1dd ds 2 -TilesetCollisionBank: ; d1df +TilesetCollisionBank:: ; d1df ds 1 -TilesetCollisionAddress: ; d1e0 +TilesetCollisionAddress:: ; d1e0 ds 2 -TilesetAnim: ; d1e2 +TilesetAnim:: ; d1e2 ; bank 3f ds 2 ; unused ; d1e4 ds 2 -TilesetPalettes: ; d1e6 +TilesetPalettes:: ; d1e6 ; bank 3f ds 2 -EvolvableFlags: ; d1e8 +EvolvableFlags:: ; d1e8 ds 1 ds 1 -MagikarpLength: -Buffer1: ; d1ea +MagikarpLength:: +Buffer1:: ; d1ea ds 1 -MovementType: -Buffer2: ; d1eb +MovementType:: +Buffer2:: ; d1eb ds 1 SECTION "BattleMons2",WRAMX[$d1fa],BANK[1] -LinkBattleRNs: ; d1fa +LinkBattleRNs:: ; d1fa ds 10 -TempEnemyMonSpecies: ; d204 +TempEnemyMonSpecies:: ; d204 ds 1 -TempBattleMonSpecies: ; d205 +TempBattleMonSpecies:: ; d205 ds 1 -EnemyMon: -EnemyMonSpecies: ; d206 +EnemyMon:: +EnemyMonSpecies:: ; d206 ds 1 -EnemyMonItem: ; d207 +EnemyMonItem:: ; d207 ds 1 -EnemyMonMoves: -EnemyMonMove1: ; d208 +EnemyMonMoves:: +EnemyMonMove1:: ; d208 ds 1 -EnemyMonMove2: ; d209 +EnemyMonMove2:: ; d209 ds 1 -EnemyMonMove3: ; d20a +EnemyMonMove3:: ; d20a ds 1 -EnemyMonMove4: ; d20b +EnemyMonMove4:: ; d20b ds 1 -EnemyMonMovesEnd: +EnemyMonMovesEnd:: -EnemyMonDVs: -EnemyMonAtkDefDV: ; d20c +EnemyMonDVs:: +EnemyMonAtkDefDV:: ; d20c ds 1 -EnemyMonSpdSpclDV: ; d20d +EnemyMonSpdSpclDV:: ; d20d ds 1 -EnemyMonPP: -EnemyMonPPMove1: ; d20e +EnemyMonPP:: +EnemyMonPPMove1:: ; d20e ds 1 -EnemyMonPPMove2: ; d20f +EnemyMonPPMove2:: ; d20f ds 1 -EnemyMonPPMove3: ; d210 +EnemyMonPPMove3:: ; d210 ds 1 -EnemyMonPPMove4: ; d211 +EnemyMonPPMove4:: ; d211 ds 1 -EnemyMonHappiness: ; d212 +EnemyMonHappiness:: ; d212 ds 1 -EnemyMonLevel: ; d213 +EnemyMonLevel:: ; d213 ds 1 -EnemyMonStatus: ; d214 +EnemyMonStatus:: ; d214 ds 2 -EnemyMonHP: -EnemyMonHPHi: ; d216 +EnemyMonHP:: +EnemyMonHPHi:: ; d216 ds 1 -EnemyMonHPLo: ; d217 +EnemyMonHPLo:: ; d217 ds 1 -EnemyMonMaxHP: -EnemyMonMaxHPHi: ; d218 +EnemyMonMaxHP:: +EnemyMonMaxHPHi:: ; d218 ds 1 -EnemyMonMaxHPLo: ; d219 +EnemyMonMaxHPLo:: ; d219 ds 1 -EnemyMonStats: -EnemyMonAtk: ; d21a +EnemyMonStats:: +EnemyMonAtk:: ; d21a ds 2 -EnemyMonDef: ; d21c +EnemyMonDef:: ; d21c ds 2 -EnemyMonSpd: ; d21e +EnemyMonSpd:: ; d21e ds 2 -EnemyMonSpclAtk: ; d220 +EnemyMonSpclAtk:: ; d220 ds 2 -EnemyMonSpclDef: ; d222 +EnemyMonSpclDef:: ; d222 ds 2 -EnemyMonStatsEnd: +EnemyMonStatsEnd:: -EnemyMonType1: ; d224 +EnemyMonType1:: ; d224 ds 1 -EnemyMonType2: ; d225 +EnemyMonType2:: ; d225 ds 1 -EnemyMonBaseStats: ; d226 +EnemyMonBaseStats:: ; d226 ds 5 -EnemyMonCatchRate: ; d22b +EnemyMonCatchRate:: ; d22b ds 1 -EnemyMonBaseExp: ; d22c +EnemyMonBaseExp:: ; d22c ds 1 -EnemyMonEnd: +EnemyMonEnd:: -IsInBattle: ; d22d +IsInBattle:: ; d22d ; 0: overworld ; 1: wild battle ; 2: trainer battle @@ -1339,12 +1339,12 @@ IsInBattle: ; d22d ds 1 -OtherTrainerClass: ; d22f +OtherTrainerClass:: ; d22f ; class (Youngster, Bug Catcher, etc.) of opposing trainer ; 0 if opponent is a wild Pokémon, not a trainer ds 1 -BattleType: ; d230 +BattleType:: ; d230 ; $00 normal ; $01 ; $02 @@ -1360,299 +1360,299 @@ BattleType: ; d230 ; $0c suicune ds 1 -OtherTrainerID: ; d231 +OtherTrainerID:: ; d231 ; which trainer of the class that you're fighting ; (Joey, Mikey, Albert, etc.) ds 1 ds 1 -TrainerClass: ; d233 +TrainerClass:: ; d233 ds 1 -UnownLetter: ; d234 +UnownLetter:: ; d234 ds 1 ds 1 -CurBaseData: ; d236 -BaseDexNo: ; d236 +CurBaseData:: ; d236 +BaseDexNo:: ; d236 ds 1 -BaseStats: ; d237 -BaseHP: ; d237 +BaseStats:: ; d237 +BaseHP:: ; d237 ds 1 -BaseAttack: ; d238 +BaseAttack:: ; d238 ds 1 -BaseDefense: ; d239 +BaseDefense:: ; d239 ds 1 -BaseSpeed: ; d23a +BaseSpeed:: ; d23a ds 1 -BaseSpecialAttack: ; d23b +BaseSpecialAttack:: ; d23b ds 1 -BaseSpecialDefense: ; d23c +BaseSpecialDefense:: ; d23c ds 1 -BaseType: ; d23d -BaseType1: ; d23d +BaseType:: ; d23d +BaseType1:: ; d23d ds 1 -BaseType2: ; d23e +BaseType2:: ; d23e ds 1 -BaseCatchRate: ; d23f +BaseCatchRate:: ; d23f ds 1 -BaseExp: ; d240 +BaseExp:: ; d240 ds 1 -BaseItems: ; d241 +BaseItems:: ; d241 ds 2 -BaseGender: ; d243 +BaseGender:: ; d243 ds 1 -BaseUnknown1: ; d244 +BaseUnknown1:: ; d244 ds 1 -BaseEggSteps: ; d245 +BaseEggSteps:: ; d245 ds 1 -BaseUnknown2: ; d246 +BaseUnknown2:: ; d246 ds 1 -BasePicSize: ; d247 +BasePicSize:: ; d247 ds 1 -BasePadding: ; d248 +BasePadding:: ; d248 ds 4 -BaseGrowthRate: ; d24c +BaseGrowthRate:: ; d24c ds 1 -BaseEggGroups: ; d24d +BaseEggGroups:: ; d24d ds 1 -BaseTMHM: ; d24e +BaseTMHM:: ; d24e ds 8 -CurDamage: ; d256 +CurDamage:: ; d256 ds 2 SECTION "TimeOfDay",WRAMX[$d269],BANK[1] -TimeOfDay: ; d269 +TimeOfDay:: ; d269 ds 1 SECTION "OTParty",WRAMX[$d280],BANK[1] -OTPartyCount: ; d280 +OTPartyCount:: ; d280 ds 1 ; number of Pokémon in party -OTPartySpecies: ; d281 +OTPartySpecies:: ; d281 ds 6 ; species of each Pokémon in party ; d287 ds 1 ; any empty slots including the 7th must be FF ; or the routine will keep going -OTPartyMon1: -OTPartyMon1Species: ; d288 +OTPartyMon1:: +OTPartyMon1Species:: ; d288 ds 1 -OTPartyMon1Item: ; d289 +OTPartyMon1Item:: ; d289 ds 1 -OTPartyMon1Moves: ; d28a -OTPartyMon1Move1: ; d28a +OTPartyMon1Moves:: ; d28a +OTPartyMon1Move1:: ; d28a ds 1 -OTPartyMon1Move2: ; d28b +OTPartyMon1Move2:: ; d28b ds 1 -OTPartyMon1Move3: ; d28c +OTPartyMon1Move3:: ; d28c ds 1 -OTPartyMon1Move4: ; d28d +OTPartyMon1Move4:: ; d28d ds 1 -OTPartyMon1ID: ; d28e +OTPartyMon1ID:: ; d28e ds 2 -OTPartyMon1Exp: ; d290 +OTPartyMon1Exp:: ; d290 ds 3 -OTPartyMon1HPExp: ; d293 +OTPartyMon1HPExp:: ; d293 ds 2 -OTPartyMon1AtkExp: ; d295 +OTPartyMon1AtkExp:: ; d295 ds 2 -OTPartyMon1DefExp: ; d297 +OTPartyMon1DefExp:: ; d297 ds 2 -OTPartyMon1SpdExp: ; d299 +OTPartyMon1SpdExp:: ; d299 ds 2 -OTPartyMon1SpclExp: ; d29b +OTPartyMon1SpclExp:: ; d29b ds 2 -OTPartyMon1DVs: ; d29d -OTPartyMon1AtkDefDV: ; d29d +OTPartyMon1DVs:: ; d29d +OTPartyMon1AtkDefDV:: ; d29d ds 1 -OTPartyMon1SpdSpclDV: ; d29e +OTPartyMon1SpdSpclDV:: ; d29e ds 1 -OTPartyMon1PP: ; d29f -OTPartyMon1PPMove1: ; d29f +OTPartyMon1PP:: ; d29f +OTPartyMon1PPMove1:: ; d29f ds 1 -OTPartyMon1PPMove2: ; d2a0 +OTPartyMon1PPMove2:: ; d2a0 ds 1 -OTPartyMon1PPMove3: ; d2a1 +OTPartyMon1PPMove3:: ; d2a1 ds 1 -OTPartyMon1PPMove4: ; d2a2 +OTPartyMon1PPMove4:: ; d2a2 ds 1 -OTPartyMon1Happiness: ; d2a3 +OTPartyMon1Happiness:: ; d2a3 ds 1 -OTPartyMon1PokerusStatus: ; d2a4 +OTPartyMon1PokerusStatus:: ; d2a4 ds 1 -OTPartyMon1CaughtData: ; d2a5 -OTPartyMon1CaughtGender: ; d2a5 -OTPartyMon1CaughtLocation: ; d2a5 +OTPartyMon1CaughtData:: ; d2a5 +OTPartyMon1CaughtGender:: ; d2a5 +OTPartyMon1CaughtLocation:: ; d2a5 ds 1 -OTPartyMon1CaughtTime: ; d2a6 +OTPartyMon1CaughtTime:: ; d2a6 ds 1 -OTPartyMon1Level: ; d2a7 +OTPartyMon1Level:: ; d2a7 ds 1 -OTPartyMon1Status: ; d2a8 +OTPartyMon1Status:: ; d2a8 ds 1 -OTPartyMon1Unused: ; d2a9 +OTPartyMon1Unused:: ; d2a9 ds 1 -OTPartyMon1CurHP: ; d2aa +OTPartyMon1CurHP:: ; d2aa ds 2 -OTPartyMon1MaxHP: ; d2ac +OTPartyMon1MaxHP:: ; d2ac ds 2 -OTPartyMon1Atk: ; d2ae +OTPartyMon1Atk:: ; d2ae ds 2 -OTPartyMon1Def: ; d2b0 +OTPartyMon1Def:: ; d2b0 ds 2 -OTPartyMon1Spd: ; d2b2 +OTPartyMon1Spd:: ; d2b2 ds 2 -OTPartyMon1SpclAtk: ; d2b4 +OTPartyMon1SpclAtk:: ; d2b4 ds 2 -OTPartyMon1SpclDef: ; d2b6 +OTPartyMon1SpclDef:: ; d2b6 ds 2 -OTPartyMon2: ; d2b8 +OTPartyMon2:: ; d2b8 ds 48 -OTPartyMon3: ; d2e8 +OTPartyMon3:: ; d2e8 ds 48 -OTPartyMon4: ; d318 +OTPartyMon4:: ; d318 ds 48 -OTPartyMon5: ; d348 +OTPartyMon5:: ; d348 ds 48 -OTPartyMon6: ; d378 +OTPartyMon6:: ; d378 ds 48 -OTPartyMonOT: -OTPartyMon1OT: ; d3a8 +OTPartyMonOT:: +OTPartyMon1OT:: ; d3a8 ds 11 -OTPartyMon2OT: ; d3b3 +OTPartyMon2OT:: ; d3b3 ds 11 -OTPartyMon3OT: ; d3be +OTPartyMon3OT:: ; d3be ds 11 -OTPartyMon4OT: ; d3c9 +OTPartyMon4OT:: ; d3c9 ds 11 -OTPartyMon5OT: ; d3d4 +OTPartyMon5OT:: ; d3d4 ds 11 -OTPartyMon6OT: ; d3df +OTPartyMon6OT:: ; d3df ds 11 -OTPartyMonNicknames: -OTPartyMon1Nickname: ; d3ea +OTPartyMonNicknames:: +OTPartyMon1Nickname:: ; d3ea ds 11 -OTPartyMon2Nickname: ; d3f5 +OTPartyMon2Nickname:: ; d3f5 ds 11 -OTPartyMon3Nickname: ; d400 +OTPartyMon3Nickname:: ; d400 ds 11 -OTPartyMon4Nickname: ; d40b +OTPartyMon4Nickname:: ; d40b ds 11 -OTPartyMon5Nickname: ; d416 +OTPartyMon5Nickname:: ; d416 ds 11 -OTPartyMon6Nickname: ; d421 +OTPartyMon6Nickname:: ; d421 ds 11 SECTION "Map Events", WRAMX[$d432], BANK[1] -MapStatus: ; d432 +MapStatus:: ; d432 ds 1 -MapEventStatus: ; d433 +MapEventStatus:: ; d433 ds 1 -ScriptFlags: ; d434 +ScriptFlags:: ; d434 ds 1 -ScriptFlags2: ; d435 +ScriptFlags2:: ; d435 ds 1 -ScriptFlags3: ; d436 +ScriptFlags3:: ; d436 ds 1 -ScriptMode: ; d437 +ScriptMode:: ; d437 ds 1 -ScriptRunning: ; d438 +ScriptRunning:: ; d438 ds 1 -ScriptBank: ; d439 +ScriptBank:: ; d439 ds 1 -ScriptPos: ; d43a +ScriptPos:: ; d43a ds 2 ds 17 -ScriptDelay: ; d44d +ScriptDelay:: ; d44d ds 1 SECTION "Player",WRAMX[$d472],BANK[1] -PlayerGender: ; d472 +PlayerGender:: ; d472 ; bit 0: ; 0 male ; 1 female ds 1 ds 8 -PlayerID: ; d47b +PlayerID:: ; d47b ds 2 -PlayerName: ; d47d +PlayerName:: ; d47d ds 11 -MomsName: ; d488 +MomsName:: ; d488 ds 11 -RivalName: ; d493 +RivalName:: ; d493 ds 11 -RedsName: ; d49e +RedsName:: ; d49e ds 11 -GreensName: ; d4a9 +GreensName:: ; d4a9 ds 11 ds 2 ; init time set at newgame -StartDay: ; d4b6 +StartDay:: ; d4b6 ds 1 -StartHour: ; d4b7 +StartHour:: ; d4b7 ds 1 -StartMinute: ; d4b8 +StartMinute:: ; d4b8 ds 1 -StartSecond: ; d4b9 +StartSecond:: ; d4b9 ds 1 ds 9 -GameTimeCap: ; d4c3 +GameTimeCap:: ; d4c3 ds 1 -GameTimeHours: ; d4c4 +GameTimeHours:: ; d4c4 ds 2 -GameTimeMinutes: ; d4c6 +GameTimeMinutes:: ; d4c6 ds 1 -GameTimeSeconds: ; d4c7 +GameTimeSeconds:: ; d4c7 ds 1 -GameTimeFrames: ; d4c8 +GameTimeFrames:: ; d4c8 ds 1 ds 2 -CurDay: ; d4cb +CurDay:: ; d4cb ds 1 ds 10 -ObjectStructs: +ObjectStructs:: -PlayerStruct: ; d4d6 +PlayerStruct:: ; d4d6 ds 2 -PlayerSprite: ; d4d8 +PlayerSprite:: ; d4d8 ds 1 ds 3 -PlayerPalette: ; d4dc +PlayerPalette:: ; d4dc ds 1 ds 1 -PlayerDirection: ; d4de +PlayerDirection:: ; d4de ; uses bits 2 and 3 / $0c / %00001100 ; %00 down ; %01 up @@ -1660,473 +1660,473 @@ PlayerDirection: ; d4de ; $11 right ds 1 ds 2 -PlayerAction: ; d4e1 +PlayerAction:: ; d4e1 ; 1 standing ; 2 walking ; 4 spinning ; 6 fishing ds 1 ds 1 -PlayerFacing: ; d4e3 +PlayerFacing:: ; d4e3 ds 1 -StandingTile: ; d4e4 +StandingTile:: ; d4e4 ds 1 -StandingTile2: ; d4e5 +StandingTile2:: ; d4e5 ds 1 ; relative to the map struct including borders -MapX: ; d4e6 +MapX:: ; d4e6 ds 1 -MapY: ; d4e7 +MapY:: ; d4e7 ds 1 -MapX2: ; d4e8 +MapX2:: ; d4e8 ds 1 -MapY2: ; d4e9 +MapY2:: ; d4e9 ds 1 ds 3 ; relative to the bg map, in px -PlayerSpriteX: ; d4ed +PlayerSpriteX:: ; d4ed ds 1 -PlayerSpriteY: ; d4ee +PlayerSpriteY:: ; d4ee ds 1 ds 15 -ObjectStruct1: ; d4fe +ObjectStruct1:: ; d4fe ds 40 -ObjectStruct2: ; d526 +ObjectStruct2:: ; d526 ds 40 -ObjectStruct3: ; d54e +ObjectStruct3:: ; d54e ds 40 -ObjectStruct4: ; d576 +ObjectStruct4:: ; d576 ds 40 -ObjectStruct5: ; d59e +ObjectStruct5:: ; d59e ds 40 -ObjectStruct6: ; d5c6 +ObjectStruct6:: ; d5c6 ds 40 -ObjectStruct7: ; d5ee +ObjectStruct7:: ; d5ee ds 40 -ObjectStruct8: ; d616 +ObjectStruct8:: ; d616 ds 40 -ObjectStruct9: ; d63e +ObjectStruct9:: ; d63e ds 40 -ObjectStruct10: ; d666 +ObjectStruct10:: ; d666 ds 40 -ObjectStruct11: ; d68e +ObjectStruct11:: ; d68e ds 40 -ObjectStruct12: ; d6b6 +ObjectStruct12:: ; d6b6 ds 40 ; d6de SECTION "Objects",WRAMX[$d71e],BANK[1] -MapObjects: ; d71e +MapObjects:: ; d71e ds OBJECT_LENGTH * NUM_OBJECTS SECTION "VariableSprites",WRAMX[$d82e],BANK[1] -VariableSprites: ; d82e +VariableSprites:: ; d82e ds $10 SECTION "Status",WRAMX[$d841],BANK[1] -TimeOfDayPal: ; d841 +TimeOfDayPal:: ; d841 ds 1 ds 4 ; d846 ds 1 ds 1 -CurTimeOfDay: ; d848 +CurTimeOfDay:: ; d848 ds 1 ds 3 -StatusFlags: ; d84c +StatusFlags:: ; d84c ds 1 -StatusFlags2: ; d84d +StatusFlags2:: ; d84d ds 1 -Money: ; d84e +Money:: ; d84e ds 3 ds 4 -Coins: ; d855 +Coins:: ; d855 ds 2 -Badges: -JohtoBadges: ; d857 +Badges:: +JohtoBadges:: ; d857 ds 1 -KantoBadges: ; d858 +KantoBadges:: ; d858 ds 1 SECTION "Items",WRAMX[$d859],BANK[1] -TMsHMs: ; d859 +TMsHMs:: ; d859 ds 57 -TMsHMsEnd: +TMsHMsEnd:: -NumItems: ; d892 +NumItems:: ; d892 ds 1 -Items: ; d893 +Items:: ; d893 ds 41 -ItemsEnd: +ItemsEnd:: -NumKeyItems: ; d8bc +NumKeyItems:: ; d8bc ds 1 -KeyItems: ; d8bd +KeyItems:: ; d8bd ds 26 -KeyItemsEnd: +KeyItemsEnd:: -NumBalls: ; d8d7 +NumBalls:: ; d8d7 ds 1 -Balls: ; d8d8 +Balls:: ; d8d8 ds 25 -BallsEnd: +BallsEnd:: -PCItems: ; d8f1 +PCItems:: ; d8f1 ds 101 -PCItemsEnd: +PCItemsEnd:: SECTION "overworld",WRAMX[$d95b],BANK[1] -WhichRegisteredItem: ; d95b +WhichRegisteredItem:: ; d95b ds 1 -RegisteredItem: ; d95c +RegisteredItem:: ; d95c ds 1 -PlayerState: ; d95d +PlayerState:: ; d95d ds 1 SECTION "scriptram",WRAMX[$d962],BANK[1] -MooMooBerries: ; d962 +MooMooBerries:: ; d962 ds 1 ; how many berries fed to MooMoo -UndergroundSwitchPositions: ; d963 +UndergroundSwitchPositions:: ; d963 ds 1 ; which positions the switches are in -FarfetchdPosition: ; d964 +FarfetchdPosition:: ; d964 ds 1 ; which position the ilex farfetch'd is in SECTION "Events",WRAMX[$da72],BANK[1] -EventFlags: ; da72 -;RoomDecorations: ; dac6 -;TeamRocketAzaleaTownAttackEvent: ; db51 -;PoliceAtElmsLabEvent: ; db52 -;SalesmanMahoganyTownEvent: ; db5c -;RedGyaradosEvent: ; db5c +EventFlags:: ; da72 +;RoomDecorations:: ; dac6 +;TeamRocketAzaleaTownAttackEvent:: ; db51 +;PoliceAtElmsLabEvent:: ; db52 +;SalesmanMahoganyTownEvent:: ; db5c +;RedGyaradosEvent:: ; db5c ds 250 ; db6c SECTION "BoxNames",WRAMX[$db75],BANK[1] ; 8 chars + $50 -Box1Name: ; db75 +Box1Name:: ; db75 ds 9 -Box2Name: ; db7e +Box2Name:: ; db7e ds 9 -Box3Name: ; db87 +Box3Name:: ; db87 ds 9 -Box4Name: ; db90 +Box4Name:: ; db90 ds 9 -Box5Name: ; db99 +Box5Name:: ; db99 ds 9 -Box6Name: ; dba2 +Box6Name:: ; dba2 ds 9 -Box7Name: ; dbab +Box7Name:: ; dbab ds 9 -Box8Name: ; dbb4 +Box8Name:: ; dbb4 ds 9 -Box9Name: ; dbbd +Box9Name:: ; dbbd ds 9 -Box10Name: ; dbc6 +Box10Name:: ; dbc6 ds 9 -Box11Name: ; dbcf +Box11Name:: ; dbcf ds 9 -Box12Name: ; dbd8 +Box12Name:: ; dbd8 ds 9 -Box13Name: ; dbe1 +Box13Name:: ; dbe1 ds 9 -Box14Name: ; dbea +Box14Name:: ; dbea ds 9 SECTION "bike", WRAMX[$dbf5],BANK[1] -BikeFlags: ; dbf5 +BikeFlags:: ; dbf5 ; bit 1: always on bike ; bit 2: downhill ds 1 SECTION "decorations", WRAMX[$dc0f],BANK[1] ; Sprite id of each decoration -Bed: ; dc0f +Bed:: ; dc0f ds 1 -Carpet: ; dc10 +Carpet:: ; dc10 ds 1 -Plant: ; dc11 +Plant:: ; dc11 ds 1 -Poster: ; dc12 +Poster:: ; dc12 ds 1 -Console: ; dc13 +Console:: ; dc13 ds 1 -LeftOrnament: ; dc14 +LeftOrnament:: ; dc14 ds 1 -RightOrnament: ; dc15 +RightOrnament:: ; dc15 ds 1 -BigDoll: ; dc16 +BigDoll:: ; dc16 ds 1 SECTION "fruittrees", WRAMX[$dc27],BANK[1] -FruitTreeFlags: ; dc27 +FruitTreeFlags:: ; dc27 ds 1 SECTION "steps", WRAMX[$dc73],BANK[1] -StepCount: ; dc73 +StepCount:: ; dc73 ds 1 -PoisonStepCount: ; dc74 +PoisonStepCount:: ; dc74 ds 1 SECTION "Visited Spawn Points", WRAMX[$dca5],BANK[1] -VisitedSpawns: ; dca5 +VisitedSpawns:: ; dca5 ds 4 SECTION "BackupMapInfo", WRAMX[$dcad],BANK[1] ; used on maps like second floor pokécenter, which are reused, so we know which ; map to return to -BackupMapGroup: ; dcad +BackupMapGroup:: ; dcad ds 1 -BackupMapNumber: ; dcae +BackupMapNumber:: ; dcae ds 1 SECTION "PlayerMapInfo", WRAMX[$dcb4],BANK[1] -WarpNumber: ; dcb4 +WarpNumber:: ; dcb4 ds 1 -MapGroup: ; dcb5 +MapGroup:: ; dcb5 ds 1 ; map group of current map -MapNumber: ; dcb6 +MapNumber:: ; dcb6 ds 1 ; map number of current map -YCoord: ; dcb7 +YCoord:: ; dcb7 ds 1 ; current y coordinate relative to top-left corner of current map -XCoord: ; dcb8 +XCoord:: ; dcb8 ds 1 ; current x coordinate relative to top-left corner of current map SECTION "PlayerParty",WRAMX[$dcd7],BANK[1] -PartyCount: ; dcd7 +PartyCount:: ; dcd7 ds 1 ; number of Pokémon in party -PartySpecies: ; dcd8 +PartySpecies:: ; dcd8 ds 6 ; species of each Pokémon in party -PartyEnd: ; dcde +PartyEnd:: ; dcde ds 1 ; legacy functions don't check PartyCount -PartyMons: -PartyMon1: -PartyMon1Species: ; dcdf +PartyMons:: +PartyMon1:: +PartyMon1Species:: ; dcdf ds 1 -PartyMon1Item: ; dce0 +PartyMon1Item:: ; dce0 ds 1 -PartyMon1Moves: ; dce1 -PartyMon1Move1: ; dce1 +PartyMon1Moves:: ; dce1 +PartyMon1Move1:: ; dce1 ds 1 -PartyMon1Move2: ; dce2 +PartyMon1Move2:: ; dce2 ds 1 -PartyMon1Move3: ; dce3 +PartyMon1Move3:: ; dce3 ds 1 -PartyMon1Move4: ; dce4 +PartyMon1Move4:: ; dce4 ds 1 -PartyMon1ID: ; dce5 +PartyMon1ID:: ; dce5 ds 2 -PartyMon1Exp: ; dce7 +PartyMon1Exp:: ; dce7 ds 3 -PartyMon1StatExp: -PartyMon1HPExp: ; dcea +PartyMon1StatExp:: +PartyMon1HPExp:: ; dcea ds 2 -PartyMon1AtkExp: ; dcec +PartyMon1AtkExp:: ; dcec ds 2 -PartyMon1DefExp: ; dcee +PartyMon1DefExp:: ; dcee ds 2 -PartyMon1SpdExp: ; dcf0 +PartyMon1SpdExp:: ; dcf0 ds 2 -PartyMon1SpclExp: ; dcf2 +PartyMon1SpclExp:: ; dcf2 ds 2 -PartyMon1DVs: ; dcf4 +PartyMon1DVs:: ; dcf4 ; hp = %1000 for each dv ds 1 ; atk/def ds 1 ; spd/spc -PartyMon1PP: ; dcf6 +PartyMon1PP:: ; dcf6 ds 4 -PartyMon1Happiness: ; dcfa +PartyMon1Happiness:: ; dcfa ds 1 -PartyMon1PokerusStatus: ; dcfb +PartyMon1PokerusStatus:: ; dcfb ds 1 -PartyMon1CaughtData: ; dcfc -PartyMon1CaughtTime: ; dcfc -PartyMon1CaughtLevel: ; dcfc +PartyMon1CaughtData:: ; dcfc +PartyMon1CaughtTime:: ; dcfc +PartyMon1CaughtLevel:: ; dcfc ds 1 -PartyMon1CaughtGender: ; dcfd -PartyMon1CaughtLocation: ; dcfd +PartyMon1CaughtGender:: ; dcfd +PartyMon1CaughtLocation:: ; dcfd ds 1 -PartyMon1Level: ; dcfe +PartyMon1Level:: ; dcfe ds 1 -PartyMon1Status: ; dcff +PartyMon1Status:: ; dcff ds 1 ; dd00 unused ds 1 -PartyMon1CurHP: ; dd01 +PartyMon1CurHP:: ; dd01 ds 2 -PartyMon1MaxHP: ; dd03 +PartyMon1MaxHP:: ; dd03 ds 2 -PartyMon1Atk: ; dd05 +PartyMon1Atk:: ; dd05 ds 2 -PartyMon1Def: ; dd07 +PartyMon1Def:: ; dd07 ds 2 -PartyMon1Spd: ; dd09 +PartyMon1Spd:: ; dd09 ds 2 -PartyMon1SpclAtk: ; dd0b +PartyMon1SpclAtk:: ; dd0b ds 2 -PartyMon1SpclDef: ; dd0d +PartyMon1SpclDef:: ; dd0d ds 2 -PartyMon2: ; dd0f +PartyMon2:: ; dd0f ds 48 -PartyMon3: ; dd3f +PartyMon3:: ; dd3f ds 48 -PartyMon4: ; dd6f +PartyMon4:: ; dd6f ds 48 -PartyMon5: ; dd9f +PartyMon5:: ; dd9f ds 48 -PartyMon6: ; ddcf +PartyMon6:: ; ddcf ds 48 -PartyMonOT: -PartyMon1OT: ; ddff +PartyMonOT:: +PartyMon1OT:: ; ddff ds 11 -PartyMon2OT: ; de0a +PartyMon2OT:: ; de0a ds 11 -PartyMon3OT: ; de15 +PartyMon3OT:: ; de15 ds 11 -PartyMon4OT: ; de20 +PartyMon4OT:: ; de20 ds 11 -PartyMon5OT: ; de2b +PartyMon5OT:: ; de2b ds 11 -PartyMon6OT: ; de36 +PartyMon6OT:: ; de36 ds 11 -PartyMonNicknames: -PartyMon1Nickname: ; de41 +PartyMonNicknames:: +PartyMon1Nickname:: ; de41 ds 11 -PartyMon2Nickname: ; de4c +PartyMon2Nickname:: ; de4c ds 11 -PartyMon3Nickname: ; de57 +PartyMon3Nickname:: ; de57 ds 11 -PartyMon4Nickname: ; de62 +PartyMon4Nickname:: ; de62 ds 11 -PartyMon5Nickname: ; de6d +PartyMon5Nickname:: ; de6d ds 11 -PartyMon6Nickname: ; de78 +PartyMon6Nickname:: ; de78 ds 11 -PartyMonNicknamesEnd: +PartyMonNicknamesEnd:: SECTION "Pokedex",WRAMX[$de99],BANK[1] -PokedexCaught: ; de99 +PokedexCaught:: ; de99 ds 32 -EndPokedexCaught: -PokedexSeen: ; deb9 +EndPokedexCaught:: +PokedexSeen:: ; deb9 ds 32 -EndPokedexSeen: -UnownDex: ; ded9 +EndPokedexSeen:: +UnownDex:: ; ded9 ds 26 -UnlockedUnowns: ; def3 +UnlockedUnowns:: ; def3 ds 1 SECTION "Breeding",WRAMX[$def5],BANK[1] -DaycareMan: ; def5 +DaycareMan:: ; def5 ; bit 7: active ; bit 6: monsters are compatible ; bit 5: egg ready ; bit 0: monster 1 in daycare ds 1 -BreedMon1: -BreedMon1Nick: ; def6 +BreedMon1:: +BreedMon1Nick:: ; def6 ds 11 -BreedMon1OT: ; df01 +BreedMon1OT:: ; df01 ds 11 -BreedMon1Stats: -BreedMon1Species: ; df0c +BreedMon1Stats:: +BreedMon1Species:: ; df0c ds 1 ds 31 -DaycareLady: ; df2c +DaycareLady:: ; df2c ; bit 7: active ; bit 0: monster 2 in daycare ds 1 -StepsToEgg: ; df2d +StepsToEgg:: ; df2d ds 1 -DittoInDaycare: ; df2e +DittoInDaycare:: ; df2e ; z: yes ; nz: no ds 1 -BreedMon2: -BreedMon2Nick: ; df2f +BreedMon2:: +BreedMon2Nick:: ; df2f ds 11 -BreedMon2OT: ; df3a +BreedMon2OT:: ; df3a ds 11 -BreedMon2Stats: -BreedMon2Species: ; df45 +BreedMon2Stats:: +BreedMon2Species:: ; df45 ds 1 ds 31 -EggNick: ; df65 +EggNick:: ; df65 ; EGG@ ds 11 -EggOT: ; df70 +EggOT:: ; df70 ds 11 -EggStats: -EggSpecies: ; df7b +EggStats:: +EggSpecies:: ; df7b ds 1 ds 31 SECTION "RoamMons",WRAMX[$dfcf],BANK[1] -RoamMon1Species: ; dfcf +RoamMon1Species:: ; dfcf ds 1 -RoamMon1Level: ; dfd0 +RoamMon1Level:: ; dfd0 ds 1 -RoamMon1MapGroup: ; dfd1 +RoamMon1MapGroup:: ; dfd1 ds 1 -RoamMon1MapNumber: ; dfd2 +RoamMon1MapNumber:: ; dfd2 ds 1 -RoamMon1CurHP: ; dfd3 +RoamMon1CurHP:: ; dfd3 ds 1 -RoamMon1DVs: ; dfd4 +RoamMon1DVs:: ; dfd4 ds 2 -RoamMon2Species: ; dfd6 +RoamMon2Species:: ; dfd6 ds 1 -RoamMon2Level: ; dfd7 +RoamMon2Level:: ; dfd7 ds 1 -RoamMon2MapGroup: ; dfd8 +RoamMon2MapGroup:: ; dfd8 ds 1 -RoamMon2MapNumber: ; dfd9 +RoamMon2MapNumber:: ; dfd9 ds 1 -RoamMon2CurHP: ; dfda +RoamMon2CurHP:: ; dfda ds 1 -RoamMon2DVs: ; dfdb +RoamMon2DVs:: ; dfdb ds 2 -RoamMon3Species: ; dfdd +RoamMon3Species:: ; dfdd ds 1 -RoamMon3Level: ; dfde +RoamMon3Level:: ; dfde ds 1 -RoamMon3MapGroup: ; dfdf +RoamMon3MapGroup:: ; dfdf ds 1 -RoamMon3MapNumber: ; dfe0 +RoamMon3MapNumber:: ; dfe0 ds 1 -RoamMon3CurHP: ; dfe1 +RoamMon3CurHP:: ; dfe1 ds 1 -RoamMon3DVs: ; dfe2 +RoamMon3DVs:: ; dfe2 ds 2 @@ -2134,226 +2134,226 @@ RoamMon3DVs: ; dfe2 SECTION "WRAMBank5",WRAMX[$d000],BANK[5] ; 8 4-color palettes -Unkn1Pals: ; d000 +Unkn1Pals:: ; d000 ds $40 -Unkn2Pals: ; d040 +Unkn2Pals:: ; d040 ds $40 -BGPals: ; d080 +BGPals:: ; d080 ds $40 -OBPals: ; d0c0 +OBPals:: ; d0c0 ds $40 -LYOverrides: ; d100 +LYOverrides:: ; d100 ds 144 -LYOverridesEnd: +LYOverridesEnd:: ds 112 -LYOverridesBackup: ; d200 +LYOverridesBackup:: ; d200 ds 144 -LYOverridesBackupEnd: +LYOverridesBackupEnd:: SECTION "Battle Animations", WRAMX[$d30a], BANK[5] -ActiveAnimObjects: ; d30a +ActiveAnimObjects:: ; d30a ds 4 * 40 ds 80 -ActiveBGEffects: ; d3fa +ActiveBGEffects:: ; d3fa ds 4 * 5 ds 1 -BattleAnimFlags: ; d40f +BattleAnimFlags:: ; d40f ds 1 -BattleAnimAddress: ; d410 +BattleAnimAddress:: ; d410 ds 2 -BattleAnimDuration: ; d412 +BattleAnimDuration:: ; d412 ds 1 -BattleAnimParent: ; d413 +BattleAnimParent:: ; d413 ds 2 -BattleAnimLoops: ; d415 +BattleAnimLoops:: ; d415 ds 1 -BattleAnimVar: ; d416 +BattleAnimVar:: ; d416 ds 1 -BattleAnimByte: ; d417 +BattleAnimByte:: ; d417 ds 1 ds 1 -BattleAnimTemps: ; d419 +BattleAnimTemps:: ; d419 ds 8 SECTION "SRAMBank1",SRAM,BANK[1] SECTION "BoxMons",SRAM[$ad10],BANK[1] -BoxCount: ; ad10 +BoxCount:: ; ad10 ds 1 -BoxSpecies: ; ad11 +BoxSpecies:: ; ad11 ds 20 ds 1 -BoxMons: -BoxMon1: -BoxMon1Species: ; ad26 +BoxMons:: +BoxMon1:: +BoxMon1Species:: ; ad26 ds 1 -BoxMon1Item: ; ad27 +BoxMon1Item:: ; ad27 ds 1 -BoxMon1Moves: ; ad28 +BoxMon1Moves:: ; ad28 ds 4 -BoxMon1ID: ; ad2c +BoxMon1ID:: ; ad2c ds 2 -BoxMon1Exp: ; ad2e +BoxMon1Exp:: ; ad2e ds 3 -BoxMon1HPExp: ; ad31 +BoxMon1HPExp:: ; ad31 ds 2 -BoxMon1AtkExp: ; ad33 +BoxMon1AtkExp:: ; ad33 ds 2 -BoxMon1DefExp: ; ad35 +BoxMon1DefExp:: ; ad35 ds 2 -BoxMon1SpdExp: ; ad37 +BoxMon1SpdExp:: ; ad37 ds 2 -BoxMon1SpcExp: ; ad39 +BoxMon1SpcExp:: ; ad39 ds 2 -BoxMon1DVs: ; ad3b +BoxMon1DVs:: ; ad3b ds 2 -BoxMon1PP: ; ad3d +BoxMon1PP:: ; ad3d ds 4 -BoxMon1Happiness: ; ad41 +BoxMon1Happiness:: ; ad41 ds 1 -BoxMon1PokerusStatus: ; ad42 +BoxMon1PokerusStatus:: ; ad42 ds 1 -BoxMon1CaughtData: -BoxMon1CaughtTime: -BoxMon1CaughtLevel: ; ad43 +BoxMon1CaughtData:: +BoxMon1CaughtTime:: +BoxMon1CaughtLevel:: ; ad43 ds 1 -BoxMon1CaughtGender: -BoxMon1CaughtLocation: ; ad44 +BoxMon1CaughtGender:: +BoxMon1CaughtLocation:: ; ad44 ds 1 -BoxMon1Level: ; ad45 +BoxMon1Level:: ; ad45 ds 1 -BoxMon2: ; ad46 +BoxMon2:: ; ad46 ds 32 -BoxMon3: ; ad66 +BoxMon3:: ; ad66 ds 32 -BoxMon4: ; ad86 +BoxMon4:: ; ad86 ds 32 -BoxMon5: ; ada6 +BoxMon5:: ; ada6 ds 32 -BoxMon6: ; adc6 +BoxMon6:: ; adc6 ds 32 -BoxMon7: ; ade6 +BoxMon7:: ; ade6 ds 32 -BoxMon8: ; ae06 +BoxMon8:: ; ae06 ds 32 -BoxMon9: ; ae26 +BoxMon9:: ; ae26 ds 32 -BoxMon10: ; ae46 +BoxMon10:: ; ae46 ds 32 -BoxMon11: ; ae66 +BoxMon11:: ; ae66 ds 32 -BoxMon12: ; ae86 +BoxMon12:: ; ae86 ds 32 -BoxMon13: ; aea6 +BoxMon13:: ; aea6 ds 32 -BoxMon14: ; aec6 +BoxMon14:: ; aec6 ds 32 -BoxMon15: ; aee6 +BoxMon15:: ; aee6 ds 32 -BoxMon16: ; af06 +BoxMon16:: ; af06 ds 32 -BoxMon17: ; af26 +BoxMon17:: ; af26 ds 32 -BoxMon18: ; af46 +BoxMon18:: ; af46 ds 32 -BoxMon19: ; af66 +BoxMon19:: ; af66 ds 32 -BoxMon20: ; af86 +BoxMon20:: ; af86 ds 32 -BoxMonOT: -BoxMon1OT: ; afa6 +BoxMonOT:: +BoxMon1OT:: ; afa6 ds 11 -BoxMon2OT: ; afb1 +BoxMon2OT:: ; afb1 ds 11 -BoxMon3OT: ; afbc +BoxMon3OT:: ; afbc ds 11 -BoxMon4OT: ; afc7 +BoxMon4OT:: ; afc7 ds 11 -BoxMon5OT: ; afd2 +BoxMon5OT:: ; afd2 ds 11 -BoxMon6OT: ; afdd +BoxMon6OT:: ; afdd ds 11 -BoxMon7OT: ; afe8 +BoxMon7OT:: ; afe8 ds 11 -BoxMon8OT: ; aff3 +BoxMon8OT:: ; aff3 ds 11 -BoxMon9OT: ; affe +BoxMon9OT:: ; affe ds 11 -BoxMon10OT: ; b009 +BoxMon10OT:: ; b009 ds 11 -BoxMon11OT: ; b014 +BoxMon11OT:: ; b014 ds 11 -BoxMon12OT: ; b01f +BoxMon12OT:: ; b01f ds 11 -BoxMon13OT: ; b02a +BoxMon13OT:: ; b02a ds 11 -BoxMon14OT: ; b035 +BoxMon14OT:: ; b035 ds 11 -BoxMon15OT: ; b040 +BoxMon15OT:: ; b040 ds 11 -BoxMon16OT: ; b04b +BoxMon16OT:: ; b04b ds 11 -BoxMon17OT: ; b056 +BoxMon17OT:: ; b056 ds 11 -BoxMon18OT: ; b061 +BoxMon18OT:: ; b061 ds 11 -BoxMon19OT: ; b06c +BoxMon19OT:: ; b06c ds 11 -BoxMon20OT: ; b077 +BoxMon20OT:: ; b077 ds 11 -BoxMonNicknames: -BoxMon1Nickname: ; b082 +BoxMonNicknames:: +BoxMon1Nickname:: ; b082 ds 11 -BoxMon2Nickname: ; b08d +BoxMon2Nickname:: ; b08d ds 11 -BoxMon3Nickname: ; b098 +BoxMon3Nickname:: ; b098 ds 11 -BoxMon4Nickname: ; b0a3 +BoxMon4Nickname:: ; b0a3 ds 11 -BoxMon5Nickname: ; b0ae +BoxMon5Nickname:: ; b0ae ds 11 -BoxMon6Nickname: ; b0b9 +BoxMon6Nickname:: ; b0b9 ds 11 -BoxMon7Nickname: ; b0c4 +BoxMon7Nickname:: ; b0c4 ds 11 -BoxMon8Nickname: ; b0cf +BoxMon8Nickname:: ; b0cf ds 11 -BoxMon9Nickname: ; b0da +BoxMon9Nickname:: ; b0da ds 11 -BoxMon10Nickname: ; b0e5 +BoxMon10Nickname:: ; b0e5 ds 11 -BoxMon11Nickname: ; b0f0 +BoxMon11Nickname:: ; b0f0 ds 11 -BoxMon12Nickname: ; b0fb +BoxMon12Nickname:: ; b0fb ds 11 -BoxMon13Nickname: ; b106 +BoxMon13Nickname:: ; b106 ds 11 -BoxMon14Nickname: ; b111 +BoxMon14Nickname:: ; b111 ds 11 -BoxMon15Nickname: ; b11c +BoxMon15Nickname:: ; b11c ds 11 -BoxMon16Nickname: ; b127 +BoxMon16Nickname:: ; b127 ds 11 -BoxMon17Nickname: ; b132 +BoxMon17Nickname:: ; b132 ds 11 -BoxMon18Nickname: ; b13d +BoxMon18Nickname:: ; b13d ds 11 -BoxMon19Nickname: ; b148 +BoxMon19Nickname:: ; b148 ds 11 -BoxMon20Nickname: ; b153 +BoxMon20Nickname:: ; b153 ds 11 -BoxMonNicknamesEnd: +BoxMonNicknamesEnd::