From 8431fa7756dace97413f4c35aaa44cd92cf5b6df Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Fri, 3 Jul 2015 14:58:50 -0500 Subject: TX_ASM --- macros.asm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index b80f1442..a3ff2815 100644 --- a/macros.asm +++ b/macros.asm @@ -195,6 +195,10 @@ TX_BCD: MACRO db \2 ENDM +TX_ASM: MACRO + db $08 + ENDM + ; Predef macro. add_predef: MACRO \1Predef:: -- cgit v1.3.1-sl0p From f702fc7840e30f00c840ce619a1ea15d763438de Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 4 Jul 2015 00:44:12 -0500 Subject: Start using text predef macros also sprite direction constants --- data/hidden_objects.asm | 10 ++--- engine/game_corner_slots.asm | 6 +-- engine/game_corner_slots2.asm | 4 +- engine/hidden_object_functions14.asm | 14 +++--- engine/hidden_object_functions17.asm | 33 ++++++-------- engine/hidden_object_functions18.asm | 86 ++++++++++++++++++++---------------- engine/hidden_object_functions3.asm | 51 ++++++++++++++------- engine/hidden_object_functions7.asm | 38 +++++++--------- engine/menu/bills_pc.asm | 11 ++--- engine/overworld/card_key.asm | 4 +- engine/overworld/cut.asm | 16 +++---- engine/overworld/hidden_items.asm | 7 ++- engine/overworld/movement.asm | 36 +++++++-------- home.asm | 18 ++++---- home/overworld.asm | 6 +-- macros.asm | 2 +- main.asm | 4 +- scripts/battlecenterm.asm | 4 +- scripts/billshouse.asm | 7 +-- scripts/copycatshouse2f.asm | 6 +-- scripts/mansion1.asm | 2 +- scripts/mansion2.asm | 2 +- scripts/mansion3.asm | 2 +- scripts/mansion4.asm | 2 +- scripts/oakslab.asm | 7 +-- scripts/pallettown.asm | 2 +- scripts/pokemontower7.asm | 2 +- scripts/redshouse1f.asm | 6 +-- scripts/route11gateupstairs.asm | 6 +-- scripts/route12gateupstairs.asm | 16 +++---- scripts/route15gateupstairs.asm | 2 +- scripts/route16gateupstairs.asm | 4 +- scripts/route18gateupstairs.asm | 4 +- scripts/route22.asm | 14 +++--- scripts/safarizoneentrance.asm | 4 +- scripts/vermilioncity.asm | 6 +-- 36 files changed, 225 insertions(+), 219 deletions(-) (limited to 'macros.asm') diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm index 74d053bb..0e36dbc4 100755 --- a/data/hidden_objects.asm +++ b/data/hidden_objects.asm @@ -233,10 +233,10 @@ ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93) ViridianMartHiddenObjects: ; 46ba0 (11:6ba0) db $FF ViridianSchoolHiddenObjects: ; 46ba1 (11:6ba1) - db $04,$03,$20 ; ViridianSchoolNotebook + db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1 db Bank(PrintNotebookText) dw PrintNotebookText - db $00,$03,$21 ; ViridianSchoolBlackboard + db $00,$03,(ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1 db BANK(PrintBlackboardLinkCableText) dw PrintBlackboardLinkCableText db $FF @@ -743,13 +743,13 @@ LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2) dw PrintMagazinesText db $FF CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5) - db $00,$03,$34 ; LinkCableHelp + db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1 db BANK(PrintBlackboardLinkCableText) dw PrintBlackboardLinkCableText - db $00,$04,$34 ; LinkCableHelp + db $00,$04,(LinkCableHelp_id - TextPredefs) / 2 + 1 db BANK(PrintBlackboardLinkCableText) dw PrintBlackboardLinkCableText - db $04,$03,$35 ; TMNotebook + db $04,$03,(TMNotebook_id - TextPredefs) / 2 + 1 db Bank(PrintNotebookText) dw PrintNotebookText db $FF diff --git a/engine/game_corner_slots.asm b/engine/game_corner_slots.asm index 52f61daf..01d42d21 100755 --- a/engine/game_corner_slots.asm +++ b/engine/game_corner_slots.asm @@ -27,13 +27,13 @@ StartSlotMachine: ; 37e2d (d:7e2d) call PromptUserToPlaySlots ret .printOutOfOrder - ld a, $28 + tx_pre_id GameCornerOutOfOrderText jr .printText .printOutToLunch - ld a, $29 + tx_pre_id GameCornerOutToLunchText jr .printText .printSomeonesKeys - ld a, $2a + tx_pre_id GameCornerSomeonesKeysText .printText push af call EnableAutoTextBoxDrawing diff --git a/engine/game_corner_slots2.asm b/engine/game_corner_slots2.asm index 66e51237..850b1f99 100755 --- a/engine/game_corner_slots2.asm +++ b/engine/game_corner_slots2.asm @@ -6,13 +6,13 @@ AbleToPlaySlotsCheck ; 2ff09 (b:7f09) predef IsItemInBag_ ; IsItemInBag_ ld a, b and a - ld b, $33 ; GameCornerCoinCaseText + ld b, (GameCornerCoinCaseText_id - TextPredefs) / 2 + 1 jr z, .printCoinCaseRequired ld hl, wPlayerCoins ld a, [hli] or [hl] jr nz, .done ; able to play - ld b, $32 ; GameCornerNoCoinsText + ld b, (GameCornerNoCoinsText_id - TextPredefs) / 2 + 1 .printCoinCaseRequired call EnableAutoTextBoxDrawing ld a, b diff --git a/engine/hidden_object_functions14.asm b/engine/hidden_object_functions14.asm index 5b97b815..e0ed973d 100755 --- a/engine/hidden_object_functions14.asm +++ b/engine/hidden_object_functions14.asm @@ -66,8 +66,7 @@ ViridianSchoolNotebookText4: ; 52a03 (14:6a03) PrintFightingDojoText2: ; 52a08 (14:6a08) call EnableAutoTextBoxDrawing - ld a, $37 - jp PrintPredefTextID + tx_pre_jump FightingDojoText_52a10 FightingDojoText_52a10: ; 52a10 (14:6a10) TX_FAR _FightingDojoText_52a10 @@ -75,8 +74,7 @@ FightingDojoText_52a10: ; 52a10 (14:6a10) PrintFightingDojoText3: ; 52a15 (14:6a15) call EnableAutoTextBoxDrawing - ld a, $38 - jp PrintPredefTextID + tx_pre_jump FightingDojoText_52a1d FightingDojoText_52a1d: ; 52a1d (14:6a1d) TX_FAR _FightingDojoText_52a1d @@ -84,8 +82,7 @@ FightingDojoText_52a1d: ; 52a1d (14:6a1d) PrintFightingDojoText: ; 52a22 (14:6a22) call EnableAutoTextBoxDrawing - ld a, $36 - jp PrintPredefTextID + tx_pre_jump FightingDojoText FightingDojoText: ; 52a2a (14:6a2a) TX_FAR _FightingDojoText @@ -93,11 +90,10 @@ FightingDojoText: ; 52a2a (14:6a2a) PrintIndigoPlateauHQText: ; 52a2f (14:6a2f) ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing - ld a, $27 - jp PrintPredefTextID + tx_pre_jump IndigoPlateauHQText IndigoPlateauHQText: ; 52a3d (14:6a3d) TX_FAR _IndigoPlateauHQText diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index b7b2fa00..46140927 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -1,7 +1,6 @@ PrintRedsNESText: ; 5db79 (17:5b79) call EnableAutoTextBoxDrawing - ld a, $4 ; RedBedroomSNESText - jp PrintPredefTextID + tx_pre_jump RedBedroomSNESText RedBedroomSNESText: ; 5db81 (17:5b81) TX_FAR _RedBedroomSNESText @@ -9,19 +8,17 @@ RedBedroomSNESText: ; 5db81 (17:5b81) OpenRedsPC: ; 5db86 (17:5b86) call EnableAutoTextBoxDrawing - ld a, $3 - jp PrintPredefTextID + tx_pre_jump RedBedroomPCText -RedBedroomPC: ; 5db8e (17:5b8e) +RedBedroomPCText: ; 5db8e (17:5b8e) db $fc ; FuncTX_ItemStoragePC Route15GateLeftBinoculars: ; 5db8f (17:5b8f) ld a, [wSpriteStateData1 + 9] - cp $4 ; i + cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing - ld a, $a ; text id Route15UpstairsBinocularsText - call PrintPredefTextID + tx_pre Route15UpstairsBinocularsText ld a, ARTICUNO ld [wcf91], a call PlayCry @@ -36,8 +33,7 @@ AerodactylFossil: ; 5dbad (17:5bad) ld [wcf91], a call DisplayMonFrontSpriteInBox call EnableAutoTextBoxDrawing - ld a, $9 - call PrintPredefTextID + tx_pre AerodactylFossilText ret AerodactylFossilText: ; 5dbbe (17:5bbe) @@ -49,8 +45,7 @@ KabutopsFossil: ; 5bdc3 (17:5bc3) ld [wcf91], a call DisplayMonFrontSpriteInBox call EnableAutoTextBoxDrawing - ld a, $b - call PrintPredefTextID + tx_pre KabutopsFossilText ret KabutopsFossilText: ; 5dbd4 (17:5bd4) @@ -307,8 +302,7 @@ ViridianBlackboardFrozenText: ; 5ddea (17:5dea) PrintTrashText: ; 5ddef (17:5def) call EnableAutoTextBoxDrawing - ld a, $26 - jp PrintPredefTextID + tx_pre_jump VermilionGymTrashText VermilionGymTrashText: ; 5ddf7 (17:5df7) TX_FAR _VermilionGymTrashText @@ -324,8 +318,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) bit 0, a jr z, .ok - ld a, $26 ; DisplayTextID $26 = VermilionGymTrashText (nothing in the trash) - jp PrintPredefTextID + tx_pre_jump VermilionGymTrashText .ok bit 1, a @@ -337,7 +330,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) cp b jr z, .openFirstLock - ld a, $26 ; DisplayTextID $26 = VermilionGymTrashText (nothing in the trash) + tx_pre_id VermilionGymTrashText jr .done .openFirstLock @@ -375,7 +368,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) and $f ld [wd744], a - ld a, $3b ; DisplayTextID $3b = VermilionGymTrashSuccesText1 (first lock opened!) + tx_pre_id VermilionGymTrashSuccesText1 jr .done .trySecondLock @@ -393,7 +386,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) and $e ld [wd743], a - ld a, $3e ; DisplayTextID $3e = VermilionGymTrashFailText (locks reset!) + tx_pre_id VermilionGymTrashFailText jr .done .openSecondLock @@ -403,7 +396,7 @@ GymTrashScript: ; 5ddfc (17:5dfc) ld hl, wd126 set 6, [hl] - ld a, $3d ; DisplayTextID $3d = VermilionGymTrashSuccesText3 (2nd lock opened!) + tx_pre_id VermilionGymTrashSuccesText3 .done jp PrintPredefTextID diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm index 44be4c31..e293b0a0 100755 --- a/engine/hidden_object_functions18.asm +++ b/engine/hidden_object_functions18.asm @@ -1,31 +1,31 @@ GymStatues: ; 62419 (18:6419) -; if in a gym and have the corresponding badge, a = $D and jp PrintPredefTextID -; if in a gym and don’t have the corresponding badge, a = $C and jp PrintPredefTextID +; if in a gym and have the corresponding badge, a = GymStatueText2_id and jp PrintPredefTextID +; if in a gym and don’t have the corresponding badge, a = GymStatueText1_id and jp PrintPredefTextID ; else ret call EnableAutoTextBoxDrawing ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz ld hl, .BadgeFlags ld a, [W_CURMAP] ld b, a -.asm_62429 +.loop ld a, [hli] cp $ff ret z cp b - jr z, .asm_62433 + jr z, .match inc hl - jr .asm_62429 -.asm_62433 + jr .loop +.match ld b, [hl] ld a, [wd72a] and b cp b - ld a, $d - jr z, .asm_6243f - ld a, $c -.asm_6243f + tx_pre_id GymStatueText2 + jr z, .haveBadge + tx_pre_id GymStatueText1 +.haveBadge jp PrintPredefTextID .BadgeFlags: ; 62442 (18:6442) @@ -49,41 +49,53 @@ GymStatueText2: ; 62458 (18:6458) PrintBenchGuyText: ; 6245d (18:645d) call EnableAutoTextBoxDrawing - ld hl, PokeCenterMapIDList + ld hl, BenchGuyTextPointers ld a, [W_CURMAP] ld b, a -.asm_62467 +.loop ld a, [hli] cp $ff ret z cp b - jr z, .asm_62472 + jr z, .match inc hl inc hl - jr .asm_62467 -.asm_62472 + jr .loop +.match ld a, [hli] ld b, a ld a, [wSpriteStateData1 + 9] cp b - jr nz, .asm_62467 + jr nz, .loop ; player isn't facing left at the bench guy ld a, [hl] jp PrintPredefTextID -; format: db map id, 08, text id of PredefTextIDPointerTable -PokeCenterMapIDList: ; 6247e (18:647e) - db VIRIDIAN_POKECENTER,$08,$0F - db PEWTER_POKECENTER,$08,$10 - db CERULEAN_POKECENTER,$08,$11 - db LAVENDER_POKECENTER,$08,$12 - db VERMILION_POKECENTER,$08,$13 - db CELADON_POKECENTER,$08,$14 - db CELADON_HOTEL,$08,$15 - db FUCHSIA_POKECENTER,$08,$16 - db CINNABAR_POKECENTER,$08,$17 - db SAFFRON_POKECENTER,$08,$18 - db MT_MOON_POKECENTER,$08,$19 - db ROCK_TUNNEL_POKECENTER,$08,$1A +; format: db map id, player sprite facing direction, text id of PredefTextIDPointerTable +BenchGuyTextPointers: ; 6247e (18:647e) + db VIRIDIAN_POKECENTER, SPRITE_FACING_LEFT + db (ViridianCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db PEWTER_POKECENTER, SPRITE_FACING_LEFT + db (PewterCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db CERULEAN_POKECENTER, SPRITE_FACING_LEFT + db (CeruleanCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db LAVENDER_POKECENTER, SPRITE_FACING_LEFT + db (LavenderCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db VERMILION_POKECENTER, SPRITE_FACING_LEFT + db (VermilionCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db CELADON_POKECENTER, SPRITE_FACING_LEFT + db (CeladonCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db CELADON_HOTEL, SPRITE_FACING_LEFT + db (CeladonCityHotelText_id - TextPredefs) / 2 + 1 + db FUCHSIA_POKECENTER, SPRITE_FACING_LEFT + db (FuchsiaCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db CINNABAR_POKECENTER, SPRITE_FACING_LEFT + db (CinnabarIslandPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db SAFFRON_POKECENTER, SPRITE_FACING_LEFT + db (SaffronCityPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db MT_MOON_POKECENTER, SPRITE_FACING_LEFT + db (MtMoonPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 + db ROCK_TUNNEL_POKECENTER,SPRITE_FACING_LEFT + db (RockTunnelPokecenterBenchGuyText_id - TextPredefs) / 2 + 1 db $FF ViridianCityPokecenterBenchGuyText: ; 624a3 (18:64a3) @@ -163,13 +175,12 @@ CeladonCityHotelText: ; 62502 (18:6502) ret -TerminatorText_62508: ; 62508 (18:6508) +UnusedPredefText: ; 62508 (18:6508) db "@" PrintBookcaseText: ; 6509 (18:6509) call EnableAutoTextBoxDrawing - ld a, $e ; BookcaseText - jp PrintPredefTextID + tx_pre_jump BookcaseText BookcaseText: ; 62511 (18:6511) TX_FAR _BookcaseText @@ -177,13 +188,12 @@ BookcaseText: ; 62511 (18:6511) OpenPokemonCenterPC: ; 62516 (18:6516) ld a, [wSpriteStateData1 + 9] - cp $4 ; check to see if player is facing up + cp SPRITE_FACING_UP ; check to see if player is facing up ret nz call EnableAutoTextBoxDrawing ld a, $1 ld [wAutoTextBoxDrawingControl], a - ld a, $1f ; PredefText1f - jp PrintPredefTextID + tx_pre_jump PokemonCenterPCText -PredefText1f: ; 62529 (18:6529) +PokemonCenterPCText: ; 62529 (18:6529) db $F9 ; FuncTX_PokemonCenterPC diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index 23254c11..c40073cb 100755 --- a/engine/hidden_object_functions3.asm +++ b/engine/hidden_object_functions3.asm @@ -40,23 +40,40 @@ PrintBookshelfText: ; fb50 (3:7b50) ; format: db tileset id, bookshelf tile id, text id BookshelfTileIDs: ; fb8b (3:7b8b) - db PLATEAU, $30, $3A - db HOUSE, $3D, $3F - db HOUSE, $1E, $40 - db MANSION, $32, $40 - db REDS_HOUSE_1, $32, $40 - db LAB, $28, $40 - db LOBBY, $16, $41 - db GYM, $1D, $40 - db DOJO, $1D, $40 - db GATE, $22, $40 - db MART, $54, $42 - db MART, $55, $42 - db POKECENTER, $54, $42 - db POKECENTER, $55, $42 - db LOBBY, $50, $42 - db LOBBY, $52, $42 - db SHIP, $36, $40 + db PLATEAU, $30 + db (IndigoPlateauStatues_id - TextPredefs) / 2 + 1 + db HOUSE, $3D + db (TownMapText_id - TextPredefs) / 2 + 1 + db HOUSE, $1E + db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db MANSION, $32 + db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db REDS_HOUSE_1, $32 + db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db LAB, $28 + db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db LOBBY, $16 + db (ElevatorText_id - TextPredefs) / 2 + 1 + db GYM, $1D + db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db DOJO, $1D + db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db GATE, $22 + db (BookOrSculptureText_id - TextPredefs) / 2 + 1 + db MART, $54 + db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db MART, $55 + db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db POKECENTER, $54 + db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db POKECENTER, $55 + db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db LOBBY, $50 + db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db LOBBY, $52 + db (PokemonStuffText_id - TextPredefs) / 2 + 1 + db SHIP, $36 + db (BookOrSculptureText_id - TextPredefs) / 2 + 1 db $FF IndigoPlateauStatues: ; fbbf (3:7bbf) diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index b06f11ca..f29b0925 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -1,7 +1,6 @@ PrintNewBikeText: ; 1e94b (7:694b) call EnableAutoTextBoxDrawing - ld a, $39 - jp PrintPredefTextID + tx_pre_jump NewBicycleText NewBicycleText: ; 1e953 (7:6953) TX_FAR _NewBicycleText @@ -9,8 +8,7 @@ NewBicycleText: ; 1e953 (7:6953) DisplayOakLabLeftPoster: ; 1e958 (7:6958) call EnableAutoTextBoxDrawing - ld a, $05 ; PushStartText - jp PrintPredefTextID + tx_pre_jump PushStartText PushStartText: ; 1e960 (7:6960) TX_FAR _PushStartText @@ -23,10 +21,10 @@ DisplayOakLabRightPoster: ; 1e965 (7:6965) call CountSetBits ld a, [wd11e] cp $2 - ld a, $6 ; SaveOptionText - jr c, .asm_1e97b - ld a, $7 ; StrengthsAndWeaknessesText -.asm_1e97b + tx_pre_id SaveOptionText + jr c, .ownThreeOrMoreMon + tx_pre_id StrengthsAndWeaknessesText +.ownThreeOrMoreMon jp PrintPredefTextID SaveOptionText: ; 1e97e (7:697e) @@ -120,11 +118,10 @@ GameOverText: ; 1ea12 (7:6a12) PrintCinnabarQuiz: ; 1ea17 (7:6a17) ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing - ld a, $31 - jp PrintPredefTextID + tx_pre_jump CinnabarGymQuiz CinnabarGymQuiz: ; 1ea25 (7:6a25) TX_ASM @@ -309,8 +306,7 @@ CinnabarGymGateCoords: ; 1eb48 (7:6b48) PrintMagazinesText: ; 1eb60 (7:6b60) call EnableAutoTextBoxDrawing - ld a, $30 - call PrintPredefTextID + tx_pre MagazinesText ret MagazinesText: ; 1eb69 (7:6b69) @@ -320,7 +316,7 @@ MagazinesText: ; 1eb69 (7:6b69) BillsHousePC: ; 1eb6e (7:6b6e) call EnableAutoTextBoxDrawing ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz ld a, [wd7f2] bit 7, a @@ -330,13 +326,11 @@ BillsHousePC: ; 1eb6e (7:6b6e) bit 6, a jr nz, .asm_1eb8b .asm_1eb86 - ld a, $2d - jp PrintPredefTextID + tx_pre_jump BillsHouseMonitorText .asm_1eb8b ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, $2e - call PrintPredefTextID + tx_pre BillsHouseInitiatedText ld c, 32 call DelayFrames ld a, (SFX_02_3c - SFX_Headers_02) / 3 @@ -364,8 +358,7 @@ BillsHousePC: ; 1eb6e (7:6b6e) .asm_1ebd2 ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, $2f - call PrintPredefTextID + tx_pre BillsHousePokemonList ret BillsHouseMonitorText: ; 1ebdd (7:6bdd) @@ -459,11 +452,10 @@ BillsHousePokemonListText2: ; 1ecaa (7:6caa) DisplayOakLabEmailText: ; 1ecaf (7:6caf) ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing - ld a, $8 ; OakLabEmailText - jp PrintPredefTextID + tx_pre_jump OakLabEmailText OakLabEmailText: ; 1ecbd (7:6cbd) TX_FAR _OakLabEmailText diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 3018529a..c9dd41b1 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -523,8 +523,7 @@ CableClubLeftGameboy:: ; 5824 (8:5825) .asm_2183a ld [wLinkState], a call EnableAutoTextBoxDrawing - ld a, $22 ; JustAMomentText - jp PrintPredefTextID + tx_pre_jump JustAMomentText CableClubRightGameboy:: ; 5845 (8:5845) ld a, [hSerialConnectionStatus] @@ -541,8 +540,7 @@ CableClubRightGameboy:: ; 5845 (8:5845) .asm_2185a ld [wLinkState], a call EnableAutoTextBoxDrawing - ld a, $22 ; JustAMomentText - jp PrintPredefTextID + tx_pre_jump JustAMomentText JustAMomentText:: ; 21865 (8:5865) TX_FAR _JustAMomentText @@ -552,9 +550,8 @@ JustAMomentText:: ; 21865 (8:5865) cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing - ld a, $23 - jp PrintPredefTextID + tx_pre_jump OpenBillsPCText -PredefText23:: ; 21878 (8:5878) +OpenBillsPCText:: ; 21878 (8:5878) db $FD ; FuncTX_BillsPC diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm index c4df0d51..94c1868c 100755 --- a/engine/overworld/card_key.asm +++ b/engine/overworld/card_key.asm @@ -27,7 +27,7 @@ PrintCardKeyText: ; 52673 (14:6673) jr z, .noCardKey call GetCoordsInFrontOfPlayer push de - ld a, $1 + tx_pre_id CardKeySuccessText ld [H_DOWNARROWBLINKCNT2], a call PrintPredefTextID pop de @@ -54,7 +54,7 @@ PrintCardKeyText: ; 52673 (14:6673) ld a, (SFX_1f_57 - SFX_Headers_1f) / 3 jp PlaySound .noCardKey - ld a, $2 + tx_pre_id CardKeyFailText ld [H_DOWNARROWBLINKCNT2], a jp PrintPredefTextID diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 215bf103..26a65b5b 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -185,26 +185,26 @@ Func_f09f: ; f09f (3:709f) add hl, bc ld a, [wSpriteStateData1 + 9] and a - jr z, .asm_f0c7 - cp $4 - jr z, .asm_f0cf - cp $8 - jr z, .asm_f0d7 + jr z, .down + cp SPRITE_FACING_UP + jr z, .up + cp SPRITE_FACING_LEFT + jr z, .left ld a, [W_XBLOCKCOORD] and a jr z, .asm_f0e0 jr .asm_f0ec -.asm_f0c7 +.down ld a, [W_YBLOCKCOORD] and a jr z, .asm_f0e0 jr .asm_f0df -.asm_f0cf +.up ld a, [W_YBLOCKCOORD] and a jr z, .asm_f0e1 jr .asm_f0e0 -.asm_f0d7 +.left ld a, [W_XBLOCKCOORD] and a jr z, .asm_f0e6 diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index afe9e3c3..868f118f 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -16,8 +16,7 @@ HiddenItems: ; 76688 (1d:6688) ld a, [wWhichTrade] ; item ID ld [wd11e], a call GetItemName - ld a, $24 - jp PrintPredefTextID + tx_pre_jump FoundHiddenItemText INCLUDE "data/hidden_item_coords.asm" @@ -112,10 +111,10 @@ HiddenCoins: ; 76799 (1d:6799) ld a, [wPlayerCoins + 1] cp $99 jr nz, .RoomInCoinCase - ld a, $2c + tx_pre_id DroppedHiddenCoinsText jr .done .RoomInCoinCase - ld a, $2b + tx_pre_id FoundHiddenCoinsText .done jp PrintPredefTextID diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 75b4f3ea..dac03f3a 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -27,34 +27,34 @@ UpdatePlayerSprite: ; 4e31 (1:4e31) jr nz, .asm_4e90 ld a, [wd528] bit 2, a - jr z, .asm_4e65 - xor a - jr .asm_4e86 -.asm_4e65 + jr z, .notDown + xor a ; ld a, SPRITE_FACING_DOWN + jr .done +.notDown bit 3, a - jr z, .asm_4e6d - ld a, $4 - jr .asm_4e86 -.asm_4e6d + jr z, .notUp + ld a, SPRITE_FACING_UP + jr .done +.notUp bit 1, a - jr z, .asm_4e75 - ld a, $8 - jr .asm_4e86 -.asm_4e75 + jr z, .notLeft + ld a, SPRITE_FACING_LEFT + jr .done +.notLeft bit 0, a - jr z, .asm_4e7d - ld a, $c - jr .asm_4e86 -.asm_4e7d + jr z, .notRight + ld a, SPRITE_FACING_RIGHT + jr .done +.notRight xor a ld [wSpriteStateData1 + 7], a ld [wSpriteStateData1 + 8], a jr .asm_4eab -.asm_4e86 +.done ld [wSpriteStateData1 + 9], a ld a, [wFontLoaded] bit 0, a - jr nz, .asm_4e7d + jr nz, .notRight .asm_4e90 ld a, [wd736] bit 7, a diff --git a/home.asm b/home.asm index f8d7752f..06a0aec3 100644 --- a/home.asm +++ b/home.asm @@ -4679,7 +4679,7 @@ SetMapTextPointer:: ; 3f0f (0:3f0f) TextPredefs:: add_tx_pre CardKeySuccessText ; 01 add_tx_pre CardKeyFailText ; 02 - add_tx_pre RedBedroomPC ; 03 + add_tx_pre RedBedroomPCText ; 03 add_tx_pre RedBedroomSNESText ; 04 add_tx_pre PushStartText ; 05 add_tx_pre SaveOptionText ; 06 @@ -4703,17 +4703,17 @@ TextPredefs:: add_tx_pre SaffronCityPokecenterBenchGuyText ; 18 add_tx_pre MtMoonPokecenterBenchGuyText ; 19 add_tx_pre RockTunnelPokecenterBenchGuyText ; 1A - add_tx_pre UnusedBenchGuyText1 ; 1B - add_tx_pre UnusedBenchGuyText2 ; 1C - add_tx_pre UnusedBenchGuyText3 ; 1D - add_tx_pre TerminatorText_62508 ; 1E - add_tx_pre PredefText1f ; 1F + add_tx_pre UnusedBenchGuyText1 ; 1B XXX unused + add_tx_pre UnusedBenchGuyText2 ; 1C XXX unused + add_tx_pre UnusedBenchGuyText3 ; 1D XXX unused + add_tx_pre UnusedPredefText ; 1E XXX unused + add_tx_pre PokemonCenterPCText ; 1F add_tx_pre ViridianSchoolNotebook ; 20 add_tx_pre ViridianSchoolBlackboard ; 21 add_tx_pre JustAMomentText ; 22 - add_tx_pre PredefText23 ; 23 + add_tx_pre OpenBillsPCText ; 23 add_tx_pre FoundHiddenItemText ; 24 - add_tx_pre HiddenItemBagFullText ; 25 + add_tx_pre HiddenItemBagFullText ; 25 XXX unused add_tx_pre VermilionGymTrashText ; 26 add_tx_pre IndigoPlateauHQText ; 27 add_tx_pre GameCornerOutOfOrderText ; 28 @@ -4736,7 +4736,7 @@ TextPredefs:: add_tx_pre NewBicycleText ; 39 add_tx_pre IndigoPlateauStatues ; 3A add_tx_pre VermilionGymTrashSuccesText1 ; 3B - add_tx_pre VermilionGymTrashSuccesText2 ; 3C + add_tx_pre VermilionGymTrashSuccesText2 ; 3C XXX unused add_tx_pre VermilionGymTrashSuccesText3 ; 3D add_tx_pre VermilionGymTrashFailText ; 3E add_tx_pre TownMapText ; 3F diff --git a/home/overworld.asm b/home/overworld.asm index 4aea2102..0e62a932 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1120,7 +1120,7 @@ IsSpriteInFrontOfPlayer2:: ; 0b6d (0:0b6d) ld bc,$3c40 ; Y and X position of player sprite ld a,[wSpriteStateData1 + 9] ; direction the player is facing .checkIfPlayerFacingUp - cp a,$04 + cp SPRITE_FACING_UP jr nz,.checkIfPlayerFacingDown ; facing up ld a,b @@ -1129,7 +1129,7 @@ IsSpriteInFrontOfPlayer2:: ; 0b6d (0:0b6d) ld a,$08 jr .doneCheckingDirection .checkIfPlayerFacingDown - cp a,$00 + cp SPRITE_FACING_DOWN jr nz,.checkIfPlayerFacingRight ; facing down ld a,b @@ -1138,7 +1138,7 @@ IsSpriteInFrontOfPlayer2:: ; 0b6d (0:0b6d) ld a,$04 jr .doneCheckingDirection .checkIfPlayerFacingRight - cp a,$0c + cp SPRITE_FACING_RIGHT jr nz,.playerFacingLeft ; facing right ld a,c diff --git a/macros.asm b/macros.asm index a3ff2815..bf1b8a89 100644 --- a/macros.asm +++ b/macros.asm @@ -226,7 +226,7 @@ add_tx_pre: MACRO ENDM tx_pre_id: MACRO - ld a, (\1_id - TextPredefs) / 2 + ld a, (\1_id - TextPredefs) / 2 + 1 ENDM tx_pre: MACRO diff --git a/main.asm b/main.asm index 5ed4dacc..7372381a 100755 --- a/main.asm +++ b/main.asm @@ -2339,7 +2339,7 @@ _GetTileAndCoordsInFrontOfPlayer: ; c589 (3:4589) ld a, [W_XCOORD] ld e, a ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction - and a + and a ; cp SPRITE_FACING_DOWN jr nz, .notFacingDown ; facing down aCoord 8, 11 @@ -2378,7 +2378,7 @@ GetTileTwoStepsInFrontOfPlayer: ; c5be (3:45be) ld d, a ld e, [hl] ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction - and a + and a ; cp SPRITE_FACING_DOWN jr nz, .notFacingDown ; facing down ld hl, $ffdb diff --git a/scripts/battlecenterm.asm b/scripts/battlecenterm.asm index 997be7c1..dcb20d83 100755 --- a/scripts/battlecenterm.asm +++ b/scripts/battlecenterm.asm @@ -19,14 +19,14 @@ BattleCenterMScript: ; 4fd10 (13:7d10) ld [hli], a ld a, $a ld [hl], a - ld a, $8 + ld a, SPRITE_FACING_LEFT ld [wSpriteStateData1 + $19], a ld a, [$ffaa] cp $2 ret z ld a, $7 ld [wSpriteStateData2 + $15], a - ld a, $c + ld a, SPRITE_FACING_RIGHT ld [wSpriteStateData1 + $19], a ret diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index df608de3..1db6934a 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -17,11 +17,11 @@ BillsHouseScript0: ; 1e782 (7:6782) BillsHouseScript1: ; 1e783 (7:6783) ld a, [wSpriteStateData1 + 9] - and a + and a ; cp SPRITE_FACING_DOWN ld de, MovementData_1e79c - jr nz, .asm_1e78f + jr nz, .notDown ld de, MovementData_1e7a0 -.asm_1e78f +.notDown ld a, $1 ld [$ff8c], a call MoveSprite @@ -32,6 +32,7 @@ BillsHouseScript1: ; 1e783 (7:6783) MovementData_1e79c: ; 1e79c (7:679c) db $40,$40,$40,$FF +; make Bill walk around the player MovementData_1e7a0: ; 1e7a0 (7:67a0) db $C0,$40,$40,$80,$40,$FF diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm index 6a9c2236..51a633b1 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/copycatshouse2f.asm @@ -85,11 +85,11 @@ CopycatsHouse2FText6: ; 5ccfe (17:4cfe) CopycatsHouse2FText7: ; 5cd03 (17:4d03) TX_ASM ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ld hl, CopycatsHouse2FText_5cd1c - jr nz, .asm_399a4 + jr nz, .notUp ld hl, CopycatsHouse2FText_5cd17 -.asm_399a4 +.notUp call PrintText jp TextScriptEnd diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index e5c7eb0a..d658b425 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -48,7 +48,7 @@ Mansion1ReplaceBlock: ; 44310 (11:4310) Mansion1Script_Switches: ; 44316 (11:4316) ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz xor a ld [hJoyHeld], a diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 334753df..40827be1 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -44,7 +44,7 @@ Mansion2Script_5202f: ; 5202f (14:602f) Mansion2Script_Switches: ; 52037 (14:6037) ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz xor a ld [hJoyHeld], a diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index d7c0d6ef..dfecde99 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -75,7 +75,7 @@ Mansion3Script_5225b: ; 5225b (14:625b) Mansion3Script_Switches: ; 5227a (14:627a) ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz xor a ld [hJoyHeld], a diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index 4f1bd742..c23cb2d7 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -46,7 +46,7 @@ Mansion4Script_523cf: ; 523cf (14:63cf) Mansion4Script_Switches: ; 52420 (14:6420) ld a, [wSpriteStateData1 + 9] - cp $4 + cp SPRITE_FACING_UP ret nz xor a ld [hJoyHeld], a diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index ceb8a761..7c99d802 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -454,6 +454,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d) ld a, $12 ld [W_OAKSLABCURSCRIPT], a jr .done +; make the player keep facing the rival as he walks away .asm_1ce8c ld a, [wcf0f] cp $5 @@ -461,17 +462,17 @@ OaksLabScript14: ; 1ce6d (7:4e6d) ld a, [W_XCOORD] cp $4 jr nz, .asm_1cea1 - ld a, $c + ld a, SPRITE_FACING_RIGHT ld [wSpriteStateData1 + 9], a jr .done .asm_1cea1 - ld a, $8 + ld a, SPRITE_FACING_LEFT ld [wSpriteStateData1 + 9], a jr .done .asm_1cea8 cp $4 ret nz - xor a + xor a ; ld a, SPRITE_FACING_DOWN ld [wSpriteStateData1 + 9], a .done ret diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index c05b87c1..d625a7be 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -97,7 +97,7 @@ PalletTownScript3: ; 18f12 (6:4f12) ld a,[wd730] bit 0,a ret nz - xor a + xor a ; ld a, SPRITE_FACING_DOWN ld [wSpriteStateData1 + 9],a ld a,1 ld [wcf0d],a diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 4462fb78..ab96fd9b 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -69,7 +69,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86) ld a, HS_POKEMONTOWER_7_MR_FUJI ld [wcc4d], a predef HideObject - ld a, $4 + ld a, SPRITE_FACING_UP ld [wSpriteStateData1 + 9], a ld a, LAVENDER_HOUSE_1 ld [H_DOWNARROWBLINKCNT1], a diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index b630fffe..0f5251b8 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -52,11 +52,11 @@ MomHealText2: ; 481c1 (12:41c1) RedsHouse1FText2: ; 0x481c6 TV TX_ASM ld a,[wSpriteStateData1 + 9] - cp 4 + cp SPRITE_FACING_UP ld hl,TVWrongSideText - jr nz,.done ; if player is not facing up + jr nz,.notUp ld hl,StandByMeText -.done +.notUp call PrintText jp TextScriptEnd diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm index abea062c..eded4165 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/route11gateupstairs.asm @@ -50,8 +50,8 @@ Route11GateUpstairsText_494a3: ; 494a3 (12:54a3) Route11GateUpstairsText3: ; 494a8 (12:54a8) TX_ASM ld a, [wSpriteStateData1 + 9] - cp $4 - jp nz, Route12GateUpstairsScript_495c9 + cp SPRITE_FACING_UP + jp nz, GateUpstairsScript_PrintIfFacingUp ld a, [wd7d8] bit 7, a ; fought snorlax? ld hl, BinocularsSnorlaxText @@ -72,7 +72,7 @@ BinocularsNoSnorlaxText: Route11GateUpstairsText4: ; 494ce (12:54ce) TX_ASM ld hl, Route11GateUpstairsText_494d5 - jp Route12GateUpstairsScript_495c9 + jp GateUpstairsScript_PrintIfFacingUp Route11GateUpstairsText_494d5: ; 494d5 (12:54d5) TX_FAR _Route11GateUpstairsText_494d5 diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm index 6ec8cfe3..d4e8e983 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/route12gateupstairs.asm @@ -50,7 +50,7 @@ TM39NoRoomText: ; 495ac (12:55ac) Route12GateUpstairsText2: ; 495b1 (12:55b1) TX_ASM ld hl, Route12GateUpstairsText_495b8 - jp Route12GateUpstairsScript_495c9 + jp GateUpstairsScript_PrintIfFacingUp Route12GateUpstairsText_495b8: ; 495b8 (12:55b8) TX_FAR _Route12GateUpstairsText_495b8 @@ -59,21 +59,21 @@ Route12GateUpstairsText_495b8: ; 495b8 (12:55b8) Route12GateUpstairsText3: ; 495bd (12:55bd) TX_ASM ld hl, Route12GateUpstairsText_495c4 - jp Route12GateUpstairsScript_495c9 + jp GateUpstairsScript_PrintIfFacingUp Route12GateUpstairsText_495c4: ; 495c4 (12:55c4) TX_FAR _Route12GateUpstairsText_495c4 db "@" -Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9) +GateUpstairsScript_PrintIfFacingUp: ; 495c9 (12:55c9) ld a, [wSpriteStateData1 + 9] - cp $4 - jr z, .asm_495d4 + cp SPRITE_FACING_UP + jr z, .up ld a, $1 - jr .asm_495d8 -.asm_495d4 + jr .done +.up call PrintText xor a -.asm_495d8 +.done ld [wDoNotWaitForButtonPressAfterDisplayingText], a jp TextScriptEnd diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index 05bcbeea..8969fd74 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -39,7 +39,7 @@ Route15GateUpstairsText_4968c: ; 4968c (12:568c) Route15GateUpstairsText2: ; 49691 (12:5691) TX_ASM ld hl, Route15GateUpstairsText_49698 - jp Route12GateUpstairsScript_495c9 + jp GateUpstairsScript_PrintIfFacingUp Route15GateUpstairsText_49698: ; 49698 (12:5698) TX_FAR _Route15GateUpstairsText_49698 diff --git a/scripts/route16gateupstairs.asm b/scripts/route16gateupstairs.asm index 6027d57b..64b43e10 100755 --- a/scripts/route16gateupstairs.asm +++ b/scripts/route16gateupstairs.asm @@ -30,7 +30,7 @@ Route16GateUpstairsText_4982f: ; 4982f (12:582f) Route16GateUpstairsText3: ; 49834 (12:5834) TX_ASM ld hl, Route16GateUpstairsText_4983b - jp Route12GateUpstairsScript_495c9 + jp GateUpstairsScript_PrintIfFacingUp Route16GateUpstairsText_4983b: ; 4983b (12:583b) TX_FAR _Route16GateUpstairsText_4983b @@ -39,7 +39,7 @@ Route16GateUpstairsText_4983b: ; 4983b (12:583b) Route16GateUpstairsText4: ; 49840 (12:5840) TX_ASM ld hl, Route16GateUpstairsText_49847 - jp Route12GateUpstairsScript_495c9 + jp GateUpstairsScript_PrintIfFacingUp Route16GateUpstairsText_49847: ; 49847 (12:5847) TX_FAR _Route16GateUpstairsText_49847 diff --git a/scripts/route18gateupstairs.asm b/scripts/route18gateupstairs.asm index 7fc76eda..4e1014e0 100755 --- a/scripts/route18gateupstairs.asm +++ b/scripts/route18gateupstairs.asm @@ -16,7 +16,7 @@ Route18GateUpstairsText1: ; 4997e (12:597e) Route18GateUpstairsText2: ; 4998c (12:598c) TX_ASM ld hl, Route18GateUpstairsText_49993 - jp Route12GateUpstairsScript_495c9 + jp GateUpstairsScript_PrintIfFacingUp Route18GateUpstairsText_49993: ; 49993 (12:5993) TX_FAR _Route18GateUpstairsText_49993 @@ -25,7 +25,7 @@ Route18GateUpstairsText_49993: ; 49993 (12:5993) Route18GateUpstairsText3: ; 49998 (12:5998) TX_ASM ld hl, Route18GateUpstairsText_4999f - jp Route12GateUpstairsScript_495c9 + jp GateUpstairsScript_PrintIfFacingUp Route18GateUpstairsText_4999f: ; 4999f (12:599f) TX_FAR _Route18GateUpstairsText_4999f diff --git a/scripts/route22.asm b/scripts/route22.asm index 88f69bea..7d70924b 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -148,13 +148,13 @@ Route22Script2: ; 50fb5 (14:4fb5) cp $ff jp z, Route22Script_50ece ld a, [wSpriteStateData1 + 9] - and a - jr nz, .asm_50fc7 - ld a, $4 - jr .asm_50fc9 -.asm_50fc7 - ld a, $c -.asm_50fc9 + and a ; cp SPRITE_FACING_DOWN + jr nz, .notDown + ld a, SPRITE_FACING_UP + jr .done +.notDown + ld a, SPRITE_FACING_RIGHT +.done ld [$ff8d], a ld a, $1 ld [$ff8c], a diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index 6b9029f6..b64868e5 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -24,7 +24,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld [wJoyIgnore], a xor a ld [hJoyHeld], a - ld a, $c + ld a, SPRITE_FACING_RIGHT ld [wSpriteStateData1 + 9], a ld a, [wWhichTrade] cp $1 @@ -247,7 +247,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) .asm_7539c ld hl, .SafariZoneEntranceText_753c0 call PrintText - ld a, $4 + ld a, SPRITE_FACING_UP ld [wSpriteStateData1 + 9], a ld a, $40 ld c, $1 diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 9fd05776..0f71a4d0 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -40,7 +40,7 @@ VermilionCityScriptPointers: ; 197dc (6:57dc) VermilionCityScript0: ; 197e6 (6:57e6) ld a, [wSpriteStateData1 + 9] - and a + and a ; cp SPRITE_FACING_DOWN ret nz ld hl, CoordsData_19823 call ArePlayerCoordsInArray @@ -54,7 +54,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) ld a, [wd803] bit 2, a jr nz, .asm_19810 - ld b, $3f + ld b, S_S__TICKET predef IsItemInBag_ ld a, b and a @@ -162,7 +162,7 @@ VermilionCityText3: ; 198b1 (6:58b1) bit 2, a jr nz, .asm_198f6 ld a, [wSpriteStateData1 + 9] - cp $c + cp SPRITE_FACING_RIGHT jr z, .asm_198c8 ld hl, VermilionCityCoords1 call ArePlayerCoordsInArray -- cgit v1.3.1-sl0p From b85d7c65f35e93534a871ed34b1950daf59ab189 Mon Sep 17 00:00:00 2001 From: dannye Date: Fri, 17 Jul 2015 11:20:35 -0500 Subject: Enumerate map constants closes https://github.com/iimarckus/pokered/issues/86 --- constants/map_constants.asm | 500 ++++++++++++++++++++++---------------------- data/town_map_entries.asm | 120 +++++------ macros.asm | 2 +- 3 files changed, 312 insertions(+), 310 deletions(-) (limited to 'macros.asm') diff --git a/constants/map_constants.asm b/constants/map_constants.asm index c880d3f4..3bd79f3c 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -1,251 +1,253 @@ -PALLET_TOWN EQU $00 -VIRIDIAN_CITY EQU $01 -PEWTER_CITY EQU $02 -CERULEAN_CITY EQU $03 -LAVENDER_TOWN EQU $04 -VERMILION_CITY EQU $05 -CELADON_CITY EQU $06 -FUCHSIA_CITY EQU $07 -CINNABAR_ISLAND EQU $08 -INDIGO_PLATEAU EQU $09 -SAFFRON_CITY EQU $0A -; unused EQU $0B -ROUTE_1 EQU $0C -ROUTE_2 EQU $0D -ROUTE_3 EQU $0E -ROUTE_4 EQU $0F -ROUTE_5 EQU $10 -ROUTE_6 EQU $11 -ROUTE_7 EQU $12 -ROUTE_8 EQU $13 -ROUTE_9 EQU $14 -ROUTE_10 EQU $15 -ROUTE_11 EQU $16 -ROUTE_12 EQU $17 -ROUTE_13 EQU $18 -ROUTE_14 EQU $19 -ROUTE_15 EQU $1A -ROUTE_16 EQU $1B -ROUTE_17 EQU $1C -ROUTE_18 EQU $1D -ROUTE_19 EQU $1E -ROUTE_20 EQU $1F -ROUTE_21 EQU $20 -ROUTE_22 EQU $21 -ROUTE_23 EQU $22 -ROUTE_24 EQU $23 -ROUTE_25 EQU $24 -REDS_HOUSE_1F EQU $25 -REDS_HOUSE_2F EQU $26 -BLUES_HOUSE EQU $27 -OAKS_LAB EQU $28 -VIRIDIAN_POKECENTER EQU $29 -VIRIDIAN_MART EQU $2A -VIRIDIAN_SCHOOL EQU $2B -VIRIDIAN_HOUSE EQU $2C -VIRIDIAN_GYM EQU $2D -DIGLETTS_CAVE_EXIT EQU $2E -VIRIDIAN_FOREST_EXIT EQU $2F -ROUTE_2_HOUSE EQU $30 -ROUTE_2_GATE EQU $31 -VIRIDIAN_FOREST_ENTRANCE EQU $32 -VIRIDIAN_FOREST EQU $33 -MUSEUM_1F EQU $34 -MUSEUM_2F EQU $35 -PEWTER_GYM EQU $36 -PEWTER_HOUSE_1 EQU $37 -PEWTER_MART EQU $38 -PEWTER_HOUSE_2 EQU $39 -PEWTER_POKECENTER EQU $3A -MT_MOON_1 EQU $3B -MT_MOON_2 EQU $3C -MT_MOON_3 EQU $3D -TRASHED_HOUSE EQU $3E -CERULEAN_HOUSE EQU $3F -CERULEAN_POKECENTER EQU $40 -CERULEAN_GYM EQU $41 -BIKE_SHOP EQU $42 -CERULEAN_MART EQU $43 -MT_MOON_POKECENTER EQU $44 -;copy of TRASHED_HOUSE EQU $45 -ROUTE_5_GATE EQU $46 -PATH_ENTRANCE_ROUTE_5 EQU $47 -DAYCAREM EQU $48 -ROUTE_6_GATE EQU $49 -PATH_ENTRANCE_ROUTE_6 EQU $4A -;copy of PATH_ENTRANCE_ROUTE_6 EQU $4B -ROUTE_7_GATE EQU $4C -PATH_ENTRANCE_ROUTE_7 EQU $4D -;copy of PATH_ENTRANCE_ROUTE_7 EQU $4E -ROUTE_8_GATE EQU $4F -PATH_ENTRANCE_ROUTE_8 EQU $50 -ROCK_TUNNEL_POKECENTER EQU $51 -ROCK_TUNNEL_1 EQU $52 -POWER_PLANT EQU $53 -ROUTE_11_GATE_1F EQU $54 -DIGLETTS_CAVE_ENTRANCE EQU $55 -ROUTE_11_GATE_2F EQU $56 -ROUTE_12_GATE_1F EQU $57 -BILLS_HOUSE EQU $58 -VERMILION_POKECENTER EQU $59 -POKEMON_FAN_CLUB EQU $5A -VERMILION_MART EQU $5B -VERMILION_GYM EQU $5C -VERMILION_HOUSE_1 EQU $5D -VERMILION_DOCK EQU $5E -SS_ANNE_1 EQU $5F -SS_ANNE_2 EQU $60 -SS_ANNE_3 EQU $61 -SS_ANNE_4 EQU $62 -SS_ANNE_5 EQU $63 -SS_ANNE_6 EQU $64 -SS_ANNE_7 EQU $65 -SS_ANNE_8 EQU $66 -SS_ANNE_9 EQU $67 -SS_ANNE_10 EQU $68 -;EQU $69 -;EQU $6A -;EQU $6B -VICTORY_ROAD_1 EQU $6C -;EQU $6D -;EQU $6E -;EQU $6F -;EQU $70 -LANCES_ROOM EQU $71 -;EQU $72 -;EQU $73 -;EQU $74 -;EQU $75 -HALL_OF_FAME EQU $76 -UNDERGROUND_PATH_NS EQU $77 -CHAMPIONS_ROOM EQU $78 -UNDERGROUND_PATH_WE EQU $79 -CELADON_MART_1 EQU $7A -CELADON_MART_2 EQU $7B -CELADON_MART_3 EQU $7C -CELADON_MART_4 EQU $7D -CELADON_MART_ROOF EQU $7E -CELADON_MART_ELEVATOR EQU $7F -CELADON_MANSION_1 EQU $80 -CELADON_MANSION_2 EQU $81 -CELADON_MANSION_3 EQU $82 -CELADON_MANSION_4 EQU $83 -CELADON_MANSION_5 EQU $84 -CELADON_POKECENTER EQU $85 -CELADON_GYM EQU $86 -GAME_CORNER EQU $87 -CELADON_MART_5 EQU $88 -CELADON_PRIZE_ROOM EQU $89 -CELADON_DINER EQU $8A -CELADON_HOUSE EQU $8B -CELADON_HOTEL EQU $8C -LAVENDER_POKECENTER EQU $8D -POKEMONTOWER_1 EQU $8E -POKEMONTOWER_2 EQU $8F -POKEMONTOWER_3 EQU $90 -POKEMONTOWER_4 EQU $91 -POKEMONTOWER_5 EQU $92 -POKEMONTOWER_6 EQU $93 -POKEMONTOWER_7 EQU $94 -LAVENDER_HOUSE_1 EQU $95 -LAVENDER_MART EQU $96 -LAVENDER_HOUSE_2 EQU $97 -FUCHSIA_MART EQU $98 -FUCHSIA_HOUSE_1 EQU $99 -FUCHSIA_POKECENTER EQU $9A -FUCHSIA_HOUSE_2 EQU $9B -SAFARI_ZONE_ENTRANCE EQU $9C -FUCHSIA_GYM EQU $9D -FUCHSIA_MEETING_ROOM EQU $9E -SEAFOAM_ISLANDS_2 EQU $9F -SEAFOAM_ISLANDS_3 EQU $A0 -SEAFOAM_ISLANDS_4 EQU $A1 -SEAFOAM_ISLANDS_5 EQU $A2 -VERMILION_HOUSE_2 EQU $A3 -FUCHSIA_HOUSE_3 EQU $A4 -MANSION_1 EQU $A5 -CINNABAR_GYM EQU $A6 -CINNABAR_LAB_1 EQU $A7 -CINNABAR_LAB_2 EQU $A8 -CINNABAR_LAB_3 EQU $A9 -CINNABAR_LAB_4 EQU $AA -CINNABAR_POKECENTER EQU $AB -CINNABAR_MART EQU $AC -;copy of CINNABAR_MART EQU $AD -INDIGO_PLATEAU_LOBBY EQU $AE -COPYCATS_HOUSE_1F EQU $AF -COPYCATS_HOUSE_2F EQU $B0 -FIGHTING_DOJO EQU $B1 -SAFFRON_GYM EQU $B2 -SAFFRON_HOUSE_1 EQU $B3 -SAFFRON_MART EQU $B4 -SILPH_CO_1F EQU $B5 -SAFFRON_POKECENTER EQU $B6 -SAFFRON_HOUSE_2 EQU $B7 -ROUTE_15_GATE_1F EQU $B8 -ROUTE_15_GATE_2F EQU $B9 -ROUTE_16_GATE_1F EQU $BA -ROUTE_16_GATE_2F EQU $BB -ROUTE_16_HOUSE EQU $BC -ROUTE_12_HOUSE EQU $BD -ROUTE_18_GATE_1F EQU $BE -ROUTE_18_GATE_2F EQU $BF -SEAFOAM_ISLANDS_1 EQU $C0 -ROUTE_22_GATE EQU $C1 -VICTORY_ROAD_2 EQU $C2 -ROUTE_12_GATE_2F EQU $C3 -VERMILION_HOUSE_3 EQU $C4 -DIGLETTS_CAVE EQU $C5 -VICTORY_ROAD_3 EQU $C6 -ROCKET_HIDEOUT_1 EQU $C7 -ROCKET_HIDEOUT_2 EQU $C8 -ROCKET_HIDEOUT_3 EQU $C9 -ROCKET_HIDEOUT_4 EQU $CA -ROCKET_HIDEOUT_ELEVATOR EQU $CB -;EQU $CC -;EQU $CD -;EQU $CE -SILPH_CO_2F EQU $CF -SILPH_CO_3F EQU $D0 -SILPH_CO_4F EQU $D1 -SILPH_CO_5F EQU $D2 -SILPH_CO_6F EQU $D3 -SILPH_CO_7F EQU $D4 -SILPH_CO_8F EQU $D5 -MANSION_2 EQU $D6 -MANSION_3 EQU $D7 -MANSION_4 EQU $D8 -SAFARI_ZONE_EAST EQU $D9 -SAFARI_ZONE_NORTH EQU $DA -SAFARI_ZONE_WEST EQU $DB -SAFARI_ZONE_CENTER EQU $DC -SAFARI_ZONE_REST_HOUSE_1 EQU $DD -SAFARI_ZONE_SECRET_HOUSE EQU $DE -SAFARI_ZONE_REST_HOUSE_2 EQU $DF -SAFARI_ZONE_REST_HOUSE_3 EQU $E0 -SAFARI_ZONE_REST_HOUSE_4 EQU $E1 -UNKNOWN_DUNGEON_2 EQU $E2 -UNKNOWN_DUNGEON_3 EQU $E3 -UNKNOWN_DUNGEON_1 EQU $E4 -NAME_RATERS_HOUSE EQU $E5 -CERULEAN_HOUSE_3 EQU $E6 -;EQU $E7 -ROCK_TUNNEL_2 EQU $E8 -SILPH_CO_9F EQU $E9 -SILPH_CO_10F EQU $EA -SILPH_CO_11F EQU $EB -SILPH_CO_ELEVATOR EQU $EC -;EQU $ED -;EQU $EE -TRADE_CENTER EQU $EF -COLOSSEUM EQU $F0 -;EQU $F1 -;EQU $F2 -;EQU $F3 -;EQU $F4 -LORELEIS_ROOM EQU $F5 -BRUNOS_ROOM EQU $F6 -AGATHAS_ROOM EQU $F7 +const_value = 0 + + const PALLET_TOWN ; $00 + const VIRIDIAN_CITY ; $01 + const PEWTER_CITY ; $02 + const CERULEAN_CITY ; $03 + const LAVENDER_TOWN ; $04 + const VERMILION_CITY ; $05 + const CELADON_CITY ; $06 + const FUCHSIA_CITY ; $07 + const CINNABAR_ISLAND ; $08 + const INDIGO_PLATEAU ; $09 + const SAFFRON_CITY ; $0A + const UNUSED_MAP_0B ; $0B + const ROUTE_1 ; $0C + const ROUTE_2 ; $0D + const ROUTE_3 ; $0E + const ROUTE_4 ; $0F + const ROUTE_5 ; $10 + const ROUTE_6 ; $11 + const ROUTE_7 ; $12 + const ROUTE_8 ; $13 + const ROUTE_9 ; $14 + const ROUTE_10 ; $15 + const ROUTE_11 ; $16 + const ROUTE_12 ; $17 + const ROUTE_13 ; $18 + const ROUTE_14 ; $19 + const ROUTE_15 ; $1A + const ROUTE_16 ; $1B + const ROUTE_17 ; $1C + const ROUTE_18 ; $1D + const ROUTE_19 ; $1E + const ROUTE_20 ; $1F + const ROUTE_21 ; $20 + const ROUTE_22 ; $21 + const ROUTE_23 ; $22 + const ROUTE_24 ; $23 + const ROUTE_25 ; $24 + const REDS_HOUSE_1F ; $25 + const REDS_HOUSE_2F ; $26 + const BLUES_HOUSE ; $27 + const OAKS_LAB ; $28 + const VIRIDIAN_POKECENTER ; $29 + const VIRIDIAN_MART ; $2A + const VIRIDIAN_SCHOOL ; $2B + const VIRIDIAN_HOUSE ; $2C + const VIRIDIAN_GYM ; $2D + const DIGLETTS_CAVE_EXIT ; $2E + const VIRIDIAN_FOREST_EXIT ; $2F + const ROUTE_2_HOUSE ; $30 + const ROUTE_2_GATE ; $31 + const VIRIDIAN_FOREST_ENTRANCE ; $32 + const VIRIDIAN_FOREST ; $33 + const MUSEUM_1F ; $34 + const MUSEUM_2F ; $35 + const PEWTER_GYM ; $36 + const PEWTER_HOUSE_1 ; $37 + const PEWTER_MART ; $38 + const PEWTER_HOUSE_2 ; $39 + const PEWTER_POKECENTER ; $3A + const MT_MOON_1 ; $3B + const MT_MOON_2 ; $3C + const MT_MOON_3 ; $3D + const TRASHED_HOUSE ; $3E + const CERULEAN_HOUSE ; $3F + const CERULEAN_POKECENTER ; $40 + const CERULEAN_GYM ; $41 + const BIKE_SHOP ; $42 + const CERULEAN_MART ; $43 + const MT_MOON_POKECENTER ; $44 + const TRASHED_HOUSE_COPY ; $45 + const ROUTE_5_GATE ; $46 + const PATH_ENTRANCE_ROUTE_5 ; $47 + const DAYCAREM ; $48 + const ROUTE_6_GATE ; $49 + const PATH_ENTRANCE_ROUTE_6 ; $4A + const PATH_ENTRANCE_ROUTE_6_COPY ; $4B + const ROUTE_7_GATE ; $4C + const PATH_ENTRANCE_ROUTE_7 ; $4D + const PATH_ENTRANCE_ROUTE_7_COPY ; $4E + const ROUTE_8_GATE ; $4F + const PATH_ENTRANCE_ROUTE_8 ; $50 + const ROCK_TUNNEL_POKECENTER ; $51 + const ROCK_TUNNEL_1 ; $52 + const POWER_PLANT ; $53 + const ROUTE_11_GATE_1F ; $54 + const DIGLETTS_CAVE_ENTRANCE ; $55 + const ROUTE_11_GATE_2F ; $56 + const ROUTE_12_GATE_1F ; $57 + const BILLS_HOUSE ; $58 + const VERMILION_POKECENTER ; $59 + const POKEMON_FAN_CLUB ; $5A + const VERMILION_MART ; $5B + const VERMILION_GYM ; $5C + const VERMILION_HOUSE_1 ; $5D + const VERMILION_DOCK ; $5E + const SS_ANNE_1 ; $5F + const SS_ANNE_2 ; $60 + const SS_ANNE_3 ; $61 + const SS_ANNE_4 ; $62 + const SS_ANNE_5 ; $63 + const SS_ANNE_6 ; $64 + const SS_ANNE_7 ; $65 + const SS_ANNE_8 ; $66 + const SS_ANNE_9 ; $67 + const SS_ANNE_10 ; $68 + const UNUSED_MAP_69 ; $69 + const UNUSED_MAP_6A ; $6A + const UNUSED_MAP_6B ; $6B + const VICTORY_ROAD_1 ; $6C + const UNUSED_MAP_6D ; $6D + const UNUSED_MAP_6E ; $6E + const UNUSED_MAP_6F ; $6F + const UNUSED_MAP_70 ; $70 + const LANCES_ROOM ; $71 + const UNUSED_MAP_72 ; $72 + const UNUSED_MAP_73 ; $73 + const UNUSED_MAP_74 ; $74 + const UNUSED_MAP_75 ; $75 + const HALL_OF_FAME ; $76 + const UNDERGROUND_PATH_NS ; $77 + const CHAMPIONS_ROOM ; $78 + const UNDERGROUND_PATH_WE ; $79 + const CELADON_MART_1 ; $7A + const CELADON_MART_2 ; $7B + const CELADON_MART_3 ; $7C + const CELADON_MART_4 ; $7D + const CELADON_MART_ROOF ; $7E + const CELADON_MART_ELEVATOR ; $7F + const CELADON_MANSION_1 ; $80 + const CELADON_MANSION_2 ; $81 + const CELADON_MANSION_3 ; $82 + const CELADON_MANSION_4 ; $83 + const CELADON_MANSION_5 ; $84 + const CELADON_POKECENTER ; $85 + const CELADON_GYM ; $86 + const GAME_CORNER ; $87 + const CELADON_MART_5 ; $88 + const CELADON_PRIZE_ROOM ; $89 + const CELADON_DINER ; $8A + const CELADON_HOUSE ; $8B + const CELADON_HOTEL ; $8C + const LAVENDER_POKECENTER ; $8D + const POKEMONTOWER_1 ; $8E + const POKEMONTOWER_2 ; $8F + const POKEMONTOWER_3 ; $90 + const POKEMONTOWER_4 ; $91 + const POKEMONTOWER_5 ; $92 + const POKEMONTOWER_6 ; $93 + const POKEMONTOWER_7 ; $94 + const LAVENDER_HOUSE_1 ; $95 + const LAVENDER_MART ; $96 + const LAVENDER_HOUSE_2 ; $97 + const FUCHSIA_MART ; $98 + const FUCHSIA_HOUSE_1 ; $99 + const FUCHSIA_POKECENTER ; $9A + const FUCHSIA_HOUSE_2 ; $9B + const SAFARI_ZONE_ENTRANCE ; $9C + const FUCHSIA_GYM ; $9D + const FUCHSIA_MEETING_ROOM ; $9E + const SEAFOAM_ISLANDS_2 ; $9F + const SEAFOAM_ISLANDS_3 ; $A0 + const SEAFOAM_ISLANDS_4 ; $A1 + const SEAFOAM_ISLANDS_5 ; $A2 + const VERMILION_HOUSE_2 ; $A3 + const FUCHSIA_HOUSE_3 ; $A4 + const MANSION_1 ; $A5 + const CINNABAR_GYM ; $A6 + const CINNABAR_LAB_1 ; $A7 + const CINNABAR_LAB_2 ; $A8 + const CINNABAR_LAB_3 ; $A9 + const CINNABAR_LAB_4 ; $AA + const CINNABAR_POKECENTER ; $AB + const CINNABAR_MART ; $AC + const CINNABAR_MART_COPY ; $AD + const INDIGO_PLATEAU_LOBBY ; $AE + const COPYCATS_HOUSE_1F ; $AF + const COPYCATS_HOUSE_2F ; $B0 + const FIGHTING_DOJO ; $B1 + const SAFFRON_GYM ; $B2 + const SAFFRON_HOUSE_1 ; $B3 + const SAFFRON_MART ; $B4 + const SILPH_CO_1F ; $B5 + const SAFFRON_POKECENTER ; $B6 + const SAFFRON_HOUSE_2 ; $B7 + const ROUTE_15_GATE_1F ; $B8 + const ROUTE_15_GATE_2F ; $B9 + const ROUTE_16_GATE_1F ; $BA + const ROUTE_16_GATE_2F ; $BB + const ROUTE_16_HOUSE ; $BC + const ROUTE_12_HOUSE ; $BD + const ROUTE_18_GATE_1F ; $BE + const ROUTE_18_GATE_2F ; $BF + const SEAFOAM_ISLANDS_1 ; $C0 + const ROUTE_22_GATE ; $C1 + const VICTORY_ROAD_2 ; $C2 + const ROUTE_12_GATE_2F ; $C3 + const VERMILION_HOUSE_3 ; $C4 + const DIGLETTS_CAVE ; $C5 + const VICTORY_ROAD_3 ; $C6 + const ROCKET_HIDEOUT_1 ; $C7 + const ROCKET_HIDEOUT_2 ; $C8 + const ROCKET_HIDEOUT_3 ; $C9 + const ROCKET_HIDEOUT_4 ; $CA + const ROCKET_HIDEOUT_ELEVATOR ; $CB + const UNUSED_MAP_CC ; $CC + const UNUSED_MAP_CD ; $CD + const UNUSED_MAP_CE ; $CE + const SILPH_CO_2F ; $CF + const SILPH_CO_3F ; $D0 + const SILPH_CO_4F ; $D1 + const SILPH_CO_5F ; $D2 + const SILPH_CO_6F ; $D3 + const SILPH_CO_7F ; $D4 + const SILPH_CO_8F ; $D5 + const MANSION_2 ; $D6 + const MANSION_3 ; $D7 + const MANSION_4 ; $D8 + const SAFARI_ZONE_EAST ; $D9 + const SAFARI_ZONE_NORTH ; $DA + const SAFARI_ZONE_WEST ; $DB + const SAFARI_ZONE_CENTER ; $DC + const SAFARI_ZONE_REST_HOUSE_1 ; $DD + const SAFARI_ZONE_SECRET_HOUSE ; $DE + const SAFARI_ZONE_REST_HOUSE_2 ; $DF + const SAFARI_ZONE_REST_HOUSE_3 ; $E0 + const SAFARI_ZONE_REST_HOUSE_4 ; $E1 + const UNKNOWN_DUNGEON_2 ; $E2 + const UNKNOWN_DUNGEON_3 ; $E3 + const UNKNOWN_DUNGEON_1 ; $E4 + const NAME_RATERS_HOUSE ; $E5 + const CERULEAN_HOUSE_3 ; $E6 + const UNUSED_MAP_E7 ; $E7 + const ROCK_TUNNEL_2 ; $E8 + const SILPH_CO_9F ; $E9 + const SILPH_CO_10F ; $EA + const SILPH_CO_11F ; $EB + const SILPH_CO_ELEVATOR ; $EC + const UNUSED_MAP_ED ; $ED + const UNUSED_MAP_EE ; $EE + const TRADE_CENTER ; $EF + const COLOSSEUM ; $F0 + const UNUSED_MAP_F1 ; $F1 + const UNUSED_MAP_F2 ; $F2 + const UNUSED_MAP_F3 ; $F3 + const UNUSED_MAP_F4 ; $F4 + const LORELEIS_ROOM ; $F5 + const BRUNOS_ROOM ; $F6 + const AGATHAS_ROOM ; $F7 IF DEF(_OPTION_BEACH_HOUSE) -BEACH_HOUSE EQU $F8 + const BEACH_HOUSE ; $F8 ENDC diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index d2edd949..ee611ee5 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -38,64 +38,64 @@ ExternalMapEntries: ; 71313 (1c:5313) EMAP $B,$0,Route25Name InternalMapEntries: ; 71382 (1c:5382) - IMAP $29,$2,$B,PalletTownName - IMAP $2E,$2,$8,ViridianCityName - IMAP $33,$2,$6,Route2Name - IMAP $34,$2,$4,ViridianForestName - IMAP $3B,$2,$3,PewterCityName - IMAP $3E,$6,$2,MountMoonName - IMAP $44,$A,$2,CeruleanCityName - IMAP $45,$5,$2,Route4Name - IMAP $46,$A,$2,CeruleanCityName - IMAP $49,$A,$4,Route5Name - IMAP $4C,$A,$6,Route6Name - IMAP $4F,$9,$5,Route7Name - IMAP $51,$B,$5,Route8Name - IMAP $53,$E,$3,RockTunnelName - IMAP $54,$F,$4,PowerPlantName - IMAP $57,$D,$9,Route11Name - IMAP $58,$E,$7,Route12Name - IMAP $59,$C,$0,SeaCottageName - IMAP $5F,$A,$9,VermilionCityName - IMAP $69,$9,$A,SSAnneName - IMAP $6D,$0,$4,VictoryRoadName - IMAP $77,$0,$2,PokemonLeagueName - IMAP $78,$A,$5,UndergroundPathName - IMAP $79,$0,$2,PokemonLeagueName - IMAP $7A,$A,$5,UndergroundPathName - IMAP $8D,$7,$5,CeladonCityName - IMAP $8E,$E,$5,LavenderTownName - IMAP $95,$F,$5,PokemonTowerName - IMAP $98,$E,$5,LavenderTownName - IMAP $9C,$8,$D,FuchsiaCityName - IMAP $9D,$8,$C,SafariZoneName - IMAP $9F,$8,$D,FuchsiaCityName - IMAP $A3,$5,$F,SeafoamIslandsName - IMAP $A4,$A,$9,VermilionCityName - IMAP $A5,$8,$D,FuchsiaCityName - IMAP $A6,$2,$F,PokemonMansionName - IMAP $AE,$2,$F,CinnabarIslandName - IMAP $AF,$0,$2,IndigoPlateauName - IMAP $B8,$A,$5,SaffronCityName - IMAP $BA,$9,$D,Route15Name - IMAP $BD,$4,$5,Route16Name - IMAP $BE,$E,$A,Route12Name - IMAP $C0,$7,$D,Route18Name - IMAP $C1,$5,$F,SeafoamIslandsName - IMAP $C2,$0,$7,Route22Name - IMAP $C3,$0,$4,VictoryRoadName - IMAP $C4,$E,$7,Route12Name - IMAP $C5,$A,$9,VermilionCityName - IMAP $C6,$3,$4,DiglettsCaveName - IMAP $C7,$0,$4,VictoryRoadName - IMAP $CF,$7,$5,RocketHQName - IMAP $D6,$A,$5,SilphCoName - IMAP $D9,$2,$F,PokemonMansionName - IMAP $E2,$8,$C,SafariZoneName - IMAP $E5,$9,$1,CeruleanCaveName - IMAP $E6,$E,$5,LavenderTownName - IMAP $E7,$A,$2,CeruleanCityName - IMAP $E9,$E,$3,RockTunnelName - IMAP $ED,$A,$5,SilphCoName - IMAP $F8,$0,$2,PokemonLeagueName + IMAP OAKS_LAB, $2,$B,PalletTownName + IMAP VIRIDIAN_GYM, $2,$8,ViridianCityName + IMAP VIRIDIAN_FOREST_ENTRANCE, $2,$6,Route2Name + IMAP VIRIDIAN_FOREST, $2,$4,ViridianForestName + IMAP PEWTER_POKECENTER, $2,$3,PewterCityName + IMAP MT_MOON_3, $6,$2,MountMoonName + IMAP CERULEAN_MART, $A,$2,CeruleanCityName + IMAP MT_MOON_POKECENTER, $5,$2,Route4Name + IMAP TRASHED_HOUSE_COPY, $A,$2,CeruleanCityName + IMAP DAYCAREM, $A,$4,Route5Name + IMAP PATH_ENTRANCE_ROUTE_6_COPY,$A,$6,Route6Name + IMAP PATH_ENTRANCE_ROUTE_7_COPY,$9,$5,Route7Name + IMAP PATH_ENTRANCE_ROUTE_8, $B,$5,Route8Name + IMAP ROCK_TUNNEL_1, $E,$3,RockTunnelName + IMAP POWER_PLANT, $F,$4,PowerPlantName + IMAP ROUTE_11_GATE_2F, $D,$9,Route11Name + IMAP ROUTE_12_GATE_1F, $E,$7,Route12Name + IMAP BILLS_HOUSE, $C,$0,SeaCottageName + IMAP VERMILION_DOCK, $A,$9,VermilionCityName + IMAP SS_ANNE_10, $9,$A,SSAnneName + IMAP VICTORY_ROAD_1, $0,$4,VictoryRoadName + IMAP HALL_OF_FAME, $0,$2,PokemonLeagueName + IMAP UNDERGROUND_PATH_NS, $A,$5,UndergroundPathName + IMAP CHAMPIONS_ROOM, $0,$2,PokemonLeagueName + IMAP UNDERGROUND_PATH_WE, $A,$5,UndergroundPathName + IMAP CELADON_HOTEL, $7,$5,CeladonCityName + IMAP LAVENDER_POKECENTER, $E,$5,LavenderTownName + IMAP POKEMONTOWER_7, $F,$5,PokemonTowerName + IMAP LAVENDER_HOUSE_2, $E,$5,LavenderTownName + IMAP FUCHSIA_HOUSE_2, $8,$D,FuchsiaCityName + IMAP SAFARI_ZONE_ENTRANCE, $8,$C,SafariZoneName + IMAP FUCHSIA_MEETING_ROOM, $8,$D,FuchsiaCityName + IMAP SEAFOAM_ISLANDS_5, $5,$F,SeafoamIslandsName + IMAP VERMILION_HOUSE_2, $A,$9,VermilionCityName + IMAP FUCHSIA_HOUSE_3, $8,$D,FuchsiaCityName + IMAP MANSION_1, $2,$F,PokemonMansionName + IMAP CINNABAR_MART_COPY, $2,$F,CinnabarIslandName + IMAP INDIGO_PLATEAU_LOBBY, $0,$2,IndigoPlateauName + IMAP SAFFRON_HOUSE_2, $A,$5,SaffronCityName + IMAP ROUTE_15_GATE_2F, $9,$D,Route15Name + IMAP ROUTE_16_HOUSE, $4,$5,Route16Name + IMAP ROUTE_12_HOUSE, $E,$A,Route12Name + IMAP ROUTE_18_GATE_2F, $7,$D,Route18Name + IMAP SEAFOAM_ISLANDS_1, $5,$F,SeafoamIslandsName + IMAP ROUTE_22_GATE, $0,$7,Route22Name + IMAP VICTORY_ROAD_2, $0,$4,VictoryRoadName + IMAP ROUTE_12_GATE_2F, $E,$7,Route12Name + IMAP VERMILION_HOUSE_3, $A,$9,VermilionCityName + IMAP DIGLETTS_CAVE, $3,$4,DiglettsCaveName + IMAP VICTORY_ROAD_3, $0,$4,VictoryRoadName + IMAP UNUSED_MAP_CE, $7,$5,RocketHQName + IMAP SILPH_CO_8F, $A,$5,SilphCoName + IMAP MANSION_4, $2,$F,PokemonMansionName + IMAP SAFARI_ZONE_REST_HOUSE_4, $8,$C,SafariZoneName + IMAP UNKNOWN_DUNGEON_1, $9,$1,CeruleanCaveName + IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName + IMAP CERULEAN_HOUSE_3, $A,$2,CeruleanCityName + IMAP ROCK_TUNNEL_2, $E,$3,RockTunnelName + IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName + IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName db $FF diff --git a/macros.asm b/macros.asm index bf1b8a89..6a693a0b 100644 --- a/macros.asm +++ b/macros.asm @@ -130,7 +130,7 @@ IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer ; nybble: y-coordinate ; nybble: x-coordinate ; word : pointer to map name - db \1 + db \1 + 1 db \2 + \3 << 4 dw \4 ENDM -- cgit v1.3.1-sl0p From fc9af362ae65d24c66b39ea7759637cc9c1f9b0a Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 18 Jul 2015 08:17:29 -0700 Subject: fix variable naming --- engine/battle/animations.asm | 2 +- engine/battle/core.asm | 28 +++---- engine/battle/wild_encounters.asm | 2 +- engine/items/items.asm | 4 +- engine/items/tm_prices.asm | 9 +-- engine/menu/pokedex.asm | 22 +++--- engine/menu/prize_menu.asm | 4 +- engine/menu/start_sub_menus.asm | 2 +- engine/oak_speech.asm | 47 ++++++------ engine/oak_speech2.asm | 140 ++++++++++++++++++---------------- engine/overworld/item.asm | 6 +- engine/overworld/map_sprites.asm | 16 ++-- engine/predefs.asm | 4 +- home.asm | 36 ++++----- home/copy2.asm | 22 +++--- home/overworld.asm | 154 +++++++++++++++++++------------------- hram.asm | 55 ++++++++++++-- macros.asm | 6 +- main.asm | 16 ++-- scripts/agatha.asm | 4 +- scripts/billshouse.asm | 6 +- scripts/bruno.asm | 4 +- scripts/celadongamecorner.asm | 6 +- scripts/celadongym.asm | 6 +- scripts/ceruleancity.asm | 24 +++--- scripts/ceruleangym.asm | 6 +- scripts/cinnabargym.asm | 14 ++-- scripts/cinnabarisland.asm | 2 +- scripts/fightingdojo.asm | 14 ++-- scripts/fuchsiagym.asm | 6 +- scripts/fuchsiahouse2.asm | 2 +- scripts/gary.asm | 42 +++++------ scripts/halloffameroom.asm | 8 +- scripts/lance.asm | 4 +- scripts/lorelei.asm | 4 +- scripts/mansion1.asm | 6 +- scripts/mansion2.asm | 4 +- scripts/mansion3.asm | 6 +- scripts/mansion4.asm | 12 +-- scripts/mtmoon1.asm | 12 +-- scripts/mtmoon3.asm | 12 +-- scripts/museum1f.asm | 14 ++-- scripts/oakslab.asm | 68 ++++++++--------- scripts/pallettown.asm | 2 +- scripts/pewtercity.asm | 20 ++--- scripts/pewtergym.asm | 6 +- scripts/pokemontower2.asm | 12 +-- scripts/pokemontower3.asm | 2 +- scripts/pokemontower4.asm | 6 +- scripts/pokemontower5.asm | 4 +- scripts/pokemontower6.asm | 8 +- scripts/pokemontower7.asm | 6 +- scripts/powerplant.asm | 10 +-- scripts/rockethideout1.asm | 4 +- scripts/rockethideout2.asm | 8 +- scripts/rockethideout3.asm | 4 +- scripts/rockethideout4.asm | 12 +-- scripts/route12.asm | 8 +- scripts/route15.asm | 2 +- scripts/route16.asm | 4 +- scripts/route16gate.asm | 8 +- scripts/route18gate.asm | 10 +-- scripts/route2.asm | 4 +- scripts/route22.asm | 50 ++++++------- scripts/route22gate.asm | 2 +- scripts/route23.asm | 20 ++--- scripts/route24.asm | 8 +- scripts/route25.asm | 2 +- scripts/route4.asm | 2 +- scripts/route5gate.asm | 4 +- scripts/route6gate.asm | 4 +- scripts/route7gate.asm | 4 +- scripts/route8gate.asm | 4 +- scripts/route9.asm | 2 +- scripts/safarizonecenter.asm | 2 +- scripts/safarizoneeast.asm | 8 +- scripts/safarizoneentrance.asm | 8 +- scripts/safarizonenorth.asm | 4 +- scripts/safarizonewest.asm | 8 +- scripts/saffrongym.asm | 6 +- scripts/silphco10.asm | 6 +- scripts/silphco11.asm | 24 +++--- scripts/silphco3.asm | 2 +- scripts/silphco4.asm | 6 +- scripts/silphco5.asm | 6 +- scripts/silphco6.asm | 4 +- scripts/silphco7.asm | 24 +++--- scripts/ssanne10.asm | 6 +- scripts/ssanne2.asm | 18 ++--- scripts/ssanne8.asm | 2 +- scripts/ssanne9.asm | 4 +- scripts/tradecenter.asm | 12 +-- scripts/unknowndungeon1.asm | 6 +- scripts/unknowndungeon2.asm | 6 +- scripts/unknowndungeon3.asm | 4 +- scripts/vermilioncity.asm | 2 +- scripts/vermiliongym.asm | 6 +- scripts/victoryroad1.asm | 4 +- scripts/victoryroad2.asm | 8 +- scripts/victoryroad3.asm | 4 +- scripts/viridiancity.asm | 6 +- scripts/viridianforest.asm | 6 +- scripts/viridiangym.asm | 8 +- scripts/viridianmart.asm | 4 +- text.asm | 2 +- wram.asm | 125 +++++++++++++++++++++---------- 106 files changed, 773 insertions(+), 671 deletions(-) (limited to 'macros.asm') diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 63ea170d..7764603d 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -163,7 +163,7 @@ DrawFrameBlock: ; 78000 (1e:4000) PlayAnimation: ; 780f1 (1e:40f1) xor a - ld [$FF8B],a + ld [$FF8B],a ; it looks like nothing reads this ld [W_SUBANIMTRANSFORM],a ld a,[W_ANIMATIONID] ; get animation number dec a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index bdb20bb0..2f407290 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1310,7 +1310,7 @@ SevenSpacesText: ; 3c8d7 (f:48d7) ; if a is 8, the slide is to the right, else it is to the left ; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing SlideTrainerPicOffScreen: ; 3c8df (f:48df) - ld [$FF8B], a + ld [hSlideAmount], a ld c, a .slideStepLoop ; each iteration, the trainer pic is slid one tile left/right push bc @@ -1318,10 +1318,10 @@ SlideTrainerPicOffScreen: ; 3c8df (f:48df) ld b, 7 ; number of rows .rowLoop push hl - ld a, [$FF8B] + ld a, [hSlideAmount] ld c, a .columnLoop - ld a, [$FF8B] + ld a, [hSlideAmount] cp 8 jr z, .slideRight .slideLeft ; slide player sprite off screen @@ -1590,14 +1590,14 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) ld a, [hl] ld [H_MULTIPLICAND + 2], a ld a, [de] - ld [$ff8d], a + ld [hEnemySpeed], a inc de ld a, [de] - ld [$ff8e], a + ld [hEnemySpeed + 1], a call LoadScreenTilesFromBuffer1 ld de, H_MULTIPLICAND + 1 - ld hl, $ff8d - ld c, $2 + ld hl, hEnemySpeed + ld c, 2 call StringCmp jr nc, .canEscape ; jump if player speed greater than enemy speed xor a @@ -1609,9 +1609,9 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) ld [H_DIVIDEND], a ld a, [H_PRODUCT + 3] ld [H_DIVIDEND + 1], a - ld a, [$ff8d] + ld a, [hEnemySpeed] ld b, a - ld a, [$ff8e] + ld a, [hEnemySpeed + 1] ; divide enemy speed by 4 srl b rr a @@ -6411,7 +6411,7 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) predef ScaleSpriteByTwo ld hl, wOAMBuffer xor a - ld [$FF8B], a ; initial tile number + ld [hOAMTile], a ; initial tile number ld b, $7 ; 7 columns ld e, $a0 ; X for the left-most column .loop ; each loop iteration writes 3 OAM entries in a vertical column @@ -6425,16 +6425,16 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) add d ; increase Y by height of tile ld d, a inc hl - ld a, [$FF8B] + ld a, [hOAMTile] ld [hli], a ; OAM tile number inc a ; increment tile number - ld [$FF8B], a + ld [hOAMTile], a inc hl dec c jr nz, .innerLoop - ld a, [$FF8B] + ld a, [hOAMTile] add $4 ; increase tile number by 4 - ld [$FF8B], a + ld [hOAMTile], a ld a, $8 ; width of tile add e ; increase X by width of tile ld e, a diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 87512583..03dc6fb6 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -89,7 +89,7 @@ TryDoWildEncounter: ; 13870 (4:7870) jr .willEncounter .lastRepelStep ld [wRepelRemainingSteps], a - ld a, $d2 + ld a, 210 ld [H_DOWNARROWBLINKCNT2], a call EnableAutoTextBoxDrawing call DisplayTextID diff --git a/engine/items/items.asm b/engine/items/items.asm index b65e8f1e..7617ba6c 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -556,11 +556,11 @@ ItemUseSurfboard: ; d9b4 (3:59b4) jp PrintText .tryToStopSurfing xor a - ld [$ff8c],a + ld [hSpriteIndexOrTextID],a ld d,16 ; talking range in pixels (normal range) call IsSpriteInFrontOfPlayer2 res 7,[hl] - ld a,[$ff8c] + ld a,[hSpriteIndexOrTextID] and a ; is there a sprite in the way? jr nz,.cannotStopSurfing ld hl,TilePairCollisionsWater diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm index 4decc82d..6bb7f711 100755 --- a/engine/items/tm_prices.asm +++ b/engine/items/tm_prices.asm @@ -1,7 +1,6 @@ GetMachinePrice: ; 7bf86 (1e:7f86) ; Input: [wcf91] = Item Id of a TM -; Output: Stores the 2-byte TM price in [H_DOWNARROWBLINKCNT1] and [H_DOWNARROWBLINKCNT2] -; as a BCD +; Output: Stores the TM price at hItemPrice ld a, [wcf91] ; a contains TM item id sub TM_01 ret c @@ -17,10 +16,10 @@ GetMachinePrice: ; 7bf86 (1e:7f86) swap a .highNybbleIsPrice and $f0 - ld [H_DOWNARROWBLINKCNT2], a + ld [hItemPrice + 1], a xor a - ld [H_DOWNARROWBLINKCNT1], a - ld [$ff8d], a + ld [hItemPrice], a + ld [hItemPrice + 2], a ret INCLUDE "data/tm_prices.asm" diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 56543c91..80eedecd 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -512,25 +512,25 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) inc de inc de ; de = address of upper byte of weight push de -; put weight in big-endian order at $ff8b - ld hl,$ff8b - ld a,[hl] ; save existing value of [$ff8b] +; put weight in big-endian order at hDexWeight + ld hl,hDexWeight + ld a,[hl] ; save existing value of [hDexWeight] push af ld a,[de] ; a = upper byte of weight - ld [hli],a ; store upper byte of weight in [$ff8b] - ld a,[hl] ; save existing value of [$ff8c] + ld [hli],a ; store upper byte of weight in [hDexWeight] + ld a,[hl] ; save existing value of [hDexWeight + 1] push af dec de ld a,[de] ; a = lower byte of weight - ld [hl],a ; store lower byte of weight in [$ff8c] - ld de,$ff8b + ld [hl],a ; store lower byte of weight in [hDexWeight + 1] + ld de,hDexWeight hlCoord 11, 8 ld bc,$0205 ; no leading zeroes, right-aligned, 2 bytes, 5 digits call PrintNumber ; print weight hlCoord 14, 8 - ld a,[$ff8c] + ld a,[hDexWeight + 1] sub a,10 - ld a,[$ff8b] + ld a,[hDexWeight] sbc a,0 jr nc,.next ld [hl],"0" ; if the weight is less than 10, put a 0 before the decimal point @@ -540,9 +540,9 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld [hld],a ; make space for the decimal point by moving the last digit forward one tile ld [hl],$f2 ; decimal point tile pop af - ld [$ff8c],a ; restore original value of [$ff8c] + ld [hDexWeight + 1],a ; restore original value of [hDexWeight + 1] pop af - ld [$ff8b],a ; restore original value of [$ff8b] + ld [hDexWeight],a ; restore original value of [hDexWeight] pop hl inc hl ; hl = address of pokedex description text bcCoord 1, 11 diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index fff8e4c4..f7206a7f 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -58,13 +58,13 @@ WhichPrizeTextPtr: ; 52789 (14:6789) GetPrizeMenuId: ; 5278e (14:678e) ; determine which one among the three ; prize-texts has been selected -; using the text ID (stored in [$FF8C]) +; using the text ID (stored in [hSpriteIndexOrTextID]) ; load the three prizes at wd13d-wd13f ; load the three prices at wd141-wd146 ; display the three prizes' names ; (distinguishing between Pokemon names ; and Items (specifically TMs) names) - ld a,[$FF8C] + ld a,[hSpriteIndexOrTextID] sub a,$03 ; prize-texts' id are 3, 4 and 5 ld [wd12f],a ; prize-texts' id (relative, i.e. 0, 1 or 2) add a diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 11b7fa90..2804ef7b 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -524,7 +524,7 @@ StartMenu_TrainerInfo: ; 13460 (4:7460) DrawTrainerInfo: ; 1349a (4:749a) ld de,RedPicFront ld bc,(BANK(RedPicFront) << 8) | $01 - predef Predef3B + predef DisplayPicCenteredOrUpperRight call DisableLCD hlCoord 0, 2 ld a," " diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index df092d4c..bd7f672e 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -34,9 +34,9 @@ SetDefaultNames: ; 60ca (1:60ca) OakSpeech: ; 6115 (1:6115) ld a,$FF call PlaySound ; stop music - ld a, BANK(Music_Routes2) ; bank of song + ld a, BANK(Music_Routes2) ld c,a - ld a, MUSIC_ROUTES2 ; song # + ld a, MUSIC_ROUTES2 call PlayMusic call ClearScreen call LoadTextBoxTilePatterns @@ -54,50 +54,49 @@ OakSpeech: ; 6115 (1:6115) xor a ld [hTilesetType],a ld a,[wd732] - bit 1,a ; XXX when is bit 1 set? - jp nz,Func_61bc ; easter egg: skip the intro + bit 1,a ; possibly a debug mode bit + jp nz,.skipChoosingNames ld de,ProfOakPic ld bc, (Bank(ProfOakPic) << 8) | $00 - call IntroPredef3B ; displays Oak pic? + call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl,OakSpeechText1 - call PrintText ; prints text box + call PrintText call GBFadeOutToWhite call ClearScreen ld a,NIDORINO - ld [wd0b5],a ; pic displayed is stored at this location + ld [wd0b5],a ld [wcf91],a - call GetMonHeader ; this is also related to the pic - hlCoord 6, 4 ; position on tilemap the pic is displayed - call LoadFlippedFrontSpriteByMonIndex ; displays pic? + call GetMonHeader + hlCoord 6, 4 + call LoadFlippedFrontSpriteByMonIndex call MovePicLeft ld hl,OakSpeechText2 - call PrintText ; Prints text box + call PrintText call GBFadeOutToWhite call ClearScreen ld de,RedPicFront ld bc,(Bank(RedPicFront) << 8) | $00 - call IntroPredef3B ; displays player pic? + call IntroDisplayPicCenteredOrUpperRight call MovePicLeft ld hl,IntroducePlayerText call PrintText - call LoadDefaultNamesPlayer ; brings up NewName/Red/etc menu + call ChoosePlayerName call GBFadeOutToWhite call ClearScreen ld de,Rival1Pic ld bc,(Bank(Rival1Pic) << 8) | $00 - call IntroPredef3B ; displays rival pic + call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl,IntroduceRivalText call PrintText - call LoadDefaultNamesRival - -Func_61bc: ; 61bc (1:61bc) + call ChooseRivalName +.skipChoosingNames call GBFadeOutToWhite call ClearScreen ld de,RedPicFront ld bc,(Bank(RedPicFront) << 8) | $00 - call IntroPredef3B + call IntroDisplayPicCenteredOrUpperRight call GBFadeInFromWhite ld a,[wd72d] and a @@ -120,12 +119,12 @@ Func_61bc: ; 61bc (1:61bc) call CopyVideoData ld de,ShrinkPic1 ld bc,(BANK(ShrinkPic1) << 8) | $00 - call IntroPredef3B + call IntroDisplayPicCenteredOrUpperRight ld c,4 call DelayFrames ld de,ShrinkPic2 ld bc,(BANK(ShrinkPic2) << 8) | $00 - call IntroPredef3B + call IntroDisplayPicCenteredOrUpperRight call ResetPlayerSpriteData ld a,[H_LOADEDROMBANK] push af @@ -207,10 +206,12 @@ MovePicLeft: ; 6288 (1:6288) ld [rWX],a jr .next -Predef3B: ; 62a1 (1:62a1) +DisplayPicCenteredOrUpperRight: ; 62a1 (1:62a1) call GetPredefRegisters -IntroPredef3B: ; 62a4 (1:62a4) -; bank of sprite given in b +IntroDisplayPicCenteredOrUpperRight: ; 62a4 (1:62a4) +; b = bank +; de = address of compressed pic +; c: 0 = centred, non-zero = upper-right push bc ld a,b call UncompressSpriteFromDE diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index b27a6987..f881b43b 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -1,29 +1,29 @@ -LoadDefaultNamesPlayer: ; 695d (1:695d) - call Func_6a12 +ChoosePlayerName: ; 695d (1:695d) + call OakSpeechSlidePicRight ld de, DefaultNamesPlayer call DisplayIntroNameTextBox ld a, [wCurrentMenuItem] and a - jr z, .asm_697a + jr z, .customName ld hl, DefaultNamesPlayerList - call Func_6ad6 + call GetDefaultName ld de, wPlayerName - call Func_69ec - jr .asm_6999 -.asm_697a + call OakSpeechSlidePicLeft + jr .done +.customName ld hl, wPlayerName xor a ; NAME_PLAYER_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen ld a, [wcf4b] - cp $50 - jr z, .asm_697a + cp "@" + jr z, .customName call ClearScreen call Delay3 ld de, RedPicFront ld b, BANK(RedPicFront) - call IntroPredef3B -.asm_6999 + call IntroDisplayPicCenteredOrUpperRight +.done ld hl, YourNameIsText jp PrintText @@ -31,32 +31,32 @@ YourNameIsText: ; 699f (1:699f) TX_FAR _YourNameIsText db "@" -LoadDefaultNamesRival: ; 69a4 (1:69a4) - call Func_6a12 +ChooseRivalName: ; 69a4 (1:69a4) + call OakSpeechSlidePicRight ld de, DefaultNamesRival call DisplayIntroNameTextBox ld a, [wCurrentMenuItem] and a - jr z, .asm_69c1 + jr z, .customName ld hl, DefaultNamesRivalList - call Func_6ad6 + call GetDefaultName ld de, W_RIVALNAME - call Func_69ec - jr .asm_69e1 -.asm_69c1 + call OakSpeechSlidePicLeft + jr .done +.customName ld hl, W_RIVALNAME ld a, NAME_RIVAL_SCREEN ld [wNamingScreenType], a call DisplayNamingScreen ld a, [wcf4b] - cp $50 - jr z, .asm_69c1 + cp "@" + jr z, .customName call ClearScreen call Delay3 ld de, Rival1Pic ld b, $13 - call IntroPredef3B -.asm_69e1 + call IntroDisplayPicCenteredOrUpperRight +.done ld hl, HisNameIsText jp PrintText @@ -64,11 +64,11 @@ HisNameIsText: ; 69e7 (1:69e7) TX_FAR _HisNameIsText db "@" -Func_69ec: ; 69ec (1:69ec) +OakSpeechSlidePicLeft: ; 69ec (1:69ec) push de hlCoord 0, 0 - ld bc, $c0b - call ClearScreenArea + lb bc, 12, 11 + call ClearScreenArea ; clear the name list text box ld c, 10 call DelayFrames pop de @@ -77,77 +77,83 @@ Func_69ec: ; 69ec (1:69ec) call CopyData call Delay3 hlCoord 12, 4 - ld de, $67d + lb de, 6, 6 * SCREEN_WIDTH + 5 ld a, $ff - jr asm_6a19 + jr OakSpeechSlidePicCommon -Func_6a12: ; 6a12 (1:6a12) +OakSpeechSlidePicRight: ; 6a12 (1:6a12) hlCoord 5, 4 - ld de, $67d + lb de, 6, 6 * SCREEN_WIDTH + 5 xor a -asm_6a19: ; 6a19 (1:6a19) + +OakSpeechSlidePicCommon: ; 6a19 (1:6a19) push hl push de push bc - ld [$ff8d], a + ld [hSlideDirection], a ld a, d - ld [H_DOWNARROWBLINKCNT1], a + ld [hSlideAmount], a ld a, e - ld [H_DOWNARROWBLINKCNT2], a + ld [hSlidingRegionSize], a ld c, a - ld a, [$ff8d] + ld a, [hSlideDirection] and a - jr nz, .asm_6a2d - ld d, $0 + jr nz, .next +; If sliding right, point hl to the end of the pic's tiles. + ld d, 0 add hl, de -.asm_6a2d +.next ld d, h ld e, l -.asm_6a2f +.loop xor a ld [H_AUTOBGTRANSFERENABLED], a - ld a, [$ff8d] + ld a, [hSlideDirection] and a - jr nz, .asm_6a3c + jr nz, .slideLeft +; sliding right ld a, [hli] ld [hld], a dec hl - jr .asm_6a3f -.asm_6a3c + jr .next2 +.slideLeft ld a, [hld] ld [hli], a inc hl -.asm_6a3f +.next2 dec c - jr nz, .asm_6a2f - ld a, [$ff8d] + jr nz, .loop + ld a, [hSlideDirection] and a - jr z, .asm_6a4a + jr z, .next3 +; If sliding left, we need to zero the last tile in the pic (there is no need +; to take a corresponding action when sliding right because hl initially points +; to a 0 tile in that case). xor a dec hl ld [hl], a -.asm_6a4a - ld a, $1 +.next3 + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [hSlidingRegionSize] ld c, a ld h, d ld l, e - ld a, [$ff8d] + ld a, [hSlideDirection] and a - jr nz, .asm_6a5e + jr nz, .slideLeft2 inc hl - jr .asm_6a5f -.asm_6a5e + jr .next4 +.slideLeft2 dec hl -.asm_6a5f +.next4 ld d, h ld e, l - ld a, [H_DOWNARROWBLINKCNT1] + ld a, [hSlideAmount] dec a - ld [H_DOWNARROWBLINKCNT1], a - jr nz, .asm_6a2f + ld [hSlideAmount], a + jr nz, .loop pop bc pop de pop hl @@ -229,22 +235,24 @@ DefaultNamesRival: db "@" ENDC -Func_6ad6: ; 6ad6 (1:6ad6) +GetDefaultName: ; 6ad6 (1:6ad6) +; a = name index +; hl = name list ld b, a - ld c, $0 -.asm_6ad9 + ld c, 0 +.loop ld d, h ld e, l -.asm_6adb +.innerLoop ld a, [hli] - cp $50 - jr nz, .asm_6adb + cp "@" + jr nz, .innerLoop ld a, b cp c - jr z, .asm_6ae7 + jr z, .foundName inc c - jr .asm_6ad9 -.asm_6ae7 + jr .loop +.foundName ld h, d ld l, e ld de, wcd6d diff --git a/engine/overworld/item.asm b/engine/overworld/item.asm index b00405bf..eb6d743a 100644 --- a/engine/overworld/item.asm +++ b/engine/overworld/item.asm @@ -1,7 +1,7 @@ -PickupItem: +PickUpItem: call EnableAutoTextBoxDrawing - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [hSpriteIndexOrTextID] ld b, a ld hl, W_MISSABLEOBJECTLIST .missableObjectsListLoop @@ -18,7 +18,7 @@ PickupItem: ld [$ffdb], a ld hl, W_MAPSPRITEEXTRADATA - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [hSpriteIndexOrTextID] dec a add a ld d, 0 diff --git a/engine/overworld/map_sprites.asm b/engine/overworld/map_sprites.asm index df39d112..33411dfc 100755 --- a/engine/overworld/map_sprites.asm +++ b/engine/overworld/map_sprites.asm @@ -39,7 +39,7 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) ld b,$10 ; number of sprite slots ld hl,wSpriteStateData2 + $0d xor a - ld [$ff8e],a ; 4-tile sprite counter + ld [hFourTileSpriteCount],a .copyPictureIDLoop ; loop to copy picture ID from $C2XD to $C2XE ld a,[hli] ; $C2XD (sprite picture ID) ld [hld],a ; $C2XE @@ -98,14 +98,14 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) cp a,SPRITE_BALL ; is it a 4-tile sprite? jr c,.notFourTileSprite pop af - ld a,[$ff8e] ; 4-tile sprite counter + ld a,[hFourTileSpriteCount] add a,11 jr .storeVRAMSlot .notFourTileSprite pop af .storeVRAMSlot ld [hl],a ; store VRAM slot at $C2XE - ld [$ff8d],a ; used to determine if it's 4-tile sprite later + ld [hVRAMSlot],a ; used to determine if it's 4-tile sprite later ld a,b ; a = current sprite picture ID dec a add a @@ -128,7 +128,7 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) push bc ld hl,vNPCSprites ; VRAM base address ld bc,$c0 ; number of bytes per VRAM slot - ld a,[$ff8d] + ld a,[hVRAMSlot] cp a,11 ; is it a 4-tile sprite? jr nc,.fourTileSpriteVRAMAddr ld d,a @@ -142,13 +142,13 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) jr .loadStillTilePattern .fourTileSpriteVRAMAddr ld hl,vSprites + $7c0 ; address for second 4-tile sprite - ld a,[$ff8e] ; 4-tile sprite counter - and a ; is it the first 4-tile sprite? + ld a,[hFourTileSpriteCount] + and a jr nz,.loadStillTilePattern ; if it's the first 4-tile sprite ld hl,vSprites + $780 ; address for first 4-tile sprite inc a - ld [$ff8e],a ; 4-tile sprite counter + ld [hFourTileSpriteCount],a .loadStillTilePattern pop bc pop de @@ -168,7 +168,7 @@ LoadMapSpriteTilePatterns: ; 17871 (5:7871) .skipFirstLoad pop de pop hl - ld a,[$ff8d] + ld a,[hVRAMSlot] cp a,11 ; is it a 4-tile sprite? jr nc,.skipSecondLoad ; if so, there is no second block push de diff --git a/engine/predefs.asm b/engine/predefs.asm index 1af240ce..17f94b73 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -111,7 +111,7 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef InternalClockTradeAnim add_predef TrainerEngage add_predef IndexToPokedex - add_predef Predef3B; 3B display pic? + add_predef DisplayPicCenteredOrUpperRight; 3B display pic? add_predef UsedCut add_predef ShowPokedexData add_predef WriteMonMoves @@ -144,7 +144,7 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef GetTileTwoStepsInFrontOfPlayer add_predef CheckForCollisionWhenPushingBoulder add_predef PrintStrengthTxt - add_predef PickupItem + add_predef PickUpItem add_predef PrintMoveType add_predef LoadMovePPs add_predef DrawHP ; 5F diff --git a/home.asm b/home.asm index 38a95742..f9004e7e 100644 --- a/home.asm +++ b/home.asm @@ -969,10 +969,10 @@ PokeCenterSignText:: ; 24ef (0:24ef) TX_FAR _PokeCenterSignText db "@" -Predef5CText:: ; 24f4 (0:24f4) +PickUpItemText:: ; 24f4 (0:24f4) ; XXX better label (what does predef $5C do?) TX_ASM - predef PickupItem + predef PickUpItem jp TextScriptEnd @@ -1050,7 +1050,7 @@ Func_28cb:: ; 28cb (0:28cb) jp PlaySound ; this function is used to display sign messages, sprite dialog, etc. -; INPUT: [$ff8c] = sprite ID or text ID +; INPUT: [hSpriteIndexOrTextID] = sprite ID or text ID DisplayTextID:: ; 2920 (0:2920) ld a,[H_LOADEDROMBANK] push af @@ -1069,7 +1069,7 @@ DisplayTextID:: ; 2920 (0:2920) ld h,[hl] ld l,a ; hl = map text pointer ld d,$00 - ld a,[$ff8c] ; text ID + ld a,[hSpriteIndexOrTextID] ; text ID ld [wSpriteIndex],a and a jp z,DisplayStartMenu @@ -1083,7 +1083,7 @@ DisplayTextID:: ; 2920 (0:2920) jp z,DisplayRepelWoreOffText ld a,[W_NUMSPRITES] ld e,a - ld a,[$ff8c] ; sprite ID + ld a,[hSpriteIndexOrTextID] ; sprite ID cp e jr z,.spriteHandling jr nc,.skipSpriteHandling @@ -1096,7 +1096,7 @@ DisplayTextID:: ; 2920 (0:2920) pop bc pop de ld hl,W_MAPSPRITEDATA ; NPC text entries - ld a,[$ff8c] + ld a,[hSpriteIndexOrTextID] dec a add a add l @@ -1235,10 +1235,12 @@ LoadItemList:: ; 2a5a (0:2a5a) ret DisplayPokemonCenterDialogue:: ; 2a72 (0:2a72) +; zeroing these doesn't appear to serve any purpose xor a ld [$ff8b],a ld [$ff8c],a ld [$ff8d],a + inc hl ld a,[H_LOADEDROMBANK] push af @@ -2487,8 +2489,8 @@ CheckForEngagingTrainers:: ; 3306 (0:3306) ld c, a call TrainerFlagAction ; read trainer flag ld a, c - and a - jr nz, .trainerAlreadyFought + and a ; has the trainer already been defeated? + jr nz, .continue push hl push de push hl @@ -2507,7 +2509,7 @@ CheckForEngagingTrainers:: ; 3306 (0:3306) ld a, [wTrainerSpriteOffset] and a ret nz ; break if the trainer is engaging -.trainerAlreadyFought +.continue ld hl, $c add hl, de ld d, h @@ -2737,7 +2739,7 @@ SetSpriteFacingDirection:: ; 34ae (0:34ae) ld a, $9 ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 - ld a, [$ff8d] + ld a, [hSpriteFacingDirection] ld [hl], a ret @@ -2858,18 +2860,18 @@ DecodeRLEList:: ; 350c (0:350c) inc a ; include sentinel in counting ret -; sets movement byte 1 for sprite [$FF8C] to $FE and byte 2 to [$FF8D] +; sets movement byte 1 for sprite [H_SPRITEINDEX] to $FE and byte 2 to [hSpriteMovementByte2] SetSpriteMovementBytesToFE:: ; 3533 (0:3533) push hl call GetSpriteMovementByte1Pointer ld [hl], $fe call GetSpriteMovementByte2Pointer - ld a, [$ff8d] + ld a, [hSpriteMovementByte2] ld [hl], a pop hl ret -; sets both movement bytes for sprite [$FF8C] to $FF +; sets both movement bytes for sprite [H_SPRITEINDEX] to $FF SetSpriteMovementBytesToFF:: ; 3541 (0:3541) push hl call GetSpriteMovementByte1Pointer @@ -2879,20 +2881,20 @@ SetSpriteMovementBytesToFF:: ; 3541 (0:3541) pop hl ret -; returns the sprite movement byte 1 pointer for sprite [$FF8C] in hl +; returns the sprite movement byte 1 pointer for sprite [H_SPRITEINDEX] in hl GetSpriteMovementByte1Pointer:: ; 354e (0:354e) ld h,$C2 - ld a,[H_SPRITEINDEX] ; the sprite to move + ld a,[H_SPRITEINDEX] swap a add a,6 ld l,a ret -; returns the sprite movement byte 2 pointer for sprite [$FF8C] in hl +; returns the sprite movement byte 2 pointer for sprite [H_SPRITEINDEX] in hl GetSpriteMovementByte2Pointer:: ; 3558 (0:3558) push de ld hl,W_MAPSPRITEDATA - ld a,[$FF8C] ; the sprite to move + ld a,[H_SPRITEINDEX] dec a add a ld d,0 diff --git a/home/copy2.asm b/home/copy2.asm index e5f28383..f872ebbc 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -1,10 +1,10 @@ FarCopyData2:: -; Identical to FarCopyData, but uses $ff8b +; Identical to FarCopyData, but uses hROMBankTemp ; as temp space instead of wBuffer. - ld [$ff8b],a + ld [hROMBankTemp],a ld a,[H_LOADEDROMBANK] push af - ld a,[$ff8b] + ld a,[hROMBankTemp] ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a call CopyData @@ -15,10 +15,10 @@ FarCopyData2:: FarCopyData3:: ; Copy bc bytes from a:de to hl. - ld [$ff8b],a + ld [hROMBankTemp],a ld a,[H_LOADEDROMBANK] push af - ld a,[$ff8b] + ld a,[hROMBankTemp] ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a push hl @@ -38,10 +38,10 @@ FarCopyData3:: FarCopyDataDouble:: ; Expand bc bytes of 1bpp image data ; from a:hl to 2bpp data at de. - ld [$ff8b],a + ld [hROMBankTemp],a ld a,[H_LOADEDROMBANK] push af - ld a,[$ff8b] + ld a,[hROMBankTemp] ld [H_LOADEDROMBANK],a ld [MBC1RomBank],a .loop @@ -70,7 +70,7 @@ CopyVideoData:: ld [H_AUTOBGTRANSFERENABLED], a ld a, [H_LOADEDROMBANK] - ld [$ff8b], a + ld [hROMBankTemp], a ld a, b ld [H_LOADEDROMBANK], a @@ -94,7 +94,7 @@ CopyVideoData:: .done ld [H_VBCOPYSIZE], a call DelayFrame - ld a, [$ff8b] + ld a, [hROMBankTemp] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a pop af @@ -119,7 +119,7 @@ CopyVideoDataDouble:: xor a ; disable auto-transfer while copying ld [H_AUTOBGTRANSFERENABLED], a ld a, [H_LOADEDROMBANK] - ld [$ff8b], a + ld [hROMBankTemp], a ld a, b ld [H_LOADEDROMBANK], a @@ -143,7 +143,7 @@ CopyVideoDataDouble:: .done ld [H_VBCOPYDOUBLESIZE], a call DelayFrame - ld a, [$ff8b] + ld a, [hROMBankTemp] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a pop af diff --git a/home/overworld.asm b/home/overworld.asm index f4d6d695..da514763 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -444,7 +444,7 @@ CheckWarpsCollision:: ; 0706 (0:0706) ld a,[hli] ld [wDestinationWarpID],a ld a,[hl] - ld [$ff8b],a ; save target map + ld [hWarpDestinationMap],a jr WarpFound2 .retry1 inc hl @@ -466,7 +466,7 @@ WarpFound1:: ; 0735 (0:0735) ld a,[hli] ld [wDestinationWarpID],a ld a,[hli] - ld [$ff8b],a ; save target map + ld [hWarpDestinationMap],a WarpFound2:: ; 073c (0:073c) ld a,[wNumberOfWarps] @@ -481,8 +481,8 @@ WarpFound2:: ; 073c (0:073c) ld [wLastMap],a ld a,[W_CURMAPWIDTH] ld [wd366],a - ld a,[$ff8b] ; destination map number - ld [W_CURMAP],a ; change current map to destination map + ld a,[hWarpDestinationMap] + ld [W_CURMAP],a cp a,ROCK_TUNNEL_1 jr nz,.notRockTunnel ld a,$06 @@ -493,11 +493,11 @@ WarpFound2:: ; 073c (0:073c) jr .done ; for maps that can have the 0xFF destination map, which means to return to the outside map; not all these maps are necessarily indoors, though .indoorMaps - ld a,[$ff8b] ; destination map + ld a,[hWarpDestinationMap] ; destination map cp a,$ff jr z,.goBackOutside ; if not going back to the previous map - ld [W_CURMAP],a ; current map number + ld [W_CURMAP],a callba IsPlayerStandingOnWarpPadOrHole ld a,[wcd5b] dec a ; is the player on a warp pad? @@ -539,22 +539,22 @@ CheckMapConnections:: ; 07ba (0:07ba) jr nz,.checkEastMap ld a,[W_MAPCONN3PTR] ld [W_CURMAP],a - ld a,[wd38f] ; new X coordinate upon entering west map + ld a,[wWestConnectedMapXAlignment] ; new X coordinate upon entering west map ld [W_XCOORD],a ld a,[W_YCOORD] ld c,a - ld a,[wd38e] ; Y adjustment upon entering west map + ld a,[wWestConnectedMapYAlignment] ; Y adjustment upon entering west map add c ld c,a ld [W_YCOORD],a - ld a,[wd390] ; pointer to upper left corner of map without adjustment for Y position + ld a,[wWestConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for Y position ld l,a - ld a,[wd391] + ld a,[wWestConnectedMapViewPointer + 1] ld h,a srl c jr z,.savePointer1 .pointerAdjustmentLoop1 - ld a,[wd38d] ; width of connected map + ld a,[wWestConnectedMapWidth] ; width of connected map add a,$06 ld e,a ld d,$00 @@ -575,22 +575,22 @@ CheckMapConnections:: ; 07ba (0:07ba) jr nz,.checkNorthMap ld a,[W_MAPCONN4PTR] ld [W_CURMAP],a - ld a,[wd39a] ; new X coordinate upon entering east map + ld a,[wEastConnectedMapXAlignment] ; new X coordinate upon entering east map ld [W_XCOORD],a ld a,[W_YCOORD] ld c,a - ld a,[wd399] ; Y adjustment upon entering east map + ld a,[wEastConnectedMapYAlignment] ; Y adjustment upon entering east map add c ld c,a ld [W_YCOORD],a - ld a,[wd39b] ; pointer to upper left corner of map without adjustment for Y position + ld a,[wEastConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for Y position ld l,a - ld a,[wd39c] + ld a,[wEastConnectedMapViewPointer + 1] ld h,a srl c jr z,.savePointer2 .pointerAdjustmentLoop2 - ld a,[wd398] + ld a,[wEastConnectedMapWidth] add a,$06 ld e,a ld d,$00 @@ -610,19 +610,19 @@ CheckMapConnections:: ; 07ba (0:07ba) jr nz,.checkSouthMap ld a,[W_MAPCONN1PTR] ld [W_CURMAP],a - ld a,[wd378] ; new Y coordinate upon entering north map + ld a,[wNorthConnectedMapYAlignment] ; new Y coordinate upon entering north map ld [W_YCOORD],a ld a,[W_XCOORD] ld c,a - ld a,[wd379] ; X adjustment upon entering north map + ld a,[wNorthConnectedMapXAlignment] ; X adjustment upon entering north map add c ld c,a ld [W_XCOORD],a - ld a,[wd37a] ; pointer to upper left corner of map without adjustment for X position + ld a,[wNorthConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for X position ld l,a - ld a,[wd37b] + ld a,[wNorthConnectedMapViewPointer + 1] ld h,a - ld b,$00 + ld b,0 srl c add hl,bc ld a,l @@ -637,19 +637,19 @@ CheckMapConnections:: ; 07ba (0:07ba) jr nz,.didNotEnterConnectedMap ld a,[W_MAPCONN2PTR] ld [W_CURMAP],a - ld a,[wd383] ; new Y coordinate upon entering south map + ld a,[wSouthConnectedMapYAlignment] ; new Y coordinate upon entering south map ld [W_YCOORD],a ld a,[W_XCOORD] ld c,a - ld a,[wd384] ; X adjustment upon entering south map + ld a,[wSouthConnectedMapXAlignment] ; X adjustment upon entering south map add c ld c,a ld [W_XCOORD],a - ld a,[wd385] ; pointer to upper left corner of map without adjustment for X position + ld a,[wSouthConnectedMapViewPointer] ; pointer to upper left corner of map without adjustment for X position ld l,a - ld a,[wd386] + ld a,[wSouthConnectedMapViewPointer + 1] ld h,a - ld b,$00 + ld b,0 srl c add hl,bc ld a,l @@ -884,9 +884,9 @@ LoadTileBlockMap:: ; 09fc (0:09fc) ; a 3-byte border at the edges of the map is kept so that there is space for map connections ld hl,wOverworldMap ld a,[W_CURMAPWIDTH] - ld [$ff8c],a + ld [hMapWidth],a add a,$06 ; border (east and west) - ld [$ff8b],a ; map width + border + ld [hMapStride],a ; map width + border ld b,$00 ld c,a ; make space for north border (next 3 lines) @@ -903,7 +903,7 @@ LoadTileBlockMap:: ; 09fc (0:09fc) ld b,a .rowLoop ; copy one row each iteration push hl - ld a,[$ff8c] ; map width (without border) + ld a,[hMapWidth] ; map width (without border) ld c,a .rowInnerLoop ld a,[de] @@ -913,7 +913,7 @@ LoadTileBlockMap:: ; 09fc (0:09fc) jr nz,.rowInnerLoop ; add the map width plus the border to the base address of the current row to get the next row's address pop hl - ld a,[$ff8b] ; map width + border + ld a,[hMapStride] ; map width + border add l ld l,a jr nc,.noCarry @@ -926,72 +926,72 @@ LoadTileBlockMap:: ; 09fc (0:09fc) cp a,$ff jr z,.southConnection call SwitchToMapRomBank - ld a,[wd372] + ld a,[wNorthConnectionStripSrc] ld l,a - ld a,[wd373] + ld a,[wNorthConnectionStripSrc + 1] ld h,a - ld a,[wd374] + ld a,[wNorthConnectionStripDest] ld e,a - ld a,[wd375] + ld a,[wNorthConnectionStripDest + 1] ld d,a - ld a,[wd376] - ld [$ff8b],a - ld a,[wd377] - ld [$ff8c],a + ld a,[wNorthConnectionStripWidth] + ld [hNorthSouthConnectionStripWidth],a + ld a,[wNorthConnectedMapWidth] + ld [hNorthSouthConnectedMapWidth],a call LoadNorthSouthConnectionsTileMap .southConnection ld a,[W_MAPCONN2PTR] cp a,$ff jr z,.westConnection call SwitchToMapRomBank - ld a,[wd37d] + ld a,[wSouthConnectionStripSrc] ld l,a - ld a,[wd37e] + ld a,[wSouthConnectionStripSrc + 1] ld h,a - ld a,[wd37f] + ld a,[wSouthConnectionStripDest] ld e,a - ld a,[wd380] + ld a,[wSouthConnectionStripDest + 1] ld d,a - ld a,[wd381] - ld [$ff8b],a - ld a,[wd382] - ld [$ff8c],a + ld a,[wSouthConnectionStripWidth] + ld [hNorthSouthConnectionStripWidth],a + ld a,[wSouthConnectedMapWidth] + ld [hNorthSouthConnectedMapWidth],a call LoadNorthSouthConnectionsTileMap .westConnection ld a,[W_MAPCONN3PTR] cp a,$ff jr z,.eastConnection call SwitchToMapRomBank - ld a,[wd388] + ld a,[wWestConnectionStripSrc] ld l,a - ld a,[wd389] + ld a,[wWestConnectionStripSrc + 1] ld h,a - ld a,[wd38a] + ld a,[wWestConnectionStripDest] ld e,a - ld a,[wd38b] + ld a,[wWestConnectionStripDest + 1] ld d,a - ld a,[wd38c] + ld a,[wWestConnectionStripHeight] ld b,a - ld a,[wd38d] - ld [$ff8b],a + ld a,[wWestConnectedMapWidth] + ld [hEastWestConnectedMapWidth],a call LoadEastWestConnectionsTileMap .eastConnection ld a,[W_MAPCONN4PTR] cp a,$ff jr z,.done call SwitchToMapRomBank - ld a,[wd393] + ld a,[wEastConnectionStripSrc] ld l,a - ld a,[wd394] + ld a,[wEastConnectionStripSrc + 1] ld h,a - ld a,[wd395] + ld a,[wEastConnectionStripDest] ld e,a - ld a,[wd396] + ld a,[wEastConnectionStripDest + 1] ld d,a - ld a,[wd397] + ld a,[wEastConnectionStripHeight] ld b,a - ld a,[wd398] - ld [$ff8b],a + ld a,[wEastConnectedMapWidth] + ld [hEastWestConnectedMapWidth],a call LoadEastWestConnectionsTileMap .done ret @@ -1001,7 +1001,7 @@ LoadNorthSouthConnectionsTileMap:: ; 0ade (0:0ade) .loop push de push hl - ld a,[$ff8b] ; width of connection + ld a,[hNorthSouthConnectionStripWidth] ld b,a .innerLoop ld a,[hli] @@ -1011,7 +1011,7 @@ LoadNorthSouthConnectionsTileMap:: ; 0ade (0:0ade) jr nz,.innerLoop pop hl pop de - ld a,[$ff8c] ; width of connected map + ld a,[hNorthSouthConnectedMapWidth] add l ld l,a jr nc,.noCarry1 @@ -1040,7 +1040,7 @@ LoadEastWestConnectionsTileMap:: ; 0b02 (0:0b02) jr nz,.innerLoop pop de pop hl - ld a,[$ff8b] ; width of connected map + ld a,[hEastWestConnectedMapWidth] add l ld l,a jr nc,.noCarry1 @@ -2022,7 +2022,7 @@ LoadMapHeader:: ; 107c (0:107c) ld b,a res 7,a ld [W_CURMAPTILESET],a - ld [$ff8b],a + ld [hPreviousTileset],a bit 7,b ret nz ld hl,MapHeaderPointers @@ -2191,24 +2191,24 @@ LoadMapHeader:: ; 107c (0:107c) ld a,[hli] ld [de],a ; store movement byte 1 at C2X6 ld a,[hli] - ld [$ff8d],a ; save movement byte 2 + ld [hLoadSpriteTemp1],a ; save movement byte 2 ld a,[hli] - ld [$ff8e],a ; save text ID and flags byte + ld [hLoadSpriteTemp2],a ; save text ID and flags byte push bc push hl ld b,$00 ld hl,W_MAPSPRITEDATA add hl,bc - ld a,[$ff8d] + ld a,[hLoadSpriteTemp1] ld [hli],a ; store movement byte 2 in byte 0 of sprite entry - ld a,[$ff8e] + ld a,[hLoadSpriteTemp2] ld [hl],a ; this appears pointless, since the value is overwritten immediately after - ld a,[$ff8e] - ld [$ff8d],a + ld a,[hLoadSpriteTemp2] + ld [hLoadSpriteTemp1],a and a,$3f ld [hl],a ; store text ID in byte 1 of sprite entry pop hl - ld a,[$ff8d] + ld a,[hLoadSpriteTemp1] bit 6,a jr nz,.trainerSprite bit 7,a @@ -2216,25 +2216,25 @@ LoadMapHeader:: ; 107c (0:107c) jr .regularSprite .trainerSprite ld a,[hli] - ld [$ff8d],a ; save trainer class + ld [hLoadSpriteTemp1],a ; save trainer class ld a,[hli] - ld [$ff8e],a ; save trainer number (within class) + ld [hLoadSpriteTemp2],a ; save trainer number (within class) push hl ld hl,W_MAPSPRITEEXTRADATA add hl,bc - ld a,[$ff8d] + ld a,[hLoadSpriteTemp1] ld [hli],a ; store trainer class in byte 0 of the entry - ld a,[$ff8e] + ld a,[hLoadSpriteTemp2] ld [hl],a ; store trainer number in byte 1 of the entry pop hl jr .nextSprite .itemBallSprite ld a,[hli] - ld [$ff8d],a ; save item number + ld [hLoadSpriteTemp1],a ; save item number push hl ld hl,W_MAPSPRITEEXTRADATA add hl,bc - ld a,[$ff8d] + ld a,[hLoadSpriteTemp1] ld [hli],a ; store item number in byte 0 of the entry xor a ld [hl],a ; zero byte 1, since it is not used diff --git a/hram.asm b/hram.asm index b0d5a942..a05f3d18 100644 --- a/hram.asm +++ b/hram.asm @@ -1,9 +1,3 @@ - -H_SPRITEWIDTH EQU $FF8B ; in tiles -H_SPRITEINTERLACECOUNTER EQU $FF8B -H_SPRITEHEIGHT EQU $FF8C ; in tiles -H_SPRITEOFFSET EQU $FF8D - hSoftReset EQU $FF8A ; Initialized to 16. ; Decremented each input iteration if the player @@ -12,8 +6,28 @@ hSoftReset EQU $FF8A hBaseTileID EQU $FF8B +; 3-byte BCD number hItemPrice EQU $FF8B +hDexWeight EQU $FF8B + +hWarpDestinationMap EQU $FF8B + +hOAMTile EQU $FF8B + +hROMBankTemp EQU $FF8B + +hPreviousTileset EQU $FF8B + +hEastWestConnectedMapWidth EQU $FF8B + +hSlideAmount EQU $FF8B + +H_SPRITEWIDTH EQU $FF8B ; in tiles +H_SPRITEINTERLACECOUNTER EQU $FF8B +H_SPRITEHEIGHT EQU $FF8C ; in tiles +H_SPRITEOFFSET EQU $FF8D + ; counters for blinking down arrow H_DOWNARROWBLINKCNT1 EQU $FF8B H_DOWNARROWBLINKCNT2 EQU $FF8C @@ -21,11 +35,40 @@ H_DOWNARROWBLINKCNT2 EQU $FF8C H_SPRITEDATAOFFSET EQU $FF8B H_SPRITEINDEX EQU $FF8C +hMapStride EQU $FF8B +hMapWidth EQU $FF8C + +hNorthSouthConnectionStripWidth EQU $FF8B +hNorthSouthConnectedMapWidth EQU $FF8C + ; DisplayTextID's argument hSpriteIndexOrTextID EQU $FF8C hPartyMonIndex EQU $FF8C +; the total number of tiles being shifted each time the pic slides by one tile +hSlidingRegionSize EQU $FF8C + +; 2 bytes +hEnemySpeed EQU $FF8D + +hVRAMSlot EQU $FF8D + +hFourTileSpriteCount EQU $FF8E + +; -1 = left +; 0 = right +hSlideDirection EQU $FF8D + +hSpriteFacingDirection EQU $FF8D + +hSpriteMovementByte2 EQU $FF8D + +hSpriteImageIndex EQU $FF8D + +hLoadSpriteTemp1 EQU $FF8D +hLoadSpriteTemp2 EQU $FF8E + hHalveItemPrices EQU $FF8E hSpriteOffset2 EQU $FF8F diff --git a/macros.asm b/macros.asm index 6a693a0b..9899ec29 100644 --- a/macros.asm +++ b/macros.asm @@ -13,6 +13,10 @@ dex EQUS "db $5f, $50" ; End a Pokedex entry. percent EQUS "* $ff / 100" +lb: MACRO ; r, hi, lo + ld \1, (\2) << 8 + (\3) + ENDM + ; Constant enumeration is useful for monsters, items, moves, etc. const_def: MACRO @@ -530,7 +534,7 @@ ENDM SOUTH_MAP_CONNECTION: MACRO db \1 ; map id dw \6 + \4 ; "Conection Strip" location - dw wOverworldMap + 3 + (\8 + 3) * (\7 + 6) + \3 ; current map positoin + dw wOverworldMap + 3 + (\8 + 3) * (\7 + 6) + \3 ; current map position db \5 ; width of connection strip db \2 ; map width db 0 ; y alignment (y coordinate of player when entering map) diff --git a/main.asm b/main.asm index 3bc5989a..9ceb5f81 100755 --- a/main.asm +++ b/main.asm @@ -996,7 +996,7 @@ DisplayTextIDInit: ; 7096 (1:7096) ld a,[wAutoTextBoxDrawingControl] bit 0,a jr nz,.skipDrawingTextBoxBorder - ld a,[$ff8c] ; text ID (or sprite ID) + ld a,[hSpriteIndexOrTextID] ; text ID (or sprite ID) and a jr nz,.notStartMenu ; if text ID is 0 (i.e. the start menu) @@ -2094,7 +2094,7 @@ IsPlayerStandingOnWarp: ; c35f (3:435f) ld a, [hli] ; target warp ld [wDestinationWarpID], a ld a, [hl] ; target map - ld [$ff8b], a + ld [hWarpDestinationMap], a ld hl, wd736 set 2, [hl] ; standing on warp flag ret @@ -2593,7 +2593,7 @@ ApplyOutOfBattlePoisonDamage: ; c69c (3:469c) ld [wJoyIgnore], a call EnableAutoTextBoxDrawing ld a, $d0 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID pop de pop hl @@ -2640,7 +2640,7 @@ ApplyOutOfBattlePoisonDamage: ; c69c (3:469c) jr nz, .noBlackOut call EnableAutoTextBoxDrawing ld a, $d1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72e set 5, [hl] @@ -2692,7 +2692,7 @@ LoadTilesetHeader: ; c754 (3:4754) jr c, .asm_c797 ld a, [W_CURMAPTILESET] ld b, a - ld a, [$ff8b] + ld a, [hPreviousTileset] cp b jr z, .done .asm_c797 @@ -3454,15 +3454,15 @@ TryPushingBoulder: ; f225 (3:7225) bit 1, a ; has boulder dust animation from previous push played yet? ret nz xor a - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call IsSpriteInFrontOfPlayer - ld a, [$ff8c] + ld a, [hSpriteIndexOrTextID] ld [wBoulderSpriteIndex], a and a jp z, ResetBoulderPushFlags ld hl, wSpriteStateData1 + 1 ld d, $0 - ld a, [$ff8c] + ld a, [hSpriteIndexOrTextID] swap a ld e, a add hl, de diff --git a/scripts/agatha.asm b/scripts/agatha.asm index cc209553..e65b1fa2 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -76,7 +76,7 @@ AgathaScript0: ; 76490 (1d:6490) jr z, AgathaScript_76474 .asm_764b4 ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -112,7 +112,7 @@ AgathaScript2: ; 764ed (1d:64ed) cp $ff jp z, AgathaScript_76464 ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [W_GARYCURSCRIPT], a diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 5de02d83..115b3b19 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -23,7 +23,7 @@ BillsHouseScript1: ; 1e783 (7:6783) ld de, MovementData_1e7a0 .notDown ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 ld [W_BILLSHOUSECURSCRIPT], a @@ -82,7 +82,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5) ld c, 8 call DelayFrames ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld de, MovementData_1e807 call MoveSprite ld a, $4 @@ -113,7 +113,7 @@ BillsHouseScript4: ; 1e80d (7:680d) BillsHouseScript5: ; 1e827 (7:6827) ld a, $4 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $0 ld [W_BILLSHOUSECURSCRIPT], a diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 257a830b..bd28917c 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -76,7 +76,7 @@ BrunoScript0: ; 76339 (1d:6339) jr z, BrunoScript_7631d .asm_7635d ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -112,7 +112,7 @@ BrunoScript2: ; 76396 (1d:6396) cp $ff jp z, BrunoScript_7630d ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID BrunoTextPointers: ; 763a8 (1d:63a8) diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 3bcdf3a3..b9c006d1 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -58,10 +58,10 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) ld a, $f0 ld [wJoyIgnore], a ld a, $d - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $b - ld [H_SPRITEHEIGHT], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_48c5a ld a, [W_YCOORD] @@ -76,7 +76,7 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) ld de, MovementData_48c63 .asm_48c4d ld a, $b - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 ld [W_CELADONGAMECORNERCURSCRIPT], a diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 4793bf14..b978b272 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -44,7 +44,7 @@ CeladonGymScript3: ; 48956 (12:4956) CeladonGymText_48963: ; 48963 (12:4963) ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd77c set 1, [hl] @@ -52,14 +52,14 @@ CeladonGymText_48963: ; 48963 (12:4963) call GiveItem jr nc, .BagFull ld a, $a - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd77c set 0, [hl] jr .asm_4898c .BagFull ld a, $b - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_4898c ld hl, W_OBTAINEDBADGES diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 3565b809..20873a81 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -28,7 +28,7 @@ CeruleanCityScript4: ; 194a7 (6:54a7) ld hl, wd75b set 7, [hl] ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -55,7 +55,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [wSpriteStateData1 + $29], a call Delay3 ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID .asm_194f7 ld a, [wd75a] @@ -82,9 +82,9 @@ CeruleanCityScript0: ; 194c8 (6:54c8) cp $14 jr z, .asm_19535 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, $5 - ld [$ff8b], a + ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData2 ld [hl], $19 .asm_19535 @@ -93,7 +93,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) predef ShowObject ld de, CeruleanCityMovement1 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $1 ld [W_CERULEANCITYCURSCRIPT], a @@ -117,9 +117,9 @@ CeruleanCityMovement1: ; 19559 (6:5559) CeruleanCityScript_1955d: ; 1955d (6:555d) ld a,1 - ld [$ff8c],a + ld [H_SPRITEINDEX],a xor a ; SPRITE_FACING_DOWN - ld [$ff8d],a + ld [hSpriteFacingDirection],a jp SetSpriteFacingDirectionAndDelay ; face object CeruleanCityScript1: ; 19567 (6:5567) @@ -129,7 +129,7 @@ CeruleanCityScript1: ; 19567 (6:5567) xor a ld [wJoyIgnore], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] @@ -173,14 +173,14 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld hl, wd75a set 0, [hl] ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wc0ee], a call PlaySound callba Music_RivalAlternateStart ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, [W_XCOORD] cp $14 @@ -191,7 +191,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld de, CeruleanCityMovement3 .asm_195f3 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $3 ld [W_CERULEANCITYCURSCRIPT], a @@ -295,7 +295,7 @@ CeruleanCityText2: ; 1967c (6:567c) ld hl, CeruleanCityText_196ee ld de, CeruleanCityText_196ee call SaveEndBattleTextPointers - ld a, [$ff8c] + ld a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index a6cb4c64..2343af03 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -44,7 +44,7 @@ CeruleanGymScript3: ; 5c700 (17:4700) CeruleanGymScript_5c70d: ; 5c70d (17:470d) ld a, $5 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd75e set 7, [hl] @@ -52,14 +52,14 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) call GiveItem jr nc, .BagFull ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd75e set 6, [hl] jr .asm_5c736 .BagFull ld a, $7 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c736 ld hl, W_OBTAINEDBADGES diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index b3d6def6..dbede0d3 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -37,7 +37,7 @@ CinnabarGymScript_75792: ; 75792 (1d:5792) ret CinnabarGymScript_757a0: ; 757a0 (1d:57a0) - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [hSpriteIndexOrTextID] ld [wTrainerHeaderFlagBit], a ret @@ -51,7 +51,7 @@ CinnabarGymScript0: ; 757ae (1d:57ae) ld a, [wda38] and a ret z - ld [$ff8c], a + ld [H_SPRITEINDEX], a cp $4 jr nz, .asm_757c3 ld a, $4 @@ -86,7 +86,7 @@ CinnabarGymScript1: ; 757dc (1d:57dc) ld [wJoyIgnore], a ld a, [wda38] ld [wTrainerHeaderFlagBit], a - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID CinnabarGymScript_757f1: ; 757f1 (1d:57f1) @@ -139,7 +139,7 @@ CinnabarGymScript3: ; 7584a (1d:584a) ld [wJoyIgnore], a CinnabarGymScript3_75857: ; 75857 (1d:5857) ld a, $a - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd79a set 1, [hl] @@ -147,14 +147,14 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) call GiveItem jr nc, .BagFull ld a, $b - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd79a set 0, [hl] jr .asm_75880 .BagFull ld a, $c - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_75880 ld hl, W_OBTAINEDBADGES @@ -189,7 +189,7 @@ CinnabarGymTextPointers: ; 7589f (1d:589f) dw TM38NoRoomText CinnabarGymScript_758b7: ; 758b7 (1d:58b7) - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index 33a497c4..70ea25a5 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -27,7 +27,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld a, $8 ld [wd528], a ld a, $8 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index 1b118f55..8a4a0464 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -45,12 +45,12 @@ FightingDojoScript1: ; 5cd83 (17:4d83) ld a, $1 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_LEFT - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ret @@ -64,9 +64,9 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6) ld a, $1 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_LEFT - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay .asm_5cde4 @@ -76,7 +76,7 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6) or $3e ld [wd7b1], a ld a, $8 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -148,7 +148,7 @@ FightingDojoText1: ; 5ce44 (17:4e44) ld hl, FightingDojoText_5ce93 ld de, FightingDojoText_5ce93 call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ld a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index f88f0055..843e7293 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -44,7 +44,7 @@ FuchsiaGymScript3: ; 7548a (1d:548a) ld [wJoyIgnore], a FuchsiaGymScript3_75497: ; 75497 (1d:5497) ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd792 set 1, [hl] @@ -52,14 +52,14 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497) call GiveItem jr nc, .BagFull ld a, $a - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd792 set 0, [hl] jr .asm_754c0 .BagFull ld a, $b - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_754c0 ld hl, W_OBTAINEDBADGES diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm index 12b49297..f758b49e 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/fuchsiahouse2.asm @@ -3,7 +3,7 @@ FuchsiaHouse2Script: ; 750b5 (1d:50b5) FuchsiaHouse2TextPointers: ; 750b8 (1d:50b8) dw FuchsiaHouse2Text1 - dw Predef5CText + dw PickUpItemText dw BoulderText dw FuchsiaHouse2Text4 dw FuchsiaHouse2Text5 diff --git a/scripts/gary.asm b/scripts/gary.asm index 59989b5f..476a59b0 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -55,7 +55,7 @@ GaryScript2: ; 75f6a (1d:5f6a) ld hl, W_OPTIONS res 7, [hl] ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld hl, wd72d @@ -99,10 +99,10 @@ GaryScript3: ; 75fbb (1d:5fbb) ld a, $f0 ld [wJoyIgnore], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, $4 ld [W_GARYCURSCRIPT], a @@ -111,14 +111,14 @@ GaryScript3: ; 75fbb (1d:5fbb) GaryScript4: ; 75fe4 (1d:5fe4) callba Music_Cities1AlternateTempo ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_76014 ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, HS_CHAMPIONS_ROOM_OAK ld [wcc4d], a @@ -142,17 +142,17 @@ GaryScript5: ; 7601a (1d:601a) ld a, $2 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_LEFT - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a - call SetSpriteFacingDirectionAndDelay ; face object + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 ld [W_GARYCURSCRIPT], a @@ -160,12 +160,12 @@ GaryScript5: ; 7601a (1d:601a) GaryScript6: ; 76047 (1d:6047) ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_RIGHT - ld [$ff8d], a - call SetSpriteFacingDirectionAndDelay ; face object + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay ld a, $4 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 ld [W_GARYCURSCRIPT], a @@ -173,16 +173,16 @@ GaryScript6: ; 76047 (1d:6047) GaryScript7: ; 7605f (1d:605f) ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a - call SetSpriteFacingDirectionAndDelay ; face object + ld [hSpriteFacingDirection], a + call SetSpriteFacingDirectionAndDelay ld a, $5 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld de, MovementData_76080 ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $8 ld [W_GARYCURSCRIPT], a diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index cb2c1fad..680ebdd9 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -83,10 +83,10 @@ HallofFameRoomScript1: ; 5a52b (16:652b) ld a, $1 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld a, SPRITE_FACING_LEFT - ld [$ff8d], a + ld a, $8 + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call Delay3 xor a @@ -94,7 +94,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b) inc a ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a diff --git a/scripts/lance.asm b/scripts/lance.asm index c11bec2f..e335914b 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -64,7 +64,7 @@ LanceScript0: ; 5a305 (16:6305) cp $3 jr nc, .asm_5a325 ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID .asm_5a325 cp $5 @@ -93,7 +93,7 @@ LanceScript2: ; 5a349 (16:6349) cp $ff jp z, LanceScript_5a2f5 ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID LanceScript_5a35b: ; 5a35b (16:635b) diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 7e800467..1f1fcde0 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -77,7 +77,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) jr z, LoreleiScript_761c6 .asm_76206 ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, D_UP ld [wSimulatedJoypadStatesEnd], a @@ -112,7 +112,7 @@ LoreleiScript2: ; 7623f (1d:623f) cp $ff jp z, LoreleiScript_761b6 ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID LoreleiTextPointers: ; 76251 (1d:6251) diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index d658b425..6673e03b 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -53,7 +53,7 @@ Mansion1Script_Switches: ; 44316 (11:4316) xor a ld [hJoyHeld], a ld a, $4 - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Mansion1ScriptPointers: ; 44326 (11:4326) @@ -63,8 +63,8 @@ Mansion1ScriptPointers: ; 44326 (11:4326) Mansion1TextPointers: ; 4432c (11:432c) dw Mansion1Text1 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw Mansion1Text4 Mansion1TrainerHeaders: ; 44334 (11:4334) diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 40827be1..27ccbdfb 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -49,7 +49,7 @@ Mansion2Script_Switches: ; 52037 (14:6037) xor a ld [hJoyHeld], a ld a, $5 - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Mansion2ScriptPointers: ; 52047 (14:6047) @@ -59,7 +59,7 @@ Mansion2ScriptPointers: ; 52047 (14:6047) Mansion2TextPointers: ; 5204d (14:604d) dw Mansion2Text1 - dw Predef5CText + dw PickUpItemText dw Mansion2Text3 dw Mansion2Text4 dw Mansion2Text5 diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index dfecde99..fa31718f 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -80,14 +80,14 @@ Mansion3Script_Switches: ; 5227a (14:627a) xor a ld [hJoyHeld], a ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Mansion3TextPointers: ; 5228a (14:628a) dw Mansion3Text1 dw Mansion3Text2 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw Mansion3Text5 dw Mansion3Text6 diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index c23cb2d7..68e74fd5 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -51,7 +51,7 @@ Mansion4Script_Switches: ; 52420 (14:6420) xor a ld [hJoyHeld], a ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Mansion4ScriptPointers: ; 52430 (14:6430) @@ -62,12 +62,12 @@ Mansion4ScriptPointers: ; 52430 (14:6430) Mansion4TextPointers: ; 52436 (14:6436) dw Mansion4Text1 dw Mansion4Text2 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw Mansion4Text7 - dw Predef5CText + dw PickUpItemText dw Mansion3Text6 Mansion4TrainerHeaders: ; 52448 (14:6448) diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm index 6c9fcd88..868b70d1 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/mtmoon1.asm @@ -20,12 +20,12 @@ MtMoon1TextPointers: ; 499e1 (12:59e1) dw MtMoon1Text5 dw MtMoon1Text6 dw MtMoon1Text7 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw MtMoon1Text14 MtMoon1TrainerHeaders: ; 499fd (12:59fd) diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 7c6e987e..ee163738 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -66,7 +66,7 @@ MtMoon3Script0: ; 49d6f (12:5d6f) xor a ld [hJoyHeld], a ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID MtMoon3Script_49d91: ; 49d91 (12:5d91) @@ -92,7 +92,7 @@ MtMoon3Script3: ; 49d9a (12:5d9a) MtMoon3Script4: ; 49dba (12:5dba) ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld hl, CoordsData_49dea call ArePlayerCoordsInArray @@ -106,7 +106,7 @@ MtMoon3Script4: ; 49dba (12:5dba) ld de, MovementData_49df8 .asm_49dda ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $5 ld [W_MTMOON3CURSCRIPT], a @@ -140,7 +140,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb) ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld a, $a - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, [wd7f6] bit 6, a @@ -167,8 +167,8 @@ MtMoon3TextPointers: ; 49e34 (12:5e34) dw MtMoon3Text5 dw MtMoon3Text6 dw MtMoon3Text7 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw MtMoon3Text_49f99 MtMoon3TrainerHeaders: ; 49e48 (12:5e48) diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 26c7f02d..38c3f717 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -25,7 +25,7 @@ Museum1FScript0: ; 5c10d (17:410d) xor a ld [hJoyHeld], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Museum1FScript1: ; 5c12a (17:412a) @@ -69,7 +69,7 @@ Museum1FText1: ; 5c135 (17:4135) call PrintText jp Museum1FScriptEnd .asm_3ded4 - ld a, $13 + ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID xor a @@ -96,15 +96,15 @@ Museum1FText1: ; 5c135 (17:4135) ld hl, wd754 set 0, [hl] xor a - ld [wWhichTrade], a - ld [wTrainerEngageDistance], a + ld [wMuseumPriceTemp], a + ld [wMuseumPriceTemp + 1], a ld a, $50 - ld [wTrainerFacingDirection], a - ld hl, wTrainerFacingDirection + ld [wMuseumPriceTemp + 2], a + ld hl, wMuseumPriceTemp + 2 ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef - ld a, $13 + ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID ld a, (SFX_02_5a - SFX_Headers_02) / 3 diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 992b6887..5463b879 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -89,13 +89,13 @@ OaksLabScript3: ; 1cba2 (7:4ba2) call StartSimulatingJoypadStates ld a, $1 ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + xor a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $5 ld [H_SPRITEINDEX], a - xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + xor a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $4 @@ -117,7 +117,7 @@ OaksLabScript4: ; 1cbd2 (7:4bd2) ld a, $1 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call UpdateSprites ld hl, W_FLAGS_D733 @@ -132,19 +132,19 @@ OaksLabScript5: ; 1cbfd (7:4bfd) ld a, $fc ld [wJoyIgnore], a ld a, $11 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, $12 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, $13 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, $14 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd74b set 1, [hl] @@ -162,16 +162,16 @@ OaksLabScript6: ; 1cc36 (7:4c36) ld a, $5 ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $1 ld [H_SPRITEINDEX], a xor a - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call UpdateSprites ld a, $c - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a @@ -261,7 +261,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) ld a, $1 ld [H_SPRITEINDEX], a ld a, $4 - ld [$ff8b], a + ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 push hl ld [hl], $4c @@ -302,10 +302,10 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld a, $1 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $d - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, [wTrainerEngageDistance] cp $2 @@ -331,10 +331,10 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld a, $1 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $e - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd74b set 2, [hl] @@ -352,7 +352,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d) ld a, $1 ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $8 ld [wd528], a @@ -360,7 +360,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $f - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [hNPCPlayerRelativePosPerspective], a @@ -432,7 +432,7 @@ OaksLabScript12: ; 1ce03 (7:4e03) ld a, $1 ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay predef HealParty ld hl, wd74b @@ -446,7 +446,7 @@ OaksLabScript13: ; 1ce32 (7:4e32) ld c, 20 call DelayFrames ld a, $10 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID callba Music_RivalAlternateStart ld a, $1 @@ -522,7 +522,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) call PlaySound callba Music_RivalAlternateStart ld a, $15 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call OaksLabScript_1d02b ld a, HS_OAKS_LAB_RIVAL @@ -549,12 +549,12 @@ OaksLabScript_1cefd: ; 1cefd (7:4efd) ld a, $1 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $8 ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN - ld [$ff8d], a + ld [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay OaksLabScript16: ; 1cf12 (7:4f12) @@ -567,21 +567,21 @@ OaksLabScript16: ; 1cf12 (7:4f12) ld [wJoyIgnore], a call OaksLabScript_1cefd ld a, $16 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame call OaksLabScript_1cefd ld a, $17 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame call OaksLabScript_1cefd ld a, $18 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call DelayFrame ld a, $19 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, HS_POKEDEX_1 @@ -592,16 +592,16 @@ OaksLabScript16: ; 1cf12 (7:4f12) predef HideObject call OaksLabScript_1cefd ld a, $1a - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_RIGHT - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call Delay3 ld a, $1b - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd74b set 5, [hl] @@ -856,13 +856,13 @@ OaksLabScript_1d157: ; 1d157 (7:5157) ld a, $5 ld [H_SPRITEINDEX], a ld a, $9 - ld [$ff8b], a + ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 ld [hl], $0 ld a, $1 ld [H_SPRITEINDEX], a ld a, $9 - ld [$ff8b], a + ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 ld [hl], $c ld hl, wd730 @@ -962,7 +962,7 @@ OaksLabScript_1d22d: ; 1d22d (7:522d) ld a, $5 ld [H_SPRITEINDEX], a ld a, $9 - ld [$ff8b], a + ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 ld [hl], $0 ld hl, OaksLabLastMonText diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index 5b042066..327a32ff 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -67,7 +67,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ld a,1 ld [H_SPRITEINDEX],a ld a,SPRITE_FACING_UP - ld [$FF8D],a + ld [hSpriteFacingDirection],a call SetSpriteFacingDirectionAndDelay call Delay3 ld a,1 diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 460eab5c..94d23caa 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -31,7 +31,7 @@ PewterCityScript_1925e: ; 1925e (6:525e) ld a, $f0 ld [wJoyIgnore], a ld a, $5 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID CoordsData_19277: ; 19277 (6:5277) @@ -48,16 +48,16 @@ PewterCityScript1: ; 19280 (6:5280) ld a, $3 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, ($3 << 4) | SPRITE_FACING_UP - ld [$ff8d], a + ld [hSpriteImageIndex], a call SetSpriteImageIndexAfterSettingFacingDirection call PlayDefaultMusic ld hl, wFlags_0xcd60 set 4, [hl] ld a, $d - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3c ld [$ffeb], a @@ -71,7 +71,7 @@ PewterCityScript1: ; 19280 (6:5280) ld [wSpriteIndex], a call SetSpritePosition1 ld a, $3 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld de, MovementData_PewterMuseumGuyExit call MoveSprite ld a, $2 @@ -114,18 +114,18 @@ PewterCityScript4: ; 19305 (6:5305) and a ret nz ld a, $5 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_LEFT - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, ($1 << 4) | SPRITE_FACING_LEFT - ld [$ff8d], a + ld [hSpriteImageIndex], a call SetSpriteImageIndexAfterSettingFacingDirection call PlayDefaultMusic ld hl, wFlags_0xcd60 set 4, [hl] ld a, $e - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3c ld [$ffeb], a @@ -139,7 +139,7 @@ PewterCityScript4: ; 19305 (6:5305) ld [wSpriteIndex], a call SetSpritePosition1 ld a, $5 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld de, MovementData_PewterGymGuyExit call MoveSprite ld a, $5 diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index f4b2ad28..9f1493d4 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -44,7 +44,7 @@ PewterGymScript3: ; 5c3d2 (17:43d2) PewterGymScript_5c3df: ; 5c3df (17:43df) ld a, $4 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd755 set 7, [hl] @@ -52,14 +52,14 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) call GiveItem jr nc, .BagFull ld a, $5 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd755 set 6, [hl] jr .asm_5c408 .BagFull ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c408 ld hl, W_OBTAINEDBADGES diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 286b8202..8520b10b 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -31,7 +31,7 @@ PokemonTower2Script0: ; 6050f (18:450f) call PlayMusic ld hl, wd764 res 6, [hl] - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 ld a, $8 ld b, SPRITE_FACING_DOWN @@ -43,12 +43,12 @@ PokemonTower2Script0: ; 6050f (18:450f) .asm_60544 ld [wd528], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a ld a, b - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a @@ -69,7 +69,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld hl, wd764 set 7, [hl] ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld de, MovementData_605b2 ld a, [wd764] @@ -78,7 +78,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld de, MovementData_605a9 .asm_60589 ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $ff ld [wc0ee], a diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm index 2cf58381..9d08aec4 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -16,7 +16,7 @@ PokemonTower3TextPointers: ; 606e5 (18:46e5) dw PokemonTower3Text1 dw PokemonTower3Text2 dw PokemonTower3Text3 - dw Predef5CText + dw PickUpItemText PokemonTower3TrainerHeaders: ; 606ed (18:46ed) PokemonTower3TrainerHeader0: ; 606ed (18:46ed) diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm index 4f375657..c4732397 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/pokemontower4.asm @@ -16,9 +16,9 @@ PokemonTower4TextPointers: ; 6080f (18:480f) dw PokemonTower4Text1 dw PokemonTower4Text2 dw PokemonTower4Text3 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText PokemonTower4TrainerHeaders: ; 6081b (18:481b) PokemonTower4TrainerHeader0: ; 6081b (18:481b) diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index 34dd3204..9ef5d419 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -38,7 +38,7 @@ PokemonTower5Script0: ; 6094b (18:494b) call Delay3 call GBFadeInFromWhite ld a, $7 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -57,7 +57,7 @@ PokemonTower5TextPointers: ; 6099b (18:499b) dw PokemonTower5Text3 dw PokemonTower5Text4 dw PokemonTower5Text5 - dw Predef5CText + dw PickUpItemText dw PokemonTower5Text7 PokemonTower5TrainerHeaders: ; 609a9 (18:49a9) diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index e0e75cb1..e9412fb0 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -31,7 +31,7 @@ PokemonTower6Script0: ; 60b17 (18:4b17) xor a ld [hJoyHeld], a ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, MAROWAK ld [W_CUROPPONENT], a @@ -63,7 +63,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ld hl, wd768 set 7, [hl] ld a, $7 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -100,8 +100,8 @@ PokemonTower6TextPointers: ; 60bb1 (18:4bb1) dw PokemonTower6Text1 dw PokemonTower6Text2 dw PokemonTower6Text3 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw PokemonTower6Text6 dw PokemonTower6Text7 diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 0f9741ab..60635f20 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -31,7 +31,7 @@ PokemonTower7Script2: ; 60d23 (18:4d23) ld a, $f0 ld [wJoyIgnore], a ld a, [wSpriteIndex] - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call PokemonTower7Script_60db6 ld a, $3 @@ -72,7 +72,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86) ld a, SPRITE_FACING_UP ld [wSpriteStateData1 + 9], a ld a, LAVENDER_HOUSE_1 - ld [H_DOWNARROWBLINKCNT1], a + ld [hWarpDestinationMap], a ld a, $1 ld [wDestinationWarpID], a ld a, LAVENDER_TOWN @@ -107,7 +107,7 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6) ld d, [hl] ld e, a ld a, [wSpriteIndex] - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a jp MoveSprite .asm_60dde inc hl diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index 25597654..0026d525 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -22,11 +22,11 @@ PowerPlantTextPointers: ; 1e2df (7:62df) dw PowerPlantText7 dw PowerPlantText8 dw PowerPlantText9 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText PowerPlantTrainerHeaders: ; 1e2fb (7:62fb) PowerPlantTrainerHeader0: ; 1e2fb (7:62fb) diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index fe5a47e6..967ab77b 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -43,8 +43,8 @@ RocketHideout1TextPointers: ; 44c14 (11:4c14) dw RocketHideout1Text3 dw RocketHideout1Text4 dw RocketHideout1Text5 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText RocketHideout1TrainerHeaders: ; 44c22 (11:4c22) RocketHideout1TrainerHeader0: ; 44c22 (11:4c22) diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index bb4dd3ec..c2184bdb 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -415,10 +415,10 @@ SpinnerArrowAnimTiles: ; 45087 (11:5087) RocketHideout2TextPointers: ; 450c7 (11:50c7) dw RocketHideout2Text1 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText RocketHideout2TrainerHeaders: ; 450d1 (11:50d1) RocketHideout2TrainerHeader0: ; 450d1 (11:50d1) diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index f2f7ed91..b025acd0 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -146,8 +146,8 @@ RocketHideout3Script3: ; 452e4 (11:452e4) RocketHideout3TextPointers: ; 452fa (11:52fa) dw RocketHideout3Text1 dw RocketHideout3Text2 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText RocketHideout3TrainerHeaders: ; 45302 (11:5302) RocketHideout3TrainerHeader0: ; 45302 (11:5302) diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 613e2476..635c6095 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -56,7 +56,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6) ld hl, wd81b set 7, [hl] ld a, $a - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI @@ -81,11 +81,11 @@ RocketHideout4TextPointers: ; 45501 (11:5501) dw RocketHideout4Text2 dw RocketHideout4Text3 dw RocketHideout4Text4 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw RocketHideout4Text10 RocketHideout4TrainerHeaders: ; 45515 (11:5515) diff --git a/scripts/route12.asm b/scripts/route12.asm index eed676b3..8fe9d8f7 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -28,7 +28,7 @@ Route12Script0: ; 59619 (16:5619) res 6, [hl] jp z, CheckFightingMapTrainers ld a, $d - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX ld [W_CUROPPONENT], a @@ -51,7 +51,7 @@ Route12Script3: ; 5964c (16:564c) cp $2 jr z, .asm_59664 ld a, $e - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_59664 ld hl, wd7d8 @@ -71,8 +71,8 @@ Route12TextPointers: ; 59675 (16:5675) dw Route12Text6 dw Route12Text7 dw Route12Text8 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw Route12Text11 dw Route12Text12 dw Route12Text13 diff --git a/scripts/route15.asm b/scripts/route15.asm index 3aa23bbb..fe70d2b4 100755 --- a/scripts/route15.asm +++ b/scripts/route15.asm @@ -23,7 +23,7 @@ Route15TextPointers: ; 597c7 (16:57c7) dw Route15Text8 dw Route15Text9 dw Route15Text10 - dw Predef5CText + dw PickUpItemText dw Route15Text12 Route15TrainerHeaders: ; 597df (16:57df) diff --git a/scripts/route16.asm b/scripts/route16.asm index b6c49a96..cdf436a5 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -28,7 +28,7 @@ Route16Script0: ; 59959 (16:5959) res 0, [hl] jp z, CheckFightingMapTrainers ld a, $a - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX ld [W_CUROPPONENT], a @@ -52,7 +52,7 @@ Route16Script3: ; 5998f (16:598f) cp $2 jr z, .asm_599a8 ld a, $b - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_599a8 ld hl, wd7e0 diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index 8e3d8e5b..801e577e 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -19,14 +19,14 @@ Route16GateScript0: ; 496d7 (12:56d7) call ArePlayerCoordsInArray ret nc ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr z, .asm_4970e - ld a, [wWhichTrade] + ld a, [wCoordIndex] dec a ld [wSimulatedJoypadStatesIndex], a ld b, $0 @@ -59,7 +59,7 @@ Route16GateScript1: ; 4971d (12:571d) Route16GateScript2: ; 49727 (12:5727) ld a, $1 - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index 0301327b..060a6bbf 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -19,17 +19,17 @@ Route18GateScript0: ; 4988f (12:588f) call ArePlayerCoordsInArray ret nc ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr z, .asm_498c6 - ld a, [wWhichTrade] + ld a, [wCoordIndex] dec a ld [wSimulatedJoypadStatesIndex], a - ld b, $0 + ld b, 0 ld c, a ld a, D_UP ld hl, wSimulatedJoypadStatesEnd @@ -59,7 +59,7 @@ Route18GateScript1: ; 498d5 (12:58d5) Route18GateScript2: ; 498df (12:58df) ld a, $1 - ld [H_SPRITEHEIGHT], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 ld [wSimulatedJoypadStatesIndex], a diff --git a/scripts/route2.asm b/scripts/route2.asm index fdc5eb6c..62ef3050 100755 --- a/scripts/route2.asm +++ b/scripts/route2.asm @@ -2,8 +2,8 @@ Route2Script: ; 554e3 (15:54e3) jp EnableAutoTextBoxDrawing Route2TextPointers: ; 554e6 (15:54e6) - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw Route2Text3 dw Route2Text4 diff --git a/scripts/route22.asm b/scripts/route22.asm index 84fb5634..f125030e 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -43,8 +43,8 @@ Route22MoveRivalSprite: ; 50ee6 (14:4ee6) inc de .asm_50ef1 call MoveSprite - ld a, $c - ld [$ff8d], a + ld a, SPRITE_FACING_RIGHT + ld [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay Route22RivalMovementData: ; 50efb (14:4efb) @@ -61,7 +61,7 @@ Route22Script0: ; 50f00 (14:4f00) ld hl, .Route22RivalBattleCoords call ArePlayerCoordsInArray ret nc - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [wcf0d], a xor a ld [hJoyHeld], a @@ -98,7 +98,7 @@ Route22Script0: ; 50f00 (14:4f00) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $1 ld [W_ROUTE22CURSCRIPT], a @@ -113,19 +113,19 @@ Route22Script1: ; 50f62 (14:4f62) jr nz, .asm_50f78 ld a, $4 ld [wd528], a - ld a, $4 + ld a, SPRITE_FACING_UP jr .asm_50f7a .asm_50f78 - ld a, $c + ld a, SPRITE_FACING_RIGHT .asm_50f7a - ld [$ff8d], a + ld [hSpriteFacingDirection], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteFacingDirectionAndDelay xor a ld [wJoyIgnore], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] @@ -159,16 +159,16 @@ Route22Script2: ; 50fb5 (14:4fb5) .notDown ld a, SPRITE_FACING_RIGHT .done - ld [$ff8d], a + ld [hSpriteFacingDirection], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteFacingDirectionAndDelay ld a, $f0 ld [wJoyIgnore], a ld hl, wd7eb set 5, [hl] ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wc0ee], a @@ -194,7 +194,7 @@ Route22Script_5100d: ; 5100d (14:500d) ld de, Route22RivalExitMovementData2 Route22MoveRival1: ; 51010 (14:5010) ld a, $1 - ld [H_SPRITEHEIGHT], a + ld [H_SPRITEINDEX], a jp MoveSprite Route22RivalExitMovementData1: ; 51017 (14:5017) @@ -255,7 +255,7 @@ Route22Script_5104e: ; 5104e (14:504e) call PlaySound callba Music_RivalAlternateTempo ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $4 ld [W_ROUTE22CURSCRIPT], a @@ -266,25 +266,25 @@ Route22Script4: ; 51087 (14:5087) bit 0, a ret nz ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a ld a, [wcf0d] cp $1 jr nz, .asm_510a1 ld a, $4 ld [wd528], a - ld a, $4 + ld a, SPRITE_FACING_UP jr .asm_510a8 .asm_510a1 ld a, $2 ld [wd528], a - ld a, $c + ld a, SPRITE_FACING_RIGHT .asm_510a8 - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay xor a ld [wJoyIgnore], a ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd72d set 6, [hl] @@ -310,27 +310,27 @@ Route22Script5: ; 510df (14:50df) cp $ff jp z, Route22Script_50ece ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a ld a, [wcf0d] cp $1 jr nz, .asm_510fb ld a, $4 ld [wd528], a - ld a, $4 + ld a, SPRITE_FACING_UP jr .asm_51102 .asm_510fb ld a, $2 ld [wd528], a - ld a, $c + ld a, SPRITE_FACING_RIGHT .asm_51102 - ld [$ff8d], a + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $f0 ld [wJoyIgnore], a ld hl, wd7eb set 6, [hl] ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wc0ee], a @@ -356,7 +356,7 @@ Route22Script_51142: ; 51142 (14:5142) ld de, MovementData_5114d Route22MoveRival2: ; 51145 (14:5145) ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a jp MoveSprite MovementData_5114c: ; 5114c (14:514c) diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 513a106b..8b24c820 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -24,7 +24,7 @@ Route22GateScript0: ; 1e6a4 (7:66a4) xor a ld [hJoyHeld], a ld a, $1 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID Route22GateScriptCoords: ; 1e6b5 (7:66b5) diff --git a/scripts/route23.asm b/scripts/route23.asm index 5ed038c2..eeaf2a2b 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -49,9 +49,9 @@ Route23Script0: ; 51219 (14:5219) ret nc .asm_51237 ld a, e - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a ld a, c - ld [wWhichTrade], a + ld [wWhichBadge], a ld b, $2 ld hl, wd7ed predef FlagActionPredef @@ -69,21 +69,21 @@ YCoordsData_51255: ; 51255 (14:5255) Route23Script_5125d: ; 5125d (14:525d) ld hl, BadgeTextPointers - ld a, [wWhichTrade] + ld a, [wWhichBadge] ld c, a - ld b, $0 + ld b, 0 add hl, bc add hl, bc ld a, [hli] ld h, [hl] ld l, a ld de, wcd6d -.asm_5126e +.copyTextLoop ld a, [hli] ld [de], a inc de - cp $50 - jr nz, .asm_5126e + cp "@" + jr nz, .copyTextLoop ret BadgeTextPointers: ; 51276 (14:5276) @@ -188,9 +188,9 @@ Route23Text7: ; 5133d (14:533d) jp TextScriptEnd Route23Script_51346: ; 51346 (14:5346) - ld [wWhichTrade], a + ld [wWhichBadge], a call Route23Script_5125d - ld a, [wWhichTrade] + ld a, [wWhichBadge] inc a ld c, a ld b, $2 @@ -208,7 +208,7 @@ Route23Script_51346: ; 51346 (14:5346) .asm_5136e ld hl, VictoryRoadGuardText2 call PrintText - ld a, [wWhichTrade] + ld a, [wWhichBadge] ld c, a ld b, $1 ld hl, wd7ed diff --git a/scripts/route24.asm b/scripts/route24.asm index 7bb9f3cd..f6822a35 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -31,7 +31,7 @@ Route24Script0: ; 513d5 (14:53d5) xor a ld [hJoyHeld], a ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd7f0 bit 1, [hl] @@ -70,7 +70,7 @@ Route24Script3: ; 51422 (14:5422) ld hl, wd7ef set 1, [hl] ld a, $1 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [wJoyIgnore], a @@ -87,7 +87,7 @@ Route24TextPointers: ; 5144b (14:544b) dw Route24Text5 dw Route24Text6 dw Route24Text7 - dw Predef5CText + dw PickUpItemText Route24TrainerHeaders: ; 5145b (14:545b) Route24TrainerHeader0: ; 5145b (14:545b) @@ -170,7 +170,7 @@ Route24Text1: ; 514a4 (14:54a4) ld hl, Route24Text_5152b ld de, Route24Text_5152b call SaveEndBattleTextPointers - ld a, [$ff8c] + ld a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters diff --git a/scripts/route25.asm b/scripts/route25.asm index 383652c8..5f544365 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -51,7 +51,7 @@ Route25TextPointers: ; 51628 (14:5628) dw Route25Text7 dw Route25Text8 dw Route25Text9 - dw Predef5CText + dw PickUpItemText dw Route25Text11 Route25TrainerHeaders: ; 5163e (14:563e) diff --git a/scripts/route4.asm b/scripts/route4.asm index c4a1e956..10d3882d 100755 --- a/scripts/route4.asm +++ b/scripts/route4.asm @@ -15,7 +15,7 @@ Route4ScriptPointers: ; 5566b (15:566b) Route4TextPointers: ; 55671 (15:5671) dw Route4Text1 dw Route4Text2 - dw Predef5CText + dw PickUpItemText dw PokeCenterSignText dw Route4Text5 dw Route4Text6 diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 2c751fa8..1ccf27af 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -31,7 +31,7 @@ Route5GateScript0: ; 1df50 (7:5f50) and a jr nz, .asm_1df82 ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Route5GateScript_1df43 ld a, $1 @@ -39,7 +39,7 @@ Route5GateScript0: ; 1df50 (7:5f50) ret .asm_1df82 ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd728 set 6, [hl] diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm index 82e2414a..d1aed2df 100755 --- a/scripts/route6gate.asm +++ b/scripts/route6gate.asm @@ -25,7 +25,7 @@ Route6GateScript0: ; 1e04e (7:604e) and a jr nz, .asm_1e080 ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Route6GateScript_1e0a1 ld a, $1 @@ -35,7 +35,7 @@ Route6GateScript0: ; 1e04e (7:604e) ld hl, wd728 set 6, [hl] ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID CoordsData_1e08c: ; 1e08c (7:608c) diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm index 4a05acc3..d73dc566 100755 --- a/scripts/route7gate.asm +++ b/scripts/route7gate.asm @@ -37,7 +37,7 @@ Route7GateScript0: ; 1e128 (7:6128) and a jr nz, .asm_1e15a ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Route7GateScript_1e111 ld a, $1 @@ -45,7 +45,7 @@ Route7GateScript0: ; 1e128 (7:6128) ret .asm_1e15a ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd728 set 6, [hl] diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index de0a856f..261a7a1e 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -36,7 +36,7 @@ Route8GateScript0: ; 1e1ee (7:61ee) and a jr nz, .asm_1e220 ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Route8GateScript_1e1d7 ld a, $1 @@ -46,7 +46,7 @@ Route8GateScript0: ; 1e1ee (7:61ee) ld hl, wd728 set 6, [hl] ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a jp DisplayTextID CoordsData_1e22c: ; 1e22c (7:622c) diff --git a/scripts/route9.asm b/scripts/route9.asm index 539e1a3f..d6050970 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -22,7 +22,7 @@ Route9TextPointers: ; 556d5 (15:56d5) dw Route9Text7 dw Route9Text8 dw Route9Text9 - dw Predef5CText + dw PickUpItemText dw Route9Text11 Route9TrainerHeaders: ; 556eb (15:56eb) diff --git a/scripts/safarizonecenter.asm b/scripts/safarizonecenter.asm index 6ff60ec6..40042038 100755 --- a/scripts/safarizonecenter.asm +++ b/scripts/safarizonecenter.asm @@ -2,7 +2,7 @@ SafariZoneCenterScript: ; 45bb2 (11:5bb2) jp EnableAutoTextBoxDrawing SafariZoneCenterTextPointers: ; 45bb5 (11:5bb5) - dw Predef5CText + dw PickUpItemText dw SafariZoneCenterText2 dw SafariZoneCenterText3 diff --git a/scripts/safarizoneeast.asm b/scripts/safarizoneeast.asm index 3e6df139..55ea5aa6 100755 --- a/scripts/safarizoneeast.asm +++ b/scripts/safarizoneeast.asm @@ -2,10 +2,10 @@ SafariZoneEastScript: ; 4586b (11:586b) jp EnableAutoTextBoxDrawing SafariZoneEastTextPointers: ; 4586e (11:586e) - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw SafariZoneEastText5 dw SafariZoneEastText6 dw SafariZoneEastText7 diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index 2edbe61b..e89630fc 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -18,7 +18,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) call ArePlayerCoordsInArray ret nc ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a @@ -56,7 +56,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld [wJoyIgnore], a call UpdateSprites ld a, $4 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wJoyIgnore], a @@ -83,7 +83,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld a, $f0 ld [wJoyIgnore], a ld a, $6 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [W_NUMSAFARIBALLS], a @@ -95,7 +95,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) jr .asm_75286 .asm_7527f ld a, $5 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_75286 ret diff --git a/scripts/safarizonenorth.asm b/scripts/safarizonenorth.asm index 74790e76..6ea5f902 100755 --- a/scripts/safarizonenorth.asm +++ b/scripts/safarizonenorth.asm @@ -2,8 +2,8 @@ SafariZoneNorthScript: ; 459ab (11:59ab) jp EnableAutoTextBoxDrawing SafariZoneNorthTextPointers: ; 459ae (11:59ae) - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw SafariZoneNorthText3 dw SafariZoneNorthText4 dw SafariZoneNorthText5 diff --git a/scripts/safarizonewest.asm b/scripts/safarizonewest.asm index 1465af56..db2c6427 100755 --- a/scripts/safarizonewest.asm +++ b/scripts/safarizonewest.asm @@ -2,10 +2,10 @@ SafariZoneWestScript: ; 4a1b5 (12:61b5) jp EnableAutoTextBoxDrawing SafariZoneWestTextPointers: ; 4a1b8 (12:61b8) - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw SafariZoneWestText5 dw SafariZoneWestText6 dw SafariZoneWestText7 diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 7e4f4447..349eda5e 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -44,7 +44,7 @@ SaffronGymScript3: ; 5d05b (17:505b) SaffronGymText_5d068: ; 5d068 (17:5068) ld a, $a - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd7b3 set 1, [hl] @@ -52,14 +52,14 @@ SaffronGymText_5d068: ; 5d068 (17:5068) call GiveItem jr nc, .BagFull ld a, $b - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd7b3 set 0, [hl] jr .asm_5d091 .BagFull ld a, $c - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5d091 ld hl, W_OBTAINEDBADGES diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index 46630014..47700664 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -44,9 +44,9 @@ SilphCo10TextPointers: ; 5a186 (16:6186) dw SilphCo10Text1 dw SilphCo10Text2 dw SilphCo10Text3 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText SilphCo10TrainerHeaders: ; 5a192 (16:6192) SilphCo10TrainerHeader0: ; 5a192 (16:6192) diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 473c9d11..b4f94b13 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -170,17 +170,17 @@ SilphCo11Script0: ; 621db (18:61db) ld hl, CoordsData_62211 call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [wcf0d], a xor a ld [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a ld a, $3 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $3 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_62216 call MoveSprite @@ -201,9 +201,9 @@ MovementData_62216: ; 62216 (18:6216) SilphCo11Script_6221a: ; 6221a (18:621a) ld [wd528], a ld a, $3 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a ld a, b - ld [$ff8d], a + ld [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay SilphCo11Script5: ; 62227 (18:6227) @@ -214,17 +214,17 @@ SilphCo11Script5: ; 62227 (18:6227) cp $1 jr z, .asm_6223c ld a, $2 - ld b, $c + ld b, SPRITE_FACING_RIGHT jr .asm_62240 .asm_6223c ld a, $8 - ld b, $0 + ld b, SPRITE_FACING_DOWN .asm_62240 call SilphCo11Script_6221a ld a, $f0 ld [wJoyIgnore], a ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack call SilphCo11Script_6216d @@ -242,17 +242,17 @@ SilphCo11Script3: ; 6226a (18:626a) bit 0, a ret nz ld a, $3 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, [wcf0d] cp $1 jr z, .asm_62284 ld a, $2 - ld b, $c + ld b, SPRITE_FACING_RIGHT jr .asm_62288 .asm_62284 ld a, $8 - ld b, $0 + ld b, SPRITE_FACING_DOWN .asm_62288 call SilphCo11Script_6221a call Delay3 @@ -266,7 +266,7 @@ SilphCo11Script4: ; 62293 (18:6293) ld hl, SilphCo10Text_62330 ld de, SilphCo10Text_62330 call SaveEndBattleTextPointers - ld a, [H_DOWNARROWBLINKCNT2] + ld a, [H_SPRITEINDEX] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index bc36ed39..4bd1edd1 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -58,7 +58,7 @@ SilphCo3TextPointers: ; 59fc4 (16:5fc4) dw SilphCo3Text1 dw SilphCo3Text2 dw SilphCo3Text3 - dw Predef5CText + dw PickUpItemText SilphCo3TrainerHeaders: ; 59fcc (16:5fcc) SilphCo3TrainerHeader0: ; 59fcc (16:5fcc) diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 866afd54..a3953e27 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -95,9 +95,9 @@ SilphCo4TextPointers: ; 19da0 (6:5da0) dw SilphCo4Text2 dw SilphCo4Text3 dw SilphCo4Text4 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText SilphCo4TrainerHeaders: ; 19dae (6:5dae) SilphCo4TrainerHeader0: ; 19dae (6:5dae) diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index 750072ab..1ed6006f 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -74,9 +74,9 @@ SilphCo5TextPointers: ; 19fbc (6:5fbc) dw SilphCo5Text3 dw SilphCo5Text4 dw SilphCo5Text5 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw SilphCo5Text9 dw SilphCo5Text10 dw SilphCo5Text11 diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index 0ff5ee50..fe1e6224 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -50,8 +50,8 @@ SilphCo6TextPointers: ; 1a1f6 (6:61f6) dw SilphCo6Text6 dw SilphCo6Text7 dw SilphCo6Text8 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText SilphCo6TrainerHeaders: ; 1a20a (6:620a) SilphCo6TrainerHeader0: ; 1a20a (6:620a) diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 483429c0..8538d37f 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -136,10 +136,10 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_51c7d ld a, [wWhichTrade] @@ -149,7 +149,7 @@ SilphCo7Script0: ; 51c23 (14:5c23) inc de .asm_51c6c ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $3 jp SilphCo7Text_51c10 @@ -173,7 +173,7 @@ SilphCo7Script3: ; 51c82 (14:5c82) xor a ld [wJoyIgnore], a ld a, $d - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld hl, wd72d @@ -212,12 +212,12 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld a, $4 ld [wd528], a ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a - ld a, $4 - ld [$ff8d], a + ld [H_SPRITEINDEX], a + ld a, SPRITE_FACING_UP + ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, $f - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $ff ld [wc0ee], a @@ -230,7 +230,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld de, MovementData_51d1a .asm_51d0e ld a, $9 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $5 jp SilphCo7Text_51c10 @@ -272,9 +272,9 @@ SilphCo7TextPointers: ; 51d3f (14:5d3f) dw SilphCo7Text7 dw SilphCo7Text8 dw SilphCo7Text9 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw SilphCo7Text13 dw SilphCo7Text14 dw SilphCo7Text15 diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm index 4dee3bb7..031315c3 100755 --- a/scripts/ssanne10.asm +++ b/scripts/ssanne10.asm @@ -21,9 +21,9 @@ SSAnne10TextPointers: ; 61d6e (18:5d6e) dw SSAnne10Text6 dw SSAnne10Text7 dw SSAnne10Text8 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText SSAnne10TrainerHeaders: ; 61d84 (18:5d84) SSAnne10TrainerHeader0: ; 61d84 (18:5d84) diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 16d560b5..d4651a22 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -30,14 +30,14 @@ SSAnne2Script0: ; 613be (18:53be) ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [$ffdb], a ld a, HS_SS_ANNE_2_RIVAL ld [wcc4d], a predef ShowObject call Delay3 ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF xor a ld [hJoyHeld], a @@ -79,11 +79,11 @@ SSAnne2Script_61416: ; 61416 (18:5416) ld a, SPRITE_FACING_RIGHT jr .asm_61427 .asm_61426 - xor a + xor a ; SPRITE_FACING_DOWN .asm_61427 - ld [$ff8d], a + ld [hSpriteFacingDirection], a ld a, $2 - ld [H_DOWNARROWBLINKCNT2], a + ld [H_SPRITEINDEX], a jp SetSpriteFacingDirectionAndDelay SSAnne2Script1: ; 61430 (18:5430) @@ -94,7 +94,7 @@ SSAnne2Script1: ; 61430 (18:5430) xor a ld [wJoyIgnore], a ld a, $2 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID call Delay3 ld a, SONY2 + $c8 @@ -129,10 +129,10 @@ SSAnne2Script2: ; 6146d (18:546d) ld a, $f0 ld [wJoyIgnore], a ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, [W_XCOORD] cp $25 @@ -143,7 +143,7 @@ SSAnne2Script2: ; 6146d (18:546d) ld de, MovementData_614b7 .asm_6149a ld a, $2 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call MoveSprite ld a, $ff ld [wc0ee], a diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm index 27c76a2f..7885135b 100755 --- a/scripts/ssanne8.asm +++ b/scripts/ssanne8.asm @@ -22,7 +22,7 @@ SSAnne8TextPointers: ; 6198f (18:598f) dw SSAnne8Text7 dw SSAnne8Text8 dw SSAnne8Text9 - dw Predef5CText + dw PickUpItemText dw SSAnne8Text11 SSAnne8TrainerHeaders: ; 619a5 (18:59a5) diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm index 6e8b86c6..0cee1e08 100755 --- a/scripts/ssanne9.asm +++ b/scripts/ssanne9.asm @@ -21,10 +21,10 @@ SSAnne9TextPointers: ; 61b6a (18:5b6a) dw SSAnne9Text3 dw SSAnne9Text4 dw SSAnne9Text5 - dw Predef5CText + dw PickUpItemText dw SSAnne9Text7 dw SSAnne9Text8 - dw Predef5CText + dw PickUpItemText dw SSAnne9Text10 dw SSAnne9Text11 dw SSAnne9Text12 diff --git a/scripts/tradecenter.asm b/scripts/tradecenter.asm index 0a5cc100..22a61095 100755 --- a/scripts/tradecenter.asm +++ b/scripts/tradecenter.asm @@ -2,13 +2,13 @@ TradeCenterScript: ; 4fd10 (13:7d10) call EnableAutoTextBoxDrawing ld a, [$ffaa] cp $2 - ld a, $8 - jr z, .asm_4fd1d - ld a, $c -.asm_4fd1d - ld [$ff8d], a + ld a, SPRITE_FACING_LEFT + jr z, .next + ld a, SPRITE_FACING_RIGHT +.next + ld [hSpriteFacingDirection], a ld a, $1 - ld [$ff8c], a + ld [H_SPRITEINDEX], a call SetSpriteFacingDirection ld hl, wd72d bit 0, [hl] diff --git a/scripts/unknowndungeon1.asm b/scripts/unknowndungeon1.asm index 008a7bd7..696ddafa 100755 --- a/scripts/unknowndungeon1.asm +++ b/scripts/unknowndungeon1.asm @@ -2,6 +2,6 @@ UnknownDungeon1Script: ; 74d0c (1d:4d0c) jp EnableAutoTextBoxDrawing UnknownDungeon1TextPointers: ; 74d0f (1d:4d0f) - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText diff --git a/scripts/unknowndungeon2.asm b/scripts/unknowndungeon2.asm index c8249b27..f3cbb6a5 100755 --- a/scripts/unknowndungeon2.asm +++ b/scripts/unknowndungeon2.asm @@ -2,6 +2,6 @@ UnknownDungeon2Script: ; 45e0b (11:5e0b) jp EnableAutoTextBoxDrawing UnknownDungeon2TextPointers: ; 45e0e (11:5e0e) - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index 055c9d0f..1c87aa39 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -14,8 +14,8 @@ UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03) UnknownDungeon3TextPointers: ; 45f09 (11:5f09) dw UnknownDungeon3Text1 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f) UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f) diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 83fe2a8c..6b9f94f7 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -49,7 +49,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) ld [hJoyHeld], a ld [wcf0d], a ld a, $3 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, [wd803] bit 2, a diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 3515c29c..193b3a06 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -64,7 +64,7 @@ VermilionGymScript3: ; 5ca9d (17:4a9d) VermilionGymScript_5caaa: ; 5caaa (17:4aaa) ld a, $6 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd773 set 7, [hl] @@ -72,14 +72,14 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) call GiveItem jr nc, .BagFull ld a, $7 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd773 set 6, [hl] jr .asm_5cad3 .BagFull ld a, $8 - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5cad3 ld hl, W_OBTAINEDBADGES diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 68a3502f..4f1df52f 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -43,8 +43,8 @@ CoordsData_5da5c: ; 5da5c (17:5a5c) VictoryRoad1TextPointers: ; 5da5f (17:5a5f) dw VictoryRoad1Text1 dw VictoryRoad1Text2 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw BoulderText dw BoulderText dw BoulderText diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 1fc2af7e..51346032 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -77,10 +77,10 @@ VictoryRoad2TextPointers: ; 5181b (14:581b) dw VictoryRoad2Text4 dw VictoryRoad2Text5 dw VictoryRoad2Text6 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw BoulderText dw BoulderText dw BoulderText diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 20b3df85..9aeb1d18 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -83,8 +83,8 @@ VictoryRoad3TextPointers: ; 44a24 (11:4a24) dw VictoryRoad3Text2 dw VictoryRoad3Text3 dw VictoryRoad3Text4 - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText dw BoulderText dw BoulderText dw BoulderText diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index 05f5f495..c358e961 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -32,7 +32,7 @@ ViridianCityScript_1900b: ; 1900b (6:500b) cp $20 ret nz ld a, $e - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a @@ -52,7 +52,7 @@ ViridianCityScript_1903d: ; 1903d (6:503d) cp $13 ret nz ld a, $5 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [hJoyHeld], a @@ -98,7 +98,7 @@ ViridianCityScript2: ; 1908f (6:508f) xor a ld [wJoyIgnore], a ld a, $f - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID xor a ld [W_BATTLETYPE], a diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm index 124d3184..554c2125 100755 --- a/scripts/viridianforest.asm +++ b/scripts/viridianforest.asm @@ -17,9 +17,9 @@ ViridianForestTextPointers: ; 61126 (18:5126) dw ViridianForestText2 dw ViridianForestText3 dw ViridianForestText4 - dw Predef5CText - dw Predef5CText - dw Predef5CText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText dw ViridianForestText8 dw ViridianForestText9 dw ViridianForestText10 diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 9e5e0e5f..9a0ce855 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -140,7 +140,7 @@ ViridianGymScript3: ; 74988 (1d:4988) ld [wJoyIgnore], a ViridianGymScript3_74995: ; 74995 (1d:4995) ld a, $c - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd751 set 1, [hl] @@ -148,14 +148,14 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) call GiveItem jr nc, .BagFull ld a, $d - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wd751 set 0, [hl] jr .asm_749be .BagFull ld a, $e - ld [H_DOWNARROWBLINKCNT2], a + ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_749be ld hl, W_OBTAINEDBADGES @@ -190,7 +190,7 @@ ViridianGymTextPointers: ; 749ec (1d:49ec) dw ViridianGymText8 dw ViridianGymText9 dw ViridianGymText10 - dw Predef5CText + dw PickUpItemText dw ViridianGymText12 dw ViridianGymText13 dw ViridianGymText14 diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 9725e275..b6621684 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -28,7 +28,7 @@ ViridianMartScriptPointers: ; 1d495 (7:5495) ViridianMartScript0: ; 1d49b (7:549b) call UpdateSprites ld a, $4 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld hl, wSimulatedJoypadStatesEnd ld de, RLEMovement1d4bb @@ -51,7 +51,7 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) ret nz call Delay3 ld a, $5 - ld [$ff8c], a + ld [hSpriteIndexOrTextID], a call DisplayTextID ld bc, (OAKS_PARCEL << 8) + 1 call GiveItem diff --git a/text.asm b/text.asm index ecc3beea..db3e57c5 100644 --- a/text.asm +++ b/text.asm @@ -2087,7 +2087,7 @@ _ColosseumVersionText:: ENDC _Char00Text:: ; 8a696 (22:6696) - TX_NUM $FF8C,1,2 + TX_NUM hSpriteIndexOrTextID,1,2 text " ERROR." done diff --git a/wram.asm b/wram.asm index 6eef4ea8..8633e732 100755 --- a/wram.asm +++ b/wram.asm @@ -634,6 +634,11 @@ wOverrideSimulatedJoypadStatesMask:: ; cd3b ds 1 +wWhichBadge:: ; cd3d + +wMuseumPriceTemp:: ; cd3d +; 3-byte BCD number + wTitleMonSpecies:: ; cd3d wPlayerCharacterOAMTile:: ; cd3d @@ -1891,58 +1896,98 @@ W_MAPCONNECTIONS:: ; d370 W_MAPCONN1PTR:: ; d371 ds 1 -wd372:: ds 1 ; some connection stuff, too bothered to label it -wd373:: ds 1 -wd374:: ds 1 -wd375:: ds 1 -wd376:: ds 1 -wd377:: ds 1 -wd378:: ds 1 -wd379:: ds 1 -wd37a:: ds 1 -wd37b:: ds 1 +wNorthConnectionStripSrc:: ; d372 + ds 2 + +wNorthConnectionStripDest:: ; d374 + ds 2 + +wNorthConnectionStripWidth:: ; d376 + ds 1 + +wNorthConnectedMapWidth:: ; d377 + ds 1 + +wNorthConnectedMapYAlignment:: ; d378 + ds 1 + +wNorthConnectedMapXAlignment:: ; d379 + ds 1 + +wNorthConnectedMapViewPointer:: ; d37a + ds 2 W_MAPCONN2PTR:: ; d37c ds 1 -wd37d:: ds 1 -wd37e:: ds 1 -wd37f:: ds 1 -wd380:: ds 1 -wd381:: ds 1 -wd382:: ds 1 -wd383:: ds 1 -wd384:: ds 1 -wd385:: ds 1 -wd386:: ds 1 +wSouthConnectionStripSrc:: ; d37d + ds 2 + +wSouthConnectionStripDest:: ; d37f: + ds 2 + +wSouthConnectionStripWidth:: ; d381 + ds 1 + +wSouthConnectedMapWidth:: ; d382 + ds 1 + +wSouthConnectedMapYAlignment:: ; d383 + ds 1 + +wSouthConnectedMapXAlignment:: ; d384 + ds 1 + +wSouthConnectedMapViewPointer:: ; d385 + ds 2 W_MAPCONN3PTR:: ; d387 ds 1 -wd388:: ds 1 -wd389:: ds 1 -wd38a:: ds 1 -wd38b:: ds 1 -wd38c:: ds 1 -wd38d:: ds 1 -wd38e:: ds 1 -wd38f:: ds 1 -wd390:: ds 1 -wd391:: ds 1 +wWestConnectionStripSrc:: ; d388 + ds 2 + +wWestConnectionStripDest:: ; d38a + ds 2 + +wWestConnectionStripHeight:: ; d38c + ds 1 + +wWestConnectedMapWidth:: ; d38d + ds 1 + +wWestConnectedMapYAlignment:: ; d38e + ds 1 + +wWestConnectedMapXAlignment:: ; d38f + ds 1 + +wWestConnectedMapViewPointer:: ; d390 + ds 2 W_MAPCONN4PTR:: ; d392 ds 1 -wd393:: ds 1 -wd394:: ds 1 -wd395:: ds 1 -wd396:: ds 1 -wd397:: ds 1 -wd398:: ds 1 -wd399:: ds 1 -wd39a:: ds 1 -wd39b:: ds 1 -wd39c:: ds 1 +wEastConnectionStripSrc:: ; d393 + ds 2 + +wEastConnectionStripDest:: ; d395 + ds 2 + +wEastConnectionStripHeight:: ; d397 + ds 1 + +wEastConnectedMapWidth:: ; d398 + ds 1 + +wEastConnectedMapYAlignment:: ; d399 + ds 1 + +wEastConnectedMapXAlignment:: ; d39a + ds 1 + +wEastConnectedMapViewPointer:: ; d39b + ds 2 W_SPRITESET:: ; d39d ; sprite set for the current map (11 sprite picture ID's) -- cgit v1.3.1-sl0p From 0ad1153f165023220c7c2e3bb187ccc5d6ca75bd Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 18 Jul 2015 15:20:07 -0500 Subject: Simplify map connections let the macros calculate the connection strip length instead of passing it as an arg don't pass map dimensions since they can be inferred from map ids todo: figure out why certain south and east connections get an extra 3 added to the connection strip length --- data/mapHeaders/celadoncity.asm | 4 +- data/mapHeaders/ceruleancity.asm | 8 +-- data/mapHeaders/cinnabarisland.asm | 4 +- data/mapHeaders/fuchsiacity.asm | 6 +- data/mapHeaders/indigoplateau.asm | 2 +- data/mapHeaders/lavendertown.asm | 6 +- data/mapHeaders/pallettown.asm | 4 +- data/mapHeaders/pewtercity.asm | 4 +- data/mapHeaders/route1.asm | 4 +- data/mapHeaders/route10.asm | 4 +- data/mapHeaders/route11.asm | 4 +- data/mapHeaders/route12.asm | 6 +- data/mapHeaders/route13.asm | 4 +- data/mapHeaders/route14.asm | 4 +- data/mapHeaders/route15.asm | 4 +- data/mapHeaders/route16.asm | 4 +- data/mapHeaders/route17.asm | 4 +- data/mapHeaders/route18.asm | 4 +- data/mapHeaders/route19.asm | 4 +- data/mapHeaders/route2.asm | 4 +- data/mapHeaders/route20.asm | 4 +- data/mapHeaders/route21.asm | 4 +- data/mapHeaders/route22.asm | 4 +- data/mapHeaders/route23.asm | 4 +- data/mapHeaders/route24.asm | 4 +- data/mapHeaders/route25.asm | 2 +- data/mapHeaders/route3.asm | 4 +- data/mapHeaders/route4.asm | 4 +- data/mapHeaders/route5.asm | 4 +- data/mapHeaders/route6.asm | 4 +- data/mapHeaders/route7.asm | 4 +- data/mapHeaders/route8.asm | 4 +- data/mapHeaders/route9.asm | 4 +- data/mapHeaders/saffroncity.asm | 8 +-- data/mapHeaders/vermilioncity.asm | 4 +- data/mapHeaders/viridiancity.asm | 6 +- macros.asm | 139 +++++++++++++++++++++---------------- 37 files changed, 156 insertions(+), 139 deletions(-) (limited to 'macros.asm') diff --git a/data/mapHeaders/celadoncity.asm b/data/mapHeaders/celadoncity.asm index 12a1731a..7e3a6c06 100755 --- a/data/mapHeaders/celadoncity.asm +++ b/data/mapHeaders/celadoncity.asm @@ -3,6 +3,6 @@ CeladonCity_h: ; 18000 (6:4000) db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x) dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_16, ROUTE_16_WIDTH, 4, 0, ROUTE_16_HEIGHT, Route16Blocks, CELADON_CITY_WIDTH - EAST_MAP_CONNECTION ROUTE_7, ROUTE_7_WIDTH, 4, 0, ROUTE_7_HEIGHT, Route7Blocks, CELADON_CITY_WIDTH + WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16Blocks + EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7Blocks, 1 dw CeladonCityObject ; objects diff --git a/data/mapHeaders/ceruleancity.asm b/data/mapHeaders/ceruleancity.asm index 61b04719..56cab9f7 100755 --- a/data/mapHeaders/ceruleancity.asm +++ b/data/mapHeaders/ceruleancity.asm @@ -3,8 +3,8 @@ CeruleanCity_h: ; 0x1874e to 0x18786 (56 bytes) (bank=6) (id=3) db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x) dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_24, ROUTE_24_WIDTH, ROUTE_24_HEIGHT, 5, 0, ROUTE_24_WIDTH, Route24Blocks - SOUTH_MAP_CONNECTION ROUTE_5, ROUTE_5_WIDTH, 5, 0, ROUTE_5_WIDTH, Route5Blocks, CERULEAN_CITY_WIDTH, CERULEAN_CITY_HEIGHT - WEST_MAP_CONNECTION ROUTE_4, ROUTE_4_WIDTH, 4, 0, ROUTE_4_HEIGHT, Route4Blocks, CERULEAN_CITY_WIDTH - EAST_MAP_CONNECTION ROUTE_9, ROUTE_9_WIDTH, 4, 0, ROUTE_9_HEIGHT, Route9Blocks, CERULEAN_CITY_WIDTH + NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24Blocks + SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5Blocks, 1 + WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4Blocks + EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9Blocks dw CeruleanCityObject ; objects diff --git a/data/mapHeaders/cinnabarisland.asm b/data/mapHeaders/cinnabarisland.asm index f0da170f..60ba7560 100755 --- a/data/mapHeaders/cinnabarisland.asm +++ b/data/mapHeaders/cinnabarisland.asm @@ -3,6 +3,6 @@ CinnabarIsland_h: ; 0x1c000 to 0x1c022 (34 bytes) (bank=7) (id=8) db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x) dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_21, ROUTE_21_WIDTH, ROUTE_21_HEIGHT, 0, 0, ROUTE_21_WIDTH, Route21Blocks - EAST_MAP_CONNECTION ROUTE_20, ROUTE_20_WIDTH, 0, 0, ROUTE_20_HEIGHT, Route20Blocks, CINNABAR_ISLAND_WIDTH + NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21Blocks + EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20Blocks dw CinnabarIslandObject ; objects diff --git a/data/mapHeaders/fuchsiacity.asm b/data/mapHeaders/fuchsiacity.asm index 7a3e4f66..998f7bb4 100755 --- a/data/mapHeaders/fuchsiacity.asm +++ b/data/mapHeaders/fuchsiacity.asm @@ -3,7 +3,7 @@ FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7) db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts db SOUTH | WEST | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_19, ROUTE_19_WIDTH, 5, 0, ROUTE_19_WIDTH, Route19Blocks, FUCHSIA_CITY_WIDTH, FUCHSIA_CITY_HEIGHT - WEST_MAP_CONNECTION ROUTE_18, ROUTE_18_WIDTH, 4, 0, ROUTE_18_HEIGHT, Route18Blocks, FUCHSIA_CITY_WIDTH - EAST_MAP_CONNECTION ROUTE_15, ROUTE_15_WIDTH, 4, 0, ROUTE_15_HEIGHT, Route15Blocks, FUCHSIA_CITY_WIDTH + SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19Blocks + WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18Blocks + EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15Blocks dw FuchsiaCityObject ; objects diff --git a/data/mapHeaders/indigoplateau.asm b/data/mapHeaders/indigoplateau.asm index 9705e3ee..87c37501 100755 --- a/data/mapHeaders/indigoplateau.asm +++ b/data/mapHeaders/indigoplateau.asm @@ -3,5 +3,5 @@ IndigoPlateau_h: ; 0x5091e to 0x50935 (23 bytes) (id=9) db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x) dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts db SOUTH ; connections - SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_23_WIDTH, 0, 0, ROUTE_23_WIDTH, Route23Blocks, INDIGO_PLATEAU_WIDTH, INDIGO_PLATEAU_HEIGHT + SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23Blocks dw IndigoPlateauObject ; objects diff --git a/data/mapHeaders/lavendertown.asm b/data/mapHeaders/lavendertown.asm index 2880dc60..72952d41 100755 --- a/data/mapHeaders/lavendertown.asm +++ b/data/mapHeaders/lavendertown.asm @@ -3,7 +3,7 @@ LavenderTown_h: ; 0x44000 to 0x4402d (45 bytes) (bank=11) (id=4) db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x) dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_10, ROUTE_10_WIDTH, ROUTE_10_HEIGHT, 0, 0, ROUTE_10_WIDTH, Route10Blocks - SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, 0, 0, ROUTE_12_WIDTH, Route12Blocks, LAVENDER_TOWN_WIDTH, LAVENDER_TOWN_HEIGHT - WEST_MAP_CONNECTION ROUTE_8, ROUTE_8_WIDTH, 0, 0, ROUTE_8_HEIGHT, Route8Blocks, LAVENDER_TOWN_WIDTH + NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10Blocks + SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12Blocks, 1 + WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8Blocks dw LavenderTownObject ; objects diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm index 248c49b4..5ad13aea 100755 --- a/data/mapHeaders/pallettown.asm +++ b/data/mapHeaders/pallettown.asm @@ -3,6 +3,6 @@ PalletTown_h: ; 182a1 (6:42a1) db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_1, ROUTE_1_WIDTH, ROUTE_1_HEIGHT, 0, 0, ROUTE_1_WIDTH, Route1Blocks - SOUTH_MAP_CONNECTION ROUTE_21, ROUTE_21_WIDTH, 0, 0, ROUTE_21_WIDTH, Route21Blocks, PALLET_TOWN_WIDTH, PALLET_TOWN_HEIGHT + NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1Blocks + SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21Blocks, 1 dw PalletTownObject diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm index b5e68adc..69c5d978 100755 --- a/data/mapHeaders/pewtercity.asm +++ b/data/mapHeaders/pewtercity.asm @@ -3,8 +3,8 @@ PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2) db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x) dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_2, ROUTE_2_WIDTH, 5, 0, ROUTE_2_WIDTH, Route2Blocks, PEWTER_CITY_WIDTH, PEWTER_CITY_HEIGHT - EAST_MAP_CONNECTION ROUTE_3, ROUTE_3_WIDTH, 4, 0, ROUTE_3_HEIGHT, Route3Blocks, PEWTER_CITY_WIDTH + SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2Blocks + EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3Blocks dw PewterCityObject ; objects db $0 diff --git a/data/mapHeaders/route1.asm b/data/mapHeaders/route1.asm index f2072bfa..6a8db0c4 100755 --- a/data/mapHeaders/route1.asm +++ b/data/mapHeaders/route1.asm @@ -3,6 +3,6 @@ Route1_h: ; 0x1c0c3 to 0x1c0e5 (34 bytes) (bank=7) (id=12) db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x) dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, VIRIDIAN_CITY_HEIGHT, -3, 2, ROUTE_1_WIDTH + 6, ViridianCityBlocks - SOUTH_MAP_CONNECTION PALLET_TOWN, PALLET_TOWN_WIDTH, 0, 0, PALLET_TOWN_WIDTH, PalletTownBlocks, ROUTE_1_WIDTH, ROUTE_1_HEIGHT + NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks + SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTownBlocks, 1 dw Route1Object ; objects diff --git a/data/mapHeaders/route10.asm b/data/mapHeaders/route10.asm index 9d41ff76..fab0e4a5 100755 --- a/data/mapHeaders/route10.asm +++ b/data/mapHeaders/route10.asm @@ -3,6 +3,6 @@ Route10_h: ; 0x582d4 to 0x582f6 (34 bytes) (id=21) db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x) dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts db SOUTH | WEST ; connections - SOUTH_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, 0, 0, LAVENDER_TOWN_WIDTH, LavenderTownBlocks, ROUTE_10_WIDTH, ROUTE_10_HEIGHT - WEST_MAP_CONNECTION ROUTE_9, ROUTE_9_WIDTH, 0, 0, ROUTE_9_HEIGHT, Route9Blocks, ROUTE_10_WIDTH + SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTownBlocks + WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9Blocks dw Route10Object ; objects diff --git a/data/mapHeaders/route11.asm b/data/mapHeaders/route11.asm index b8fcb0d2..66c54bbe 100755 --- a/data/mapHeaders/route11.asm +++ b/data/mapHeaders/route11.asm @@ -3,6 +3,6 @@ Route11_h: ; 0x584be to 0x584e0 (34 bytes) (id=22) db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x) dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION VERMILION_CITY, VERMILION_CITY_WIDTH, -3, 1, ROUTE_11_HEIGHT + 6, VermilionCityBlocks, ROUTE_11_WIDTH - EAST_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, -3, 24, ROUTE_11_HEIGHT + 6, Route12Blocks, ROUTE_11_WIDTH + WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCityBlocks + EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12Blocks, 1 dw Route11Object ; objects diff --git a/data/mapHeaders/route12.asm b/data/mapHeaders/route12.asm index 1e55374c..6132a244 100755 --- a/data/mapHeaders/route12.asm +++ b/data/mapHeaders/route12.asm @@ -3,7 +3,7 @@ Route12_h: ; 0x5866d to 0x5869a (45 bytes) (id=23) db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x) dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, LAVENDER_TOWN_HEIGHT, 0, 0, LAVENDER_TOWN_WIDTH, LavenderTownBlocks - SOUTH_MAP_CONNECTION ROUTE_13, ROUTE_13_WIDTH, -3, 17, ROUTE_12_WIDTH + 3, Route13Blocks, ROUTE_12_WIDTH, ROUTE_12_HEIGHT - WEST_MAP_CONNECTION ROUTE_11, ROUTE_11_WIDTH, 27, 0, ROUTE_11_HEIGHT, Route11Blocks, ROUTE_12_WIDTH + NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTownBlocks + SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13Blocks + WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11Blocks dw Route12Object ; objects diff --git a/data/mapHeaders/route13.asm b/data/mapHeaders/route13.asm index b19e180b..9a821208 100755 --- a/data/mapHeaders/route13.asm +++ b/data/mapHeaders/route13.asm @@ -3,6 +3,6 @@ Route13_h: ; 0x5480c to 0x5482e (34 bytes) (id=24) db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x) dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_12, ROUTE_12_WIDTH, ROUTE_12_HEIGHT, 20, 0, ROUTE_12_WIDTH, Route12Blocks - WEST_MAP_CONNECTION ROUTE_14, ROUTE_14_WIDTH, 0, 0, ROUTE_13_HEIGHT + 3, Route14Blocks, ROUTE_13_WIDTH + NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12Blocks + WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14Blocks dw Route13Object ; objects diff --git a/data/mapHeaders/route14.asm b/data/mapHeaders/route14.asm index 1ae75932..e4163126 100755 --- a/data/mapHeaders/route14.asm +++ b/data/mapHeaders/route14.asm @@ -3,6 +3,6 @@ Route14_h: ; 0x54999 to 0x549bb (34 bytes) (id=25) db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x) dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION ROUTE_15, ROUTE_15_WIDTH, 18, 0, ROUTE_15_HEIGHT, Route15Blocks, ROUTE_14_WIDTH - EAST_MAP_CONNECTION ROUTE_13, ROUTE_13_WIDTH, 0, 0, ROUTE_13_HEIGHT, Route13Blocks, ROUTE_14_WIDTH + WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15Blocks + EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13Blocks dw Route14Object ; objects diff --git a/data/mapHeaders/route15.asm b/data/mapHeaders/route15.asm index bd778a53..6d2e8859 100755 --- a/data/mapHeaders/route15.asm +++ b/data/mapHeaders/route15.asm @@ -3,6 +3,6 @@ Route15_h: ; 0x5892c to 0x5894e (34 bytes) (id=26) db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x) dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, -3, 1, ROUTE_15_HEIGHT + 6, FuchsiaCityBlocks, ROUTE_15_WIDTH - EAST_MAP_CONNECTION ROUTE_14, ROUTE_14_WIDTH, -3, 15, ROUTE_15_HEIGHT + 3, Route14Blocks, ROUTE_15_WIDTH + WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks + EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14Blocks dw Route15Object ; objects diff --git a/data/mapHeaders/route16.asm b/data/mapHeaders/route16.asm index a512dc03..42678ed3 100755 --- a/data/mapHeaders/route16.asm +++ b/data/mapHeaders/route16.asm @@ -3,6 +3,6 @@ Route16_h: ; 0x58ada to 0x58afc (34 bytes) (id=27) db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x) dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_17_WIDTH, 0, 0, ROUTE_17_WIDTH, Route17Blocks, ROUTE_16_WIDTH, ROUTE_16_HEIGHT - EAST_MAP_CONNECTION CELADON_CITY, CELADON_CITY_WIDTH, -3, 1, ROUTE_16_HEIGHT + 6, CeladonCityBlocks, ROUTE_16_WIDTH + SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17Blocks + EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCityBlocks, 1 dw Route16Object ; objects diff --git a/data/mapHeaders/route17.asm b/data/mapHeaders/route17.asm index e428f3ba..577fe009 100755 --- a/data/mapHeaders/route17.asm +++ b/data/mapHeaders/route17.asm @@ -3,6 +3,6 @@ Route17_h: ; 0x54b20 to 0x54b42 (34 bytes) (id=28) db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x) dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION ROUTE_16, ROUTE_16_WIDTH, ROUTE_16_HEIGHT, 0, 0, ROUTE_17_WIDTH + 3, Route16Blocks - SOUTH_MAP_CONNECTION ROUTE_18, ROUTE_18_WIDTH, 0, 0, ROUTE_17_WIDTH + 3, Route18Blocks, ROUTE_17_WIDTH, ROUTE_17_HEIGHT + NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16Blocks + SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18Blocks, 1 dw Route17Object ; objects diff --git a/data/mapHeaders/route18.asm b/data/mapHeaders/route18.asm index c8e988f1..8fb1b3bc 100755 --- a/data/mapHeaders/route18.asm +++ b/data/mapHeaders/route18.asm @@ -3,6 +3,6 @@ Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29) db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_17, ROUTE_17_WIDTH, ROUTE_17_HEIGHT, 0, 0, ROUTE_17_WIDTH, Route17Blocks - EAST_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, -3, 1, ROUTE_18_HEIGHT + 6, FuchsiaCityBlocks, ROUTE_18_WIDTH + NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17Blocks + EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks, 1 dw Route18Object ; objects diff --git a/data/mapHeaders/route19.asm b/data/mapHeaders/route19.asm index 5f4bc549..2ca85cc1 100755 --- a/data/mapHeaders/route19.asm +++ b/data/mapHeaders/route19.asm @@ -3,6 +3,6 @@ Route19_h: ; 0x54e78 to 0x54e9a (34 bytes) (id=30) db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x) dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts db NORTH | WEST ; connections - NORTH_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, FUCHSIA_CITY_HEIGHT, -3, 2, ROUTE_19_WIDTH + 6, FuchsiaCityBlocks - WEST_MAP_CONNECTION ROUTE_20, ROUTE_20_WIDTH, 18, 0, ROUTE_20_HEIGHT, Route20Blocks, ROUTE_19_WIDTH + NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCityBlocks + WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20Blocks dw Route19Object ; objects diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm index 1d720a6e..564f4a58 100755 --- a/data/mapHeaders/route2.asm +++ b/data/mapHeaders/route2.asm @@ -3,6 +3,6 @@ Route2_h: ; 54000 (15:4000) db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles) dw Route2Blocks, Route2TextPointers, Route2Script db NORTH | SOUTH ;Connection Byte - NORTH_MAP_CONNECTION PEWTER_CITY, PEWTER_CITY_WIDTH, PEWTER_CITY_HEIGHT, -3, 2, ROUTE_2_WIDTH + 6, PewterCityBlocks - SOUTH_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, -3, 2, ROUTE_2_WIDTH + 6, ViridianCityBlocks, ROUTE_2_WIDTH, ROUTE_2_HEIGHT + NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCityBlocks + SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks, 1 dw Route2Object ;Object Data Pointer diff --git a/data/mapHeaders/route20.asm b/data/mapHeaders/route20.asm index 71c6415e..d4f645d8 100755 --- a/data/mapHeaders/route20.asm +++ b/data/mapHeaders/route20.asm @@ -3,6 +3,6 @@ Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31) db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION CINNABAR_ISLAND, CINNABAR_ISLAND_WIDTH, 0, 0, CINNABAR_ISLAND_HEIGHT, CinnabarIslandBlocks, ROUTE_20_WIDTH - EAST_MAP_CONNECTION ROUTE_19, ROUTE_19_WIDTH, -3, 15, ROUTE_20_HEIGHT + 3, Route19Blocks, ROUTE_20_WIDTH + WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks + EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19Blocks dw Route20Object ; objects diff --git a/data/mapHeaders/route21.asm b/data/mapHeaders/route21.asm index f3160814..7f3e0a2f 100755 --- a/data/mapHeaders/route21.asm +++ b/data/mapHeaders/route21.asm @@ -3,6 +3,6 @@ Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32) db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION PALLET_TOWN, PALLET_TOWN_WIDTH, PALLET_TOWN_HEIGHT, 0, 0, PALLET_TOWN_WIDTH, PalletTownBlocks - SOUTH_MAP_CONNECTION CINNABAR_ISLAND, CINNABAR_ISLAND_WIDTH, 0, 0, CINNABAR_ISLAND_WIDTH, CinnabarIslandBlocks, ROUTE_21_WIDTH, ROUTE_21_HEIGHT + NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTownBlocks + SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks, 1 dw Route21Object ; objects diff --git a/data/mapHeaders/route22.asm b/data/mapHeaders/route22.asm index 3eb7a775..598e9224 100755 --- a/data/mapHeaders/route22.asm +++ b/data/mapHeaders/route22.asm @@ -3,6 +3,6 @@ Route22_h: ; 0x50000 to 0x50022 (34 bytes) (id=33) db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x) dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_23, ROUTE_23_WIDTH, ROUTE_23_HEIGHT, 0, 0, ROUTE_23_WIDTH, Route23Blocks - EAST_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, -3, 1, ROUTE_22_HEIGHT + 6, ViridianCityBlocks, ROUTE_22_WIDTH + NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23Blocks + EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCityBlocks, 1 dw Route22Object ; objects diff --git a/data/mapHeaders/route23.asm b/data/mapHeaders/route23.asm index 385fbeb9..32dc36fd 100755 --- a/data/mapHeaders/route23.asm +++ b/data/mapHeaders/route23.asm @@ -3,6 +3,6 @@ Route23_h: ; 0x5033f to 0x50361 (34 bytes) (id=34) db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x) dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION INDIGO_PLATEAU, INDIGO_PLATEAU_WIDTH, INDIGO_PLATEAU_HEIGHT, 0, 0, INDIGO_PLATEAU_WIDTH, IndigoPlateauBlocks - SOUTH_MAP_CONNECTION ROUTE_22, ROUTE_22_WIDTH, 0, 0, ROUTE_23_WIDTH + 3, Route22Blocks, ROUTE_23_WIDTH, ROUTE_23_HEIGHT + NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateauBlocks + SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22Blocks, 1 dw Route23Object ; objects diff --git a/data/mapHeaders/route24.asm b/data/mapHeaders/route24.asm index 03789b29..a445c144 100755 --- a/data/mapHeaders/route24.asm +++ b/data/mapHeaders/route24.asm @@ -3,6 +3,6 @@ Route24_h: ; 0x50682 to 0x506a4 (34 bytes) (id=35) db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x) dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 2, ROUTE_24_WIDTH + 6, CeruleanCityBlocks, ROUTE_24_WIDTH, ROUTE_24_HEIGHT - EAST_MAP_CONNECTION ROUTE_25, ROUTE_25_WIDTH, 0, 0, ROUTE_25_HEIGHT, Route25Blocks, ROUTE_24_WIDTH + SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCityBlocks, 1 + EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25Blocks dw Route24Object ; objects diff --git a/data/mapHeaders/route25.asm b/data/mapHeaders/route25.asm index 426a7d94..a6e62a00 100755 --- a/data/mapHeaders/route25.asm +++ b/data/mapHeaders/route25.asm @@ -3,5 +3,5 @@ Route25_h: ; 0x5079b to 0x507b2 (23 bytes) (id=36) db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x) dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts db WEST ; connections - WEST_MAP_CONNECTION ROUTE_24, ROUTE_24_WIDTH, 0, 0, ROUTE_25_HEIGHT + 3, Route24Blocks, ROUTE_25_WIDTH + WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24Blocks dw Route25Object ; objects diff --git a/data/mapHeaders/route3.asm b/data/mapHeaders/route3.asm index 9f84c675..0003b90a 100755 --- a/data/mapHeaders/route3.asm +++ b/data/mapHeaders/route3.asm @@ -3,6 +3,6 @@ Route3_h: ; 0x541e6 to 0x54208 (34 bytes) (id=14) db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x) dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts db NORTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_4, ROUTE_4_WIDTH, ROUTE_4_HEIGHT, 25, 0, ROUTE_3_WIDTH - 25 + 3, Route4Blocks - WEST_MAP_CONNECTION PEWTER_CITY, PEWTER_CITY_WIDTH, -3, 1, ROUTE_3_HEIGHT + 6, PewterCityBlocks, ROUTE_3_WIDTH + NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4Blocks + WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCityBlocks dw Route3Object ; objects diff --git a/data/mapHeaders/route4.asm b/data/mapHeaders/route4.asm index e1aa6d0e..6e8724c9 100755 --- a/data/mapHeaders/route4.asm +++ b/data/mapHeaders/route4.asm @@ -3,6 +3,6 @@ Route4_h: ; 0x54390 to 0x543b2 (34 bytes) (id=15) db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x) dw Route4Blocks, Route4TextPointers, Route4Script; blocks, texts, scripts db SOUTH | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_3, ROUTE_3_WIDTH, -3, 22, ROUTE_3_WIDTH - 22, Route3Blocks, ROUTE_4_WIDTH, ROUTE_4_HEIGHT - EAST_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 1, ROUTE_4_HEIGHT + 6, CeruleanCityBlocks, ROUTE_4_WIDTH + SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3Blocks + EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCityBlocks, 1 dw Route4Object ; objects diff --git a/data/mapHeaders/route5.asm b/data/mapHeaders/route5.asm index bc9c8034..d35a8dab 100755 --- a/data/mapHeaders/route5.asm +++ b/data/mapHeaders/route5.asm @@ -3,6 +3,6 @@ Route5_h: ; 0x54581 to 0x545a3 (34 bytes) (id=16) db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x) dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, CERULEAN_CITY_HEIGHT, -3, 2, ROUTE_5_WIDTH + 6, CeruleanCityBlocks - SOUTH_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 2, ROUTE_5_WIDTH + 6, SaffronCityBlocks, ROUTE_5_WIDTH, ROUTE_5_HEIGHT + NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCityBlocks + SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCityBlocks, 1 dw Route5Object ; objects diff --git a/data/mapHeaders/route6.asm b/data/mapHeaders/route6.asm index 8ce2be2b..21dd0872 100755 --- a/data/mapHeaders/route6.asm +++ b/data/mapHeaders/route6.asm @@ -3,6 +3,6 @@ Route6_h: ; 0x58000 to 0x58022 (34 bytes) (id=17) db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x) dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, SAFFRON_CITY_HEIGHT, -3, 2, ROUTE_6_WIDTH + 6, SaffronCityBlocks - SOUTH_MAP_CONNECTION VERMILION_CITY, VERMILION_CITY_WIDTH, -3, 2, ROUTE_6_WIDTH + 6, VermilionCityBlocks, ROUTE_6_WIDTH, ROUTE_6_HEIGHT + NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCityBlocks + SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCityBlocks, 1 dw Route6Object ; objects diff --git a/data/mapHeaders/route7.asm b/data/mapHeaders/route7.asm index 55829642..38fd1e15 100755 --- a/data/mapHeaders/route7.asm +++ b/data/mapHeaders/route7.asm @@ -3,6 +3,6 @@ Route7_h: ; 0x48000 to 0x48022 (34 bytes) (bank=12) (id=18) db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x) dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION CELADON_CITY, CELADON_CITY_WIDTH, -3, 1, ROUTE_7_HEIGHT + 6, CeladonCityBlocks, ROUTE_7_WIDTH - EAST_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 1, ROUTE_7_HEIGHT + 6, SaffronCityBlocks, ROUTE_7_WIDTH + WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCityBlocks + EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCityBlocks, 1 dw Route7Object ; objects diff --git a/data/mapHeaders/route8.asm b/data/mapHeaders/route8.asm index 842fb5a9..14c867ea 100755 --- a/data/mapHeaders/route8.asm +++ b/data/mapHeaders/route8.asm @@ -3,6 +3,6 @@ Route8_h: ; 0x5812d to 0x5814f (34 bytes) (id=19) db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x) dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION SAFFRON_CITY, SAFFRON_CITY_WIDTH, -3, 1, ROUTE_8_HEIGHT + 6, SaffronCityBlocks, ROUTE_8_WIDTH - EAST_MAP_CONNECTION LAVENDER_TOWN, LAVENDER_TOWN_WIDTH, 0, 0, LAVENDER_TOWN_HEIGHT, LavenderTownBlocks, ROUTE_8_WIDTH + WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCityBlocks + EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTownBlocks dw Route8Object ; objects diff --git a/data/mapHeaders/route9.asm b/data/mapHeaders/route9.asm index d33a9b33..30982dd4 100755 --- a/data/mapHeaders/route9.asm +++ b/data/mapHeaders/route9.asm @@ -3,6 +3,6 @@ Route9_h: ; 0x54686 to 0x546a8 (34 bytes) (id=20) db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x) dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION CERULEAN_CITY, CERULEAN_CITY_WIDTH, -3, 1, ROUTE_9_HEIGHT + 6, CeruleanCityBlocks, ROUTE_9_WIDTH - EAST_MAP_CONNECTION ROUTE_10, ROUTE_10_WIDTH, 0, 0, ROUTE_9_HEIGHT + 3, Route10Blocks, ROUTE_9_WIDTH + WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCityBlocks + EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10Blocks, 1 dw Route9Object ; objects diff --git a/data/mapHeaders/saffroncity.asm b/data/mapHeaders/saffroncity.asm index 4c1d2d61..3a39b396 100755 --- a/data/mapHeaders/saffroncity.asm +++ b/data/mapHeaders/saffroncity.asm @@ -3,8 +3,8 @@ SaffronCity_h: ; 0x509a4 to 0x509dc (56 bytes) (id=10) db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_5, ROUTE_5_WIDTH, ROUTE_5_HEIGHT, 5, 0, ROUTE_5_WIDTH, Route5Blocks - SOUTH_MAP_CONNECTION ROUTE_6, ROUTE_6_WIDTH, 5, 0, ROUTE_6_WIDTH, Route6Blocks, SAFFRON_CITY_WIDTH, SAFFRON_CITY_HEIGHT - WEST_MAP_CONNECTION ROUTE_7, ROUTE_7_WIDTH, 4, 0, ROUTE_7_HEIGHT, Route7Blocks, SAFFRON_CITY_WIDTH - EAST_MAP_CONNECTION ROUTE_8, ROUTE_8_WIDTH, 4, 0, ROUTE_8_HEIGHT, Route8Blocks, SAFFRON_CITY_WIDTH + NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5Blocks + SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6Blocks, 1 + WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7Blocks + EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8Blocks dw SaffronCityObject ; objects diff --git a/data/mapHeaders/vermilioncity.asm b/data/mapHeaders/vermilioncity.asm index b7a41967..a4118084 100755 --- a/data/mapHeaders/vermilioncity.asm +++ b/data/mapHeaders/vermilioncity.asm @@ -3,6 +3,6 @@ VermilionCity_h: ; 0x18998 to 0x189ba (34 bytes) (bank=6) (id=5) db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x) dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_6, ROUTE_6_WIDTH, ROUTE_6_HEIGHT, 5, 0, ROUTE_6_WIDTH, Route6Blocks - EAST_MAP_CONNECTION ROUTE_11, ROUTE_11_WIDTH, 4, 0, ROUTE_11_HEIGHT, Route11Blocks, VERMILION_CITY_WIDTH + NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6Blocks + EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11Blocks dw VermilionCityObject ; objects diff --git a/data/mapHeaders/viridiancity.asm b/data/mapHeaders/viridiancity.asm index 96aac7ca..f7faa568 100755 --- a/data/mapHeaders/viridiancity.asm +++ b/data/mapHeaders/viridiancity.asm @@ -3,7 +3,7 @@ ViridianCity_h: ; 0x18357 to 0x18384 (45 bytes) (bank=6) (id=1) db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x) dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts db NORTH | SOUTH | WEST ; connections - NORTH_MAP_CONNECTION ROUTE_2, ROUTE_2_WIDTH, ROUTE_2_HEIGHT, 5, 0, ROUTE_2_WIDTH, Route2Blocks - SOUTH_MAP_CONNECTION ROUTE_1, ROUTE_1_WIDTH, 5, 0, ROUTE_1_WIDTH, Route1Blocks, VIRIDIAN_CITY_WIDTH, VIRIDIAN_CITY_HEIGHT - WEST_MAP_CONNECTION ROUTE_22, ROUTE_22_WIDTH, 4, 0, ROUTE_22_HEIGHT, Route22Blocks, VIRIDIAN_CITY_WIDTH + NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2Blocks + SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1Blocks, 1 + WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22Blocks dw ViridianCityObject ; objects diff --git a/macros.asm b/macros.asm index 9899ec29..a25c0006 100644 --- a/macros.asm +++ b/macros.asm @@ -505,75 +505,92 @@ endchannel: MACRO ENDM -;\1 (byte) = connected map id -;\2 (byte) = connected map width -;\3 (byte) = connected map height -;\4 (byte) = x movement of connection strip -;\5 (byte) = connection strip offset -;\6 (byte) = width of connection strip -;\7 (word) = connected map blocks pointer +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = x movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer NORTH_MAP_CONNECTION: MACRO - db \1 ; map id - dw \7 + (\2 * (\3 - 3)) + \5; "Connection Strip" location - dw wOverworldMap + 3 + \4 ; current map position - db \6 ; width of connection strip - db \2 ; map width - db (\3 * 2) - 1 ; y alignment (y coordinate of player when entering map) - db (\4 - \5) * -2 ; x alignment (x coordinate of player when entering map) - dw wOverworldMap + 1 + (\3 * (\2 + 6)) ; window (position of the upper left block after entering the map) -ENDM - -;\1 (byte) = connected map id -;\2 (byte) = connected map width -;\3 (byte) = x movement of connection strip -;\4 (byte) = connection strip offset -;\5 (byte) = width of connection strip -;\6 (word) = connected map blocks pointer -;\7 (byte) = current map width -;\8 (byte) = current map height + db \2 ; map id + dw \5 + (\2_WIDTH * (\2_HEIGHT - 3)) + \4; "Connection Strip" location + dw wOverworldMap + 3 + \3 ; current map position + IF (\1_WIDTH < \2_WIDTH) + db \1_WIDTH - \3 + 3 ; width of connection strip + ELSE + db \2_WIDTH - \4 ; width of connection strip + ENDC + db \2_WIDTH ; map width + db (\2_HEIGHT * 2) - 1 ; y alignment (y coordinate of player when entering map) + db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) + dw wOverworldMap + 1 + (\2_HEIGHT * (\2_WIDTH + 6)) ; window (position of the upper left block after entering the map) +ENDM + +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = x movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +;\6 (flag) = add 3 to width of connection strip (why?) SOUTH_MAP_CONNECTION: MACRO - db \1 ; map id - dw \6 + \4 ; "Conection Strip" location - dw wOverworldMap + 3 + (\8 + 3) * (\7 + 6) + \3 ; current map position - db \5 ; width of connection strip - db \2 ; map width + db \2 ; map id + dw \5 + \4 ; "Conection Strip" location + dw wOverworldMap + 3 + (\1_HEIGHT + 3) * (\1_WIDTH + 6) + \3 ; current map position + IF (\1_WIDTH < \2_WIDTH) + IF (_NARG > 5) + db \1_WIDTH - \3 + 3 ; width of connection strip + ELSE + db \1_WIDTH - \3 ; width of connection strip + ENDC + ELSE + db \2_WIDTH - \4 ; width of connection strip + ENDC + db \2_WIDTH ; map width db 0 ; y alignment (y coordinate of player when entering map) db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map) - dw wOverworldMap + 7 + \2 ; window (position of the upper left block after entering the map) + dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) ENDM -;\1 (byte) = connected map id -;\2 (byte) = connected map width -;\3 (byte) = y movement of connection strip -;\4 (byte) = connection strip offset -;\5 (byte) = height of connection strip -;\6 (word) = connected map blocks pointer -;\7 (byte) = current map width -EAST_MAP_CONNECTION: MACRO - db \1 ; map id - dw \6 + (\2 * \4) ; "Connection Strip" location - dw wOverworldMap - 3 + (\7 + 6) * (\3 + 4) ; current map position - db \5 ; height of connection strip - db \2 ; map width +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = y movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +WEST_MAP_CONNECTION: MACRO + db \2 ; map id + dw \5 + (\2_WIDTH * \4) + \2_WIDTH - 3 ; "Connection Strip" location + dw wOverworldMap + (\1_WIDTH + 6) * (\3 + 3) ; current map position + IF (\1_HEIGHT < \2_HEIGHT) + db \1_HEIGHT - \3 + 3 ; height of connection strip + ELSE + db \2_HEIGHT - \4 ; height of connection strip + ENDC + db \2_WIDTH ; map width db (\3 - \4) * -2 ; y alignment - db 0 ; x alignment - dw wOverworldMap + 7 + \2 ; window (position of the upper left block after entering the map) + db (\2_WIDTH * 2) - 1 ; x alignment + dw wOverworldMap + 6 + (2 * \2_WIDTH) ; window (position of the upper left block after entring the map) ENDM -;\1 (byte) = connected map id -;\2 (byte) = connected map width -;\3 (byte) = y movement of connection strip -;\4 (byte) = connection strip offset -;\5 (byte) = height of connection strip -;\6 (word) = connected map blocks pointer -;\7 (byte) = current map width -WEST_MAP_CONNECTION: MACRO - db \1 ; map id - dw \6 + (\2 * \4) + \2 - 3 ; "Connection Strip" location - dw wOverworldMap + (\7 + 6) * (\3 + 3) ; current map position - db \5 ; height of connection strip - db \2 ; map width +;\1 (byte) = current map id +;\2 (byte) = connected map id +;\3 (byte) = y movement of connection strip +;\4 (byte) = connection strip offset +;\5 (word) = connected map blocks pointer +;\6 (flag) = add 3 to height of connection strip (why?) +EAST_MAP_CONNECTION: MACRO + db \2 ; map id + dw \5 + (\2_WIDTH * \4) ; "Connection Strip" location + dw wOverworldMap - 3 + (\1_WIDTH + 6) * (\3 + 4) ; current map position + IF (\1_HEIGHT < \2_HEIGHT) + IF (_NARG > 5) + db \1_HEIGHT - \3 + 3 ; height of connection strip + ELSE + db \1_HEIGHT - \3 ; height of connection strip + ENDC + ELSE + db \2_HEIGHT - \4 ; height of connection strip + ENDC + db \2_WIDTH ; map width db (\3 - \4) * -2 ; y alignment - db (\2 * 2) - 1 ; x alignment - dw wOverworldMap + 6 + (2 * \2) ; window (position of the upper left block after entring the map) + db 0 ; x alignment + dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) ENDM -- cgit v1.3.1-sl0p From 148d3f3cf28f9c270e3d5043af0692d95bc731c5 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 18 Jul 2015 15:52:03 -0500 Subject: Consolidate coord macros --- engine/HoF_room_pc.asm | 14 +-- engine/battle/animations.asm | 46 +++++----- engine/battle/battle_transitions.asm | 44 ++++----- engine/battle/core.asm | 126 +++++++++++++------------- engine/battle/draw_hud_pokeball_gfx.asm | 4 +- engine/battle/end_of_battle.asm | 2 +- engine/battle/ghost_marowak_anim.asm | 2 +- engine/battle/link_battle_versus_text.asm | 8 +- engine/battle/moveEffects/drain_hp_effect.asm | 4 +- engine/battle/moveEffects/heal_effect.asm | 4 +- engine/battle/moveEffects/recoil_effect.asm | 4 +- engine/battle/scroll_draw_trainer_pic.asm | 2 +- engine/battle/trainer_ai.asm | 2 +- engine/battle/wild_encounters.asm | 2 +- engine/cable_club.asm | 48 +++++----- engine/clear_save.asm | 2 +- engine/evolution.asm | 4 +- engine/evos_moves.asm | 2 +- engine/hall_of_fame.asm | 32 +++---- engine/hidden_object_functions17.asm | 12 +-- engine/hidden_object_functions7.asm | 4 +- engine/intro.asm | 8 +- engine/items/items.asm | 6 +- engine/learn_move.asm | 8 +- engine/menu/bills_pc.asm | 38 ++++---- engine/menu/diploma.asm | 4 +- engine/menu/league_pc.asm | 8 +- engine/menu/main_menu.asm | 58 ++++++------ engine/menu/naming_screen.asm | 22 ++--- engine/menu/party_menu.asm | 2 +- engine/menu/players_pc.asm | 4 +- engine/menu/pokedex.asm | 58 ++++++------ engine/menu/prize_menu.asm | 30 +++--- engine/menu/start_sub_menus.asm | 26 +++--- engine/menu/status_screen.asm | 62 ++++++------- engine/menu/vending_machine.asm | 6 +- engine/oak_speech.asm | 8 +- engine/oak_speech2.asm | 12 +-- engine/overworld/cinnabar_lab.asm | 4 +- engine/overworld/movement.asm | 2 +- engine/overworld/pokemart.asm | 4 +- engine/save.asm | 18 ++-- engine/slot_machine.asm | 26 +++--- engine/titlescreen.asm | 12 +-- engine/town_map.asm | 32 +++---- engine/trade.asm | 32 +++---- engine/trade2.asm | 20 ++-- home.asm | 44 ++++----- home/copy2.asm | 8 +- home/overworld.asm | 12 +-- home/text.asm | 22 ++--- home/vcopy.asm | 6 +- macros.asm | 21 +---- main.asm | 48 +++++----- scripts/bikeshop.asm | 6 +- scripts/celadongamecorner.asm | 16 ++-- scripts/celadonmartroof.asm | 4 +- scripts/vermiliondock.asm | 2 +- 58 files changed, 528 insertions(+), 539 deletions(-) (limited to 'macros.asm') diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 77a07ea3..dc05814a 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -14,9 +14,9 @@ HallOfFamePC: ; 7405c (1d:405c) ld bc, $10 ld a, $ff call FillMemory - hlCoord 0, 0 + coord hl, 0, 0 call FillFourRowsWithBlack - hlCoord 0, 14 + coord hl, 0, 14 call FillFourRowsWithBlack ld a, $c0 ld [rBGP], a @@ -61,7 +61,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb) ld a,[hl] ld [wcf91],a ld [wd0b5],a - hlCoord 8, 6 + coord hl, 8, 6 call GetMonHeader call LoadFrontSpriteByMonIndex ld hl,vBGMap0 + $c @@ -162,7 +162,7 @@ FillFourRowsWithBlack: ; 7417b (1d:417b) jp FillMemory FillMiddleOfScreenWithWhite: ; 74183 (1d:4183) - hlCoord 0, 4 + coord hl, 0, 4 ld bc, SCREEN_WIDTH * 10 ld a, $7f ; blank white tile jp FillMemory @@ -172,7 +172,7 @@ Credits: ; 7418e (1d:418e) push de .nextCreditsScreen pop de - hlCoord 9, 6 + coord hl, 9, 6 push hl call FillMiddleOfScreenWithWhite pop hl @@ -248,10 +248,10 @@ Credits: ; 7418e (1d:418e) ld hl, vChars2 + $600 ld bc, (BANK(TheEndGfx) << 8) + $0a call CopyVideoData - hlCoord 4, 8 + coord hl, 4, 8 ld de, TheEndTextString call PlaceString - hlCoord 4, 9 + coord hl, 4, 9 inc de call PlaceString jp FadeInCreditsText diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 7764603d..6803c38b 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -759,7 +759,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) cp a,1 ret nz .moveGhostMarowakLeft - hlCoord 17, 0 + coord hl, 17, 0 ld de,20 ld bc,$0707 ; 7 rows and 7 columns .loop @@ -858,7 +858,7 @@ DoExplodeSpecialEffects: ; 79009 (1e:5009) cp a,1 ; is it the end of the subanimation? jr nz,FlashScreenEveryFourFrameBlocks ; if it's the end of the subanimation, make the attacking pokemon disappear - hlCoord 1, 5 + coord hl, 1, 5 jp AnimationHideMonPic ; make pokemon disappear ; flashes the screen when subanimation counter is 1 modulo 4 @@ -1292,12 +1292,12 @@ AnimationSlideMonUp: ; 7927a (1e:527a) ld c, $7 ld a, [H_WHOSETURN] and a - hlCoord 1, 6 - deCoord 1, 5 + coord hl, 1, 6 + coord de, 1, 5 ld a, $30 jr z, .asm_79291 - hlCoord 12, 1 - deCoord 12, 0 + coord hl, 12, 1 + coord de, 12, 0 ld a, $ff .asm_79291 ld [wd09f], a @@ -1352,9 +1352,9 @@ _AnimationSlideMonUp: ; 792bf (1e:52bf) jr nz, .asm_792c4 ld a, [H_WHOSETURN] and a - hlCoord 1, 11 + coord hl, 1, 11 jr z, .asm_792e2 - hlCoord 12, 6 + coord hl, 12, 6 .asm_792e2 ld a, [wd09f] inc a @@ -1513,11 +1513,11 @@ AnimationShakeBackAndForth: ; 793b1 (1e:53b1) ; The mon's sprite disappears after this animation. ld a, [H_WHOSETURN] and a - hlCoord 0, 5 - deCoord 2, 5 + coord hl, 0, 5 + coord de, 2, 5 jr z, .asm_793c2 - hlCoord 11, 0 - deCoord 13, 0 + coord hl, 11, 0 + coord de, 13, 0 .asm_793c2 xor a @@ -1561,9 +1561,9 @@ AnimationMoveMonHorizontally: ; 793f9 (1e:53f9) call AnimationHideMonPic ld a, [H_WHOSETURN] and a - hlCoord 2, 5 + coord hl, 2, 5 jr z, .asm_79407 - hlCoord 11, 0 + coord hl, 11, 0 .asm_79407 xor a push hl @@ -1674,12 +1674,12 @@ AnimationSquishMonPic: ; 794a1 (1e:54a1) ld a, [H_WHOSETURN] and a jr z, .asm_794b1 - hlCoord 16, 0 - deCoord 14, 0 + coord hl, 16, 0 + coord de, 14, 0 jr .asm_794b7 .asm_794b1 - hlCoord 5, 5 - deCoord 3, 5 + coord hl, 5, 5 + coord de, 3, 5 .asm_794b7 push de xor a @@ -1883,10 +1883,10 @@ AnimationSlideMonLeft: ; 795f8 (1e:55f8) ld a, [H_WHOSETURN] and a jr z, .asm_79602 - hlCoord 12, 0 + coord hl, 12, 0 jr .asm_79605 .asm_79602 - hlCoord 0, 5 + coord hl, 0, 5 .asm_79605 ld d, $8 .asm_79607 @@ -2121,7 +2121,7 @@ Func_79793: ; 79793 (1e:5793) xor a ld [W_SPRITEFLIPPED], a call GetMonHeader - hlCoord 12, 0 + coord hl, 12, 0 call LoadFrontSpriteByMonIndex jr .asm_797d3 .asm_797b0 @@ -2185,7 +2185,7 @@ Func_7980c: ; 7980c (1e:580c) push bc ld e, a ld d, $0 - hlCoord 0, 0 + coord hl, 0, 0 add hl, de ld bc, $707 call ClearScreenArea @@ -2207,7 +2207,7 @@ GetMonSpriteTileMapPointerFromRowCount: ; 79820 (1e:5820) .enemyTurn ld a, 12 .next - hlCoord 0, 0 + coord hl, 0, 0 ld e, a ld d, 0 add hl, de diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 997f23ef..4f605b52 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -202,7 +202,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72) call BattleTransition_InwardSpiral jr .done .outwardSpiral - hlCoord 10, 10 + coord hl, 10, 10 ld a, $3 ld [wd09f], a ld a, l @@ -231,7 +231,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72) BattleTransition_InwardSpiral: ; 70aaa (1c:4aaa) ld a, $7 ld [wWhichTrade], a - hlCoord 0, 0 + coord hl, 0, 0 ld c, $11 ld de, SCREEN_WIDTH call BattleTransition_InwardSpiral_ @@ -371,20 +371,20 @@ BattleTransition_Shrink: ; 70b7f (1c:4b7f) push bc xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 0, 7 - deCoord 0, 8 + coord hl, 0, 7 + coord de, 0, 8 ld bc, -SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - hlCoord 0, 10 - deCoord 0, 9 + coord hl, 0, 10 + coord de, 0, 9 ld bc, SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - hlCoord 8, 0 - deCoord 9, 0 + coord hl, 8, 0 + coord de, 9, 0 ld bc, -2 call BattleTransition_CopyTiles2 - hlCoord 11, 0 - deCoord 10, 0 + coord hl, 11, 0 + coord de, 10, 0 ld bc, $2 call BattleTransition_CopyTiles2 ld a, $1 @@ -405,20 +405,20 @@ BattleTransition_Split: ; 70bca (1c:4bca) ld [H_AUTOBGTRANSFERENABLED], a .loop push bc - hlCoord 0, 16 - deCoord 0, 17 + coord hl, 0, 16 + coord de, 0, 17 ld bc, -SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - hlCoord 0, 1 - deCoord 0, 0 + coord hl, 0, 1 + coord de, 0, 0 ld bc, SCREEN_WIDTH * 2 call BattleTransition_CopyTiles1 - hlCoord 18, 0 - deCoord 19, 0 + coord hl, 18, 0 + coord de, 19, 0 ld bc, -2 call BattleTransition_CopyTiles2 - hlCoord 1, 0 - deCoord 0, 0 + coord hl, 1, 0 + coord de, 0, 0 ld bc, $2 call BattleTransition_CopyTiles2 call BattleTransition_TransferDelay3 @@ -514,8 +514,8 @@ BattleTransition_CopyTiles2: ; 70c3f (1c:4c3f) ; used for high level wild dungeon battles BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e) ld c, SCREEN_HEIGHT - hlCoord 0, 0 - deCoord 1, 17 + coord hl, 0, 0 + coord de, 1, 17 xor a ld [H_AUTOBGTRANSFERENABLED], a .loop @@ -553,8 +553,8 @@ BattleTransition_VerticalStripes_: ; 70caa (1c:4caa) ; used for low level wild dungeon battles BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4) ld c, SCREEN_WIDTH - hlCoord 0, 0 - deCoord 19, 1 + coord hl, 0, 0 + coord de, 19, 1 xor a ld [H_AUTOBGTRANSFERENABLED], a .loop diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 2f407290..5deeb4dc 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -101,7 +101,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ld a, MESSAGE_BOX ; the usual text box at the bottom of the screen ld [wTextBoxID], a call DisplayTextBoxID - hlCoord 1, 5 + coord hl, 1, 5 ld bc, $307 call ClearScreenArea call DisableLCD @@ -117,7 +117,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) or c jr nz, .clearBackgroundLoop ; copy the work RAM tile map to VRAM - hlCoord 0, 0 + coord hl, 0, 0 ld de, vBGMap0 ld b, 18 ; number of rows .copyRowLoop @@ -176,7 +176,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ld [H_AUTOBGTRANSFERENABLED], a ld a, $31 ld [$ffe1], a - hlCoord 1, 5 + coord hl, 1, 5 predef CopyUncompressedPicToTilemap xor a ld [hWY], a @@ -324,7 +324,7 @@ StartBattle: ; 3c11e (f:411e) ld [wcf91], a ld [wBattleMonSpecies2], a call LoadScreenTilesFromBuffer1 - hlCoord 1, 5 + coord hl, 1, 5 ld a, $9 call SlideTrainerPicOffScreen call SaveScreenTilesToBuffer1 @@ -760,12 +760,12 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3) ret UpdateCurMonHPBar: ; 3c4f6 (f:44f6) - hlCoord 10, 9 ; tile pointer to player HP bar + coord hl, 10, 9 ; tile pointer to player HP bar ld a, [H_WHOSETURN] and a ld a, $1 jr z, .playersTurn - hlCoord 2, 2 ; tile pointer to enemy HP bar + coord hl, 2, 2 ; tile pointer to enemy HP bar xor a .playersTurn push bc @@ -852,10 +852,10 @@ FaintEnemyPokemon: ; 0x3c567 ld hl, wPlayerUsedMove ld [hli], a ld [hl], a - hlCoord 12, 5 - deCoord 12, 6 + coord hl, 12, 5 + coord de, 12, 6 call SlideDownFaintedMonPic - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $40b call ClearScreenArea ld a, [W_ISINBATTLE] @@ -1105,11 +1105,11 @@ RemoveFaintedPlayerMon: ; 3c741 (f:4741) ld [hl], a ld [wBattleMonStatus], a call ReadPlayerMonCurHPAndStatus - hlCoord 9, 7 + coord hl, 9, 7 ld bc, $50b call ClearScreenArea - hlCoord 1, 10 - deCoord 1, 11 + coord hl, 1, 10 + coord de, 1, 11 call SlideDownFaintedMonPic ld a, $1 ld [wBattleResult], a @@ -1137,7 +1137,7 @@ DoUseNextMonDialogue: ; 3c79b (f:479b) ld hl, UseNextMonText call PrintText .displayYesNoBox - hlCoord 13, 9 + coord hl, 13, 9 ld bc, $a0e ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -1214,7 +1214,7 @@ HandlePlayerBlackOut: ; 3c837 (f:4837) ld a, [W_CUROPPONENT] cp $c8 + SONY1 jr nz, .notSony1Battle - hlCoord 0, 0 ; sony 1 battle + coord hl, 0, 0 ; sony 1 battle ld bc, $815 call ClearScreenArea call ScrollTrainerPicAfterBattle @@ -1384,7 +1384,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) ld [wAICount],a ld hl,W_PLAYERBATTSTATUS1 res 5,[hl] - hlCoord 18, 0 + coord hl, 18, 0 ld a,8 call SlideTrainerPicOffScreen call PrintEmptyString @@ -1454,7 +1454,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) jr nz,.next4 ld hl, TrainerAboutToUseText call PrintText - hlCoord 0, 7 + coord hl, 0, 7 ld bc,$0801 ld a,TWO_OPTION_MENU ld [wTextBoxID],a @@ -1489,7 +1489,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) call LoadScreenTilesFromBuffer1 .next4 call ClearSprites - hlCoord 0, 0 + coord hl, 0, 0 ld bc,$040B call ClearScreenArea ld b,1 @@ -1505,7 +1505,7 @@ EnemySendOutFirstMon: ; 3c92a (f:492a) call LoadMonFrontSprite ld a,$CF ld [$FFE1],a - hlCoord 15, 6 + coord hl, 15, 6 predef AnimateSendingOutMon ld a,[wEnemyMonSpecies2] call PlayCry @@ -1835,7 +1835,7 @@ SendOutMon: ; 3cc91 (f:4c91) ld [H_WHOSETURN], a ld a, POOF_ANIM call PlayMoveAnimation - hlCoord 4, 11 + coord hl, 4, 11 predef AnimateSendingOutMon ld a, [wcf91] call PlayCry @@ -1844,10 +1844,10 @@ SendOutMon: ; 3cc91 (f:4c91) ; show 2 stages of the player mon getting smaller before disappearing AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa) - hlCoord 1, 5 + coord hl, 1, 5 ld bc, $707 call ClearScreenArea - hlCoord 3, 7 + coord hl, 3, 7 ld bc, $505 xor a ld [wDownscaledMonSize], a @@ -1856,7 +1856,7 @@ AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa) ld c, 4 call DelayFrames call .clearScreenArea - hlCoord 4, 9 + coord hl, 4, 9 ld bc, $303 ld a, $1 ld [wDownscaledMonSize], a @@ -1868,7 +1868,7 @@ AnimateRetreatingPlayerMon: ; 3ccfa (f:4cfa) ld a, $4c Coorda 5, 11 .clearScreenArea - hlCoord 1, 5 + coord hl, 1, 5 ld bc, $707 jp ClearScreenArea @@ -1891,14 +1891,14 @@ DrawHUDsAndHPBars: ; 3cd5a (f:4d5a) DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 9, 7 + coord hl, 9, 7 ld bc, $50b call ClearScreenArea callab PlacePlayerHUDTiles - hlCoord 18, 9 + coord hl, 18, 9 ld [hl], $73 ld de, wBattleMonNick - hlCoord 10, 7 + coord hl, 10, 7 call CenterMonName call PlaceString ld hl, wBattleMonSpecies @@ -1909,7 +1909,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) ld de, wLoadedMonLevel ld bc, $b call CopyData - hlCoord 14, 8 + coord hl, 14, 8 push hl inc hl ld de, wLoadedMonStatus @@ -1920,7 +1920,7 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) .asm_3cdae ld a, [wLoadedMonSpecies] ld [wcf91], a - hlCoord 10, 9 + coord hl, 10, 9 predef DrawHP ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -1952,15 +1952,15 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60) DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec) xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $40c call ClearScreenArea callab PlaceEnemyHUDTiles ld de, wEnemyMonNick - hlCoord 1, 0 + coord hl, 1, 0 call CenterMonName call PlaceString - hlCoord 4, 1 + coord hl, 4, 1 push hl inc hl ld de, wEnemyMonStatus @@ -2033,7 +2033,7 @@ DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec) .drawHPBar xor a ld [wHPBarType], a - hlCoord 2, 2 + coord hl, 2, 2 call DrawHPBar ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -2108,12 +2108,12 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) ld bc, $b call CopyData ; the following simulates the keystrokes by drawing menus on screen - hlCoord 9, 14 + coord hl, 9, 14 ld [hl], "▶" ld c, 80 call DelayFrames ld [hl], $7f - hlCoord 9, 16 + coord hl, 9, 16 ld [hl], "▶" ld c, 50 call DelayFrames @@ -2145,7 +2145,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) .safariLeftColumn Coorda 13, 14 Coorda 13, 16 - hlCoord 7, 14 + coord hl, 7, 14 ld de, W_NUMSAFARIBALLS ld bc, $102 call PrintNumber @@ -2178,7 +2178,7 @@ DisplayBattleMenu: ; 3ceb3 (f:4eb3) .safariRightColumn Coorda 1, 14 ; clear upper cursor position in left column Coorda 1, 16 ; clear lower cursor position in left column - hlCoord 7, 14 + coord hl, 7, 14 ld de, W_NUMSAFARIBALLS ld bc, $102 call PrintNumber @@ -2399,7 +2399,7 @@ PartyMenuOrRockOrRun: call GBPalNormal jp DisplayBattleMenu .partyMonDeselected - hlCoord 11, 11 + coord hl, 11, 11 ld bc, $81 ld a, $7f call FillMemory @@ -2561,17 +2561,17 @@ MoveSelectionMenu: ; 3d219 (f:5219) ret z ld hl, wBattleMonMoves call .loadmoves - hlCoord 4, 12 + coord hl, 4, 12 ld b, $4 ld c, $e di call TextBoxBorder - hlCoord 4, 12 + coord hl, 4, 12 ld [hl], $7a - hlCoord 10, 12 + coord hl, 10, 12 ld [hl], $7e ei - hlCoord 6, 13 + coord hl, 6, 13 call .writemoves ld b, $5 ld a, $c @@ -2579,11 +2579,11 @@ MoveSelectionMenu: ; 3d219 (f:5219) .mimicmenu ld hl, wEnemyMonMoves call .loadmoves - hlCoord 0, 7 + coord hl, 0, 7 ld b, $4 ld c, $e call TextBoxBorder - hlCoord 2, 8 + coord hl, 2, 8 call .writemoves ld b, $1 ld a, $7 @@ -2594,11 +2594,11 @@ MoveSelectionMenu: ; 3d219 (f:5219) ld bc, $2c call AddNTimes call .loadmoves - hlCoord 4, 7 + coord hl, 4, 7 ld b, $4 ld c, $e call TextBoxBorder - hlCoord 6, 8 + coord hl, 6, 8 call .writemoves ld b, $5 ld a, $7 @@ -2654,7 +2654,7 @@ SelectMenuItem: ; 3d2fe (f:52fe) jr z, .battleselect dec a jr nz, .select - hlCoord 1, 14 + coord hl, 1, 14 ld de, WhichTechniqueString call PlaceString jr .select @@ -2666,7 +2666,7 @@ SelectMenuItem: ; 3d2fe (f:52fe) ld a, [wMenuItemToSwap] and a jr z, .select - hlCoord 5, 13 + coord hl, 5, 13 dec a ld bc, $14 call AddNTimes @@ -2903,7 +2903,7 @@ SwapMovesInMenu: ; 3d435 (f:5435) PrintMenuItem: ; 3d4b6 (f:54b6) xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 0, 8 + coord hl, 0, 8 ld b, $3 ld c, $9 call TextBoxBorder @@ -2916,7 +2916,7 @@ PrintMenuItem: ; 3d4b6 (f:54b6) ld a, [wCurrentMenuItem] cp b jr nz, .notDisabled - hlCoord 1, 10 + coord hl, 1, 10 ld de, DisabledText call PlaceString jr .moveDisabled @@ -2948,23 +2948,23 @@ PrintMenuItem: ; 3d4b6 (f:54b6) and $3f ld [wcd6d], a ; print TYPE/ and / - hlCoord 1, 9 + coord hl, 1, 9 ld de, TypeText call PlaceString - hlCoord 7, 11 + coord hl, 7, 11 ld [hl], "/" - hlCoord 5, 9 + coord hl, 5, 9 ld [hl], "/" - hlCoord 5, 11 + coord hl, 5, 11 ld de, wcd6d ld bc, $102 call PrintNumber - hlCoord 8, 11 + coord hl, 8, 11 ld de, wd11e ld bc, $102 call PrintNumber call GetCurrentMove - hlCoord 2, 10 + coord hl, 2, 10 predef PrintMoveType .moveDisabled ld a, $1 @@ -4924,7 +4924,7 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142) ld [wHPBarNewHP+1],a ld a,[hl] ld [wHPBarNewHP],a - hlCoord 2, 2 + coord hl, 2, 2 xor a ld [wHPBarType],a predef UpdateHPBar2 ; animate the HP bar shortening @@ -5042,7 +5042,7 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200) ld [wHPBarMaxHP+1],a ld a,[hl] ld [wHPBarMaxHP],a - hlCoord 10, 9 + coord hl, 10, 9 ld a,$01 ld [wHPBarType],a predef UpdateHPBar2 ; animate the HP bar shortening @@ -6456,7 +6456,7 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) ld [$0], a ld a, $31 ld [$ffe1], a - hlCoord 1, 5 + coord hl, 1, 5 predef_jump CopyUncompressedPicToTilemap ; does nothing since no stats are ever selected (barring glitches) @@ -6875,7 +6875,7 @@ InitBattleCommon: ; 3ef3d (f:6f3d) ld [$ffe1], a dec a ld [wAICount], a - hlCoord 12, 0 + coord hl, 12, 0 predef CopyUncompressedPicToTilemap ld a, $ff ld [wEnemyMonPartyPos], a @@ -6929,7 +6929,7 @@ InitWildBattle: ; 3ef8b (f:6f8b) xor a ld [W_TRAINERCLASS], a ld [$ffe1], a - hlCoord 12, 0 + coord hl, 12, 0 predef CopyUncompressedPicToTilemap ; common code that executes after init battle code specific to trainer or wild battles @@ -6951,10 +6951,10 @@ InitBattle_Common: ; 3efeb (f:6feb) ld a, $9c ld [H_AUTOBGTRANSFERDEST + 1], a call LoadScreenTilesFromBuffer1 - hlCoord 9, 7 + coord hl, 9, 7 ld bc, $50a call ClearScreenArea - hlCoord 1, 0 + coord hl, 1, 0 ld bc, $40a call ClearScreenArea call ClearSprites @@ -7098,7 +7098,7 @@ LoadMonBackPic: ; 3f103 (f:7103) ; been loaded with GetMonHeader. ld a, [wBattleMonSpecies2] ld [wcf91], a - hlCoord 1, 5 + coord hl, 1, 5 ld b, $7 ld c, $8 call ClearScreenArea diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index 06280a15..e9be0da5 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -121,7 +121,7 @@ PlacePlayerHUDTiles: ; 3a902 (e:6902) ld de, wTrainerFacingDirection ld bc, $3 call CopyData - hlCoord 18, 10 + coord hl, 18, 10 ld de, rIE jr PlaceHUDTiles @@ -136,7 +136,7 @@ PlaceEnemyHUDTiles: ; 3a919 (e:6919) ld de, wTrainerFacingDirection ld bc, $3 call CopyData - hlCoord 1, 2 + coord hl, 1, 2 ld de, $1 jr PlaceHUDTiles diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index 075cbeb1..8264e49c 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -19,7 +19,7 @@ EndOfBattle: ; 137aa (4:77aa) jr z, .placeWinOrLoseString ld de, DrawText .placeWinOrLoseString - hlCoord 6, 8 + coord hl, 6, 8 call PlaceString ld c, 200 call DelayFrames diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 73d3bcc2..e3b3f42c 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -4,7 +4,7 @@ MarowakAnim: ; 708ca (1c:48ca) ld [rOBP1], a call CopyMonPicFromBGToSpriteVRAM ; cover the BG ghost pic with a sprite ghost pic that looks the same ; now that the ghost pic is being displayed using sprites, clear the ghost pic from the BG tilemap - hlCoord 12, 0 + coord hl, 12, 0 ld bc, $707 call ClearScreenArea call Delay3 diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index 7320da29..dfb2fe35 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -1,18 +1,18 @@ ; display "[player] VS [enemy]" text box with pokeballs representing their parties next to the names DisplayLinkBattleVersusTextBox: ; 372d6 (d:72d6) call LoadTextBoxTilePatterns - hlCoord 3, 4 + coord hl, 3, 4 ld b, $7 ld c, $c call TextBoxBorder - hlCoord 4, 5 + coord hl, 4, 5 ld de, wPlayerName call PlaceString - hlCoord 4, 10 + coord hl, 4, 10 ld de, wLinkEnemyTrainerName call PlaceString ; place bold "VS" tiles between the names - hlCoord 9, 8 + coord hl, 9, 8 ld a, $69 ld [hli], a ld [hl], $6a diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm index be52e76d..1096794f 100644 --- a/engine/battle/moveEffects/drain_hp_effect.asm +++ b/engine/battle/moveEffects/drain_hp_effect.asm @@ -71,10 +71,10 @@ DrainHPEffect_: ; 783f (1:783f) .next ld a, [H_WHOSETURN] and a - hlCoord 10, 9 + coord hl, 10, 9 ld a, $1 jr z, .next2 - hlCoord 2, 2 + coord hl, 2, 2 xor a .next2 ld [wHPBarType], a diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm index d9729747..cea63a1f 100644 --- a/engine/battle/moveEffects/heal_effect.asm +++ b/engine/battle/moveEffects/heal_effect.asm @@ -89,10 +89,10 @@ HealEffect_: ; 3b9ec (e:79ec) call BankswitchEtoF ld a, [H_WHOSETURN] and a - hlCoord 10, 9 + coord hl, 10, 9 ld a, $1 jr z, .updateHPBar - hlCoord 2, 2 + coord hl, 2, 2 xor a .updateHPBar ld [wHPBarType], a diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 95b54922..51232af6 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -53,12 +53,12 @@ RecoilEffect_: ; 1392c (4:792c) ld [hli], a ld [hl], a .getHPBarCoords - hlCoord 10, 9 + coord hl, 10, 9 ld a, [H_WHOSETURN] and a ld a, $1 jr z, .updateHPBar - hlCoord 2, 2 + coord hl, 2, 2 xor a .updateHPBar ld [wHPBarType], a diff --git a/engine/battle/scroll_draw_trainer_pic.asm b/engine/battle/scroll_draw_trainer_pic.asm index 18df86e0..b32650e3 100644 --- a/engine/battle/scroll_draw_trainer_pic.asm +++ b/engine/battle/scroll_draw_trainer_pic.asm @@ -6,7 +6,7 @@ _ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3) ld b, $1 call GoPAL_SET callab _LoadTrainerPic - hlCoord 19, 0 + coord hl, 19, 0 ld c, $0 .scrollLoop inc c diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 55314ea9..a53f00f6 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -641,7 +641,7 @@ AIRecoverHP: ; 3a6da (e:66da) AIPrintItemUseAndUpdateHPBar: ; 3a718 (e:6718) call AIPrintItemUse_ - hlCoord 2, 2 + coord hl, 2, 2 xor a ld [wHPBarType],a predef UpdateHPBar2 diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 03dc6fb6..5964f996 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -25,7 +25,7 @@ TryDoWildEncounter: ; 13870 (4:7870) .asm_1389e ; determine if wild pokemon can appear in the half-block we're standing in ; is the bottom right tile (9,9) of the half-block we're standing in a grass/water tile? - hlCoord 9, 9 + coord hl, 9, 9 ld c, [hl] ld a, [W_GRASSTILE] cp c diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 87f7b34c..fbdb6260 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -9,11 +9,11 @@ CableClub_DoBattleOrTrade: ; 5317 (1:5317) call LoadFontTilePatterns call LoadHpBarAndStatusTilePatterns call LoadTrainerInfoTextBoxTiles - hlCoord 3, 8 + coord hl, 3, 8 ld b, 2 ld c, 12 call CableClub_TextBoxBorder - hlCoord 4, 10 + coord hl, 4, 10 ld de, PleaseWaitString call PlaceString ld hl, wPlayerNumHits @@ -399,7 +399,7 @@ TradeCenter_SelectMon: ld [wTopMenuItemY], a ld a, 1 ld [wTopMenuItemX], a - hlCoord 1, 1 + coord hl, 1, 1 ld bc, $0601 call ClearScreenArea .playerMonMenu_HandleInput @@ -464,11 +464,11 @@ TradeCenter_SelectMon: dec a .displayStatsTradeMenu push af - hlCoord 0, 14 + coord hl, 0, 14 ld b, 2 ld c, 18 call CableClub_TextBoxBorder - hlCoord 2, 16 + coord hl, 2, 16 ld de, .statsTrade call PlaceString xor a @@ -596,15 +596,15 @@ ReturnToCableClubRoom: ; 577d (1:577d) ret TradeCenter_DrawCancelBox: - hlCoord 11, 15 + coord hl, 11, 15 ld a, $7e ld bc, 2 * 20 + 9 call FillMemory - hlCoord 0, 15 + coord hl, 0, 15 ld b, 1 ld c, 9 call CableClub_TextBoxBorder - hlCoord 2, 16 + coord hl, 2, 16 ld de, CancelTextString jp PlaceString @@ -613,7 +613,7 @@ CancelTextString: TradeCenter_PlaceSelectedEnemyMonMenuCursor: ld a, [wSerialSyncAndExchangeNybbleReceiveData] - hlCoord 1, 9 + coord hl, 1, 9 ld bc, 20 call AddNTimes ld [hl], $ec ; cursor @@ -630,24 +630,24 @@ TradeCenter_DisplayStats: jp TradeCenter_DrawCancelBox TradeCenter_DrawPartyLists: - hlCoord 0, 0 + coord hl, 0, 0 ld b, 6 ld c, 18 call CableClub_TextBoxBorder - hlCoord 0, 8 + coord hl, 0, 8 ld b, 6 ld c, 18 call CableClub_TextBoxBorder - hlCoord 5, 0 + coord hl, 5, 0 ld de, wPlayerName call PlaceString - hlCoord 5, 8 + coord hl, 5, 8 ld de, wLinkEnemyTrainerName call PlaceString - hlCoord 2, 1 + coord hl, 2, 1 ld de, wPartySpecies call TradeCenter_PrintPartyListNames - hlCoord 2, 9 + coord hl, 2, 9 ld de, wEnemyPartyMons ; fall through @@ -684,7 +684,7 @@ TradeCenter_Trade: ld [wSerialExchangeNybbleReceiveData], a ld [wMenuWatchMovingOutOfBounds], a ld [wMenuJoypadPollCount], a - hlCoord 0, 12 + coord hl, 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder @@ -709,10 +709,10 @@ TradeCenter_Trade: ld [wd11e], a call GetMonName ld hl, WillBeTradedText - bcCoord 1, 14 + coord bc, 1, 14 call TextCommandProcessor call SaveScreenTilesToBuffer1 - hlCoord 10, 7 + coord hl, 10, 7 ld bc, $080b ld a, TRADE_CANCEL_MENU ld [wTwoOptionMenuID], a @@ -726,11 +726,11 @@ TradeCenter_Trade: ; if trade cancelled ld a, $1 ld [wSerialExchangeNybbleSendData], a - hlCoord 0, 12 + coord hl, 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder - hlCoord 1, 14 + coord hl, 1, 14 ld de, TradeCanceled call PlaceString call Serial_PrintWaitingTextAndSyncAndExchangeNybble @@ -743,11 +743,11 @@ TradeCenter_Trade: dec a ; did the other person cancel? jr nz, .doTrade ; if the other person cancelled - hlCoord 0, 12 + coord hl, 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder - hlCoord 1, 14 + coord hl, 1, 14 ld de, TradeCanceled call PlaceString jp .tradeCancelled @@ -851,11 +851,11 @@ TradeCenter_Trade: call Serial_PrintWaitingTextAndSyncAndExchangeNybble ld c, 40 call DelayFrames - hlCoord 0, 12 + coord hl, 0, 12 ld b, 4 ld c, 18 call CableClub_TextBoxBorder - hlCoord 1, 14 + coord hl, 1, 14 ld de, TradeCompleted call PlaceString predef SaveSAVtoSRAM2 diff --git a/engine/clear_save.asm b/engine/clear_save.asm index 66d7e920..2febb123 100755 --- a/engine/clear_save.asm +++ b/engine/clear_save.asm @@ -5,7 +5,7 @@ DoClearSaveDialogue: ; 1c98a (7:498a) call LoadTextBoxTilePatterns ld hl, ClearSaveDataText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc, $80f ld a, NO_YES_MENU ld [wTwoOptionMenuID], a diff --git a/engine/evolution.asm b/engine/evolution.asm index 4776b3b6..9ed38c21 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -99,7 +99,7 @@ EvolutionSetWholeScreenPalette: ; 7beb4 (1e:7eb4) Evolution_LoadPic: ; 7beb9 (1e:7eb9) call GetMonHeader - hlCoord 7, 2 + coord hl, 7, 2 jp LoadFlippedFrontSpriteByMonIndex Func_7bec2: ; 7bec2 (1e:7ec2) @@ -117,7 +117,7 @@ Func_7bed6: ; 7bed6 (1e:7ed6) push bc xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 7, 2 + coord hl, 7, 2 ld bc, $707 ld de, $d .asm_7bee3 diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 2b54108d..4a253c68 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -121,7 +121,7 @@ Evolution_PartyMonLoop: ; loop over party mons call DelayFrames xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $c14 call ClearScreenArea ld a, $1 diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 81ccffdc..0d933571 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -57,11 +57,11 @@ AnimateHallOfFame: ; 701a0 (1c:41a0) call HoFDisplayAndRecordMonInfo ld c, 80 call DelayFrames - hlCoord 2, 13 + coord hl, 2, 13 ld b, $3 ld c, $e call TextBoxBorder - hlCoord 4, 15 + coord hl, 4, 15 ld de, HallOfFameText call PlaceString ld c, 180 @@ -112,7 +112,7 @@ HoFShowMonOrPlayer: ; 70278 (1c:4278) call HoFLoadPlayerPics jr .next1 .showMon - hlCoord 12, 5 + coord hl, 12, 5 call GetMonHeader call LoadFrontSpriteByMonIndex predef LoadMonBackPic @@ -157,22 +157,22 @@ HoFDisplayAndRecordMonInfo: ; 702e1 (1c:42e1) jp HoFRecordMonInfo HoFDisplayMonInfo: ; 702f0 (1c:42f0) - hlCoord 0, 2 + coord hl, 0, 2 ld b, 9 ld c, 10 call TextBoxBorder - hlCoord 2, 6 + coord hl, 2, 6 ld de, HoFMonInfoText call PlaceString - hlCoord 1, 4 + coord hl, 1, 4 ld de, wcd6d call PlaceString ld a, [wHoFMonLevel] - hlCoord 8, 7 + coord hl, 8, 7 call PrintLevelCommon ld a, [wHoFMonSpecies] ld [wd0b5], a - hlCoord 3, 9 + coord hl, 3, 9 predef PrintMonType ld a, [wHoFMonSpecies] jp PlayCry @@ -203,28 +203,28 @@ HoFLoadPlayerPics: ; 7033e (1c:433e) HoFLoadMonPlayerPicTileIDs: ; 7036d (1c:436d) ; c = base tile ID ld b, 0 - hlCoord 12, 5 + coord hl, 12, 5 predef_jump CopyTileIDsFromList HoFDisplayPlayerStats: ; 70377 (1c:4377) ld hl, wd747 set 3, [hl] predef DisplayDexRating - hlCoord 0, 4 + coord hl, 0, 4 ld b, $6 ld c, $a call TextBoxBorder - hlCoord 5, 0 + coord hl, 5, 0 ld b, $2 ld c, $9 call TextBoxBorder - hlCoord 7, 2 + coord hl, 7, 2 ld de, wPlayerName call PlaceString - hlCoord 1, 6 + coord hl, 1, 6 ld de, HoFPlayTimeText call PlaceString - hlCoord 5, 7 + coord hl, 5, 7 ld de, W_PLAYTIMEHOURS + 1 ld bc, $103 call PrintNumber @@ -233,10 +233,10 @@ HoFDisplayPlayerStats: ; 70377 (1c:4377) ld de, W_PLAYTIMEMINUTES + 1 ld bc, $8102 call PrintNumber - hlCoord 1, 9 + coord hl, 1, 9 ld de, HoFMoneyText call PlaceString - hlCoord 4, 10 + coord hl, 4, 10 ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index a8b4f812..841929b8 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -72,7 +72,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) call LoadMonFrontSprite ld a, $80 ld [$ffe1], a - hlCoord 10, 11 + coord hl, 10, 11 predef AnimateSendingOutMon call WaitForTextScrollButtonPress call LoadScreenTilesFromBuffer1 @@ -109,11 +109,11 @@ LinkCableHelp: ; 5dc29 (17:5c29) .asm_5c51 ld hl, wd730 set 6, [hl] - hlCoord 0, 0 + coord hl, 0, 0 ld b, $8 ld c, $d call TextBoxBorder - hlCoord 2, 2 + coord hl, 2, 2 ld de, HowToLinkText call PlaceString ld hl, LinkCableHelpText2 @@ -193,13 +193,13 @@ ViridianSchoolBlackboard: ; 5dced (17:5ced) .asm_5dd15 ld hl, wd730 set 6, [hl] - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $060a call TextBoxBorder - hlCoord 1, 2 + coord hl, 1, 2 ld de, StatusAilmentText1 call PlaceString - hlCoord 6, 2 + coord hl, 6, 2 ld de, StatusAilmentText2 call PlaceString ld hl, ViridianSchoolBlackboardText2 diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index c835775e..810d9bfe 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -402,11 +402,11 @@ BillsHousePokemonList: ; 1ec05 (7:6c05) .asm_1ec2d ld hl, wd730 set 6, [hl] - hlCoord 0, 0 + coord hl, 0, 0 ld b, $a ld c, $9 call TextBoxBorder - hlCoord 2, 2 + coord hl, 2, 2 ld de, BillsMonListText call PlaceString ld hl, BillsHousePokemonListText2 diff --git a/engine/intro.asm b/engine/intro.asm index bbe47cdb..79cc2101 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -205,7 +205,7 @@ IntroClearScreen: ; 417f0 (10:57f0) IntroClearMiddleOfScreen: ; 417f8 (10:57f8) ; clear the area of the tile map between the black bars on the top and bottom - hlCoord 0, 4 + coord hl, 0, 4 ld bc, SCREEN_WIDTH * 10 IntroClearCommon: ; 417fe (10:57fe) @@ -263,7 +263,7 @@ IntroMoveMon: ; 4180e (10:580e) ret IntroCopyTiles: ; 4183f (10:583f) - hlCoord 13, 7 + coord hl, 13, 7 CopyTileIDsFromList_ZeroBaseTileID: ; 41842 (10:5842) ld c, 0 @@ -337,10 +337,10 @@ PlayShootingStar: ; 4188a (10:588a) IntroDrawBlackBars: ; 418e9 (10:58e9) ; clear the screen and draw black bars on the top and bottom call IntroClearScreen - hlCoord 0, 0 + coord hl, 0, 0 ld c, SCREEN_WIDTH * 4 call IntroPlaceBlackTiles - hlCoord 0, 14 + coord hl, 0, 14 ld c, SCREEN_WIDTH * 4 call IntroPlaceBlackTiles ld hl, vBGMap1 diff --git a/engine/items/items.asm b/engine/items/items.asm index 7617ba6c..bd19c152 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -913,7 +913,7 @@ ItemUseMedicine: ; dabb (3:5abb) sbc b ld [hl],a ld [wHPBarNewHP+1],a - hlCoord 4, 1 + coord hl, 4, 1 ld a,[wWhichPokemon] ld bc,2 * 20 call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled @@ -2095,7 +2095,7 @@ ItemUseTMHM: ; e479 (3:6479) call PrintText ld hl,TeachMachineMoveText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc,$080f ld a,TWO_OPTION_MENU ld [wTextBoxID],a @@ -2486,7 +2486,7 @@ TossItem_: ; e6f1 (3:66f1) call CopyStringToCF4B ; copy name to wcf4b ld hl,IsItOKToTossItemText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc,$080f ld a,TWO_OPTION_MENU ld [wTextBoxID],a diff --git a/engine/learn_move.asm b/engine/learn_move.asm index cb5bdbd7..1c0e038c 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -76,7 +76,7 @@ DontAbandonLearning: ; 6e5b (1:6e5b) AbandonLearning: ; 6eda (1:6eda) ld hl, AbandonLearningText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc, $80f ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -99,7 +99,7 @@ TryingToLearn: ; 6f07 (1:6f07) push hl ld hl, TryingToLearnText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc, $80f ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -120,11 +120,11 @@ TryingToLearn: ; 6f07 (1:6f07) push hl ld hl, WhichMoveToForgetText call PrintText - hlCoord 4, 7 + coord hl, 4, 7 ld b, $4 ld c, $e call TextBoxBorder - hlCoord 6, 8 + coord hl, 6, 8 ld de, wMovesString ld a, [hFlags_0xFFF6] set 2, a diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 59da2774..d491cd38 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -11,17 +11,17 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8) ld a, [wNumHoFTeams] and a jr nz, .leaguePCAvailable - hlCoord 0, 0 + coord hl, 0, 0 ld b, 8 ld c, 14 jr .next .noOaksPC - hlCoord 0, 0 + coord hl, 0, 0 ld b, 6 ld c, 14 jr .next .leaguePCAvailable - hlCoord 0, 0 + coord hl, 0, 0 ld b, 10 ld c, 14 .next @@ -32,15 +32,15 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8) ld a, [wd7f1] bit 0, a jr nz, .metBill - hlCoord 2, 2 + coord hl, 2, 2 ld de, SomeonesPCText jr .next2 .metBill - hlCoord 2, 2 + coord hl, 2, 2 ld de, BillsPCText .next2 call PlaceString - hlCoord 2, 4 + coord hl, 2, 4 ld de, wPlayerName call PlaceString ld l, c @@ -50,7 +50,7 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8) ld a, [wd74b] bit 5, a ; received pokedex? jr z, .noOaksPC2 - hlCoord 2, 6 + coord hl, 2, 6 ld de, OaksPCText call PlaceString ld a, [wNumHoFTeams] @@ -58,20 +58,20 @@ DisplayPCMainMenu:: ; 213c8 (8:53c8) jr z, .noLeaguePC ld a, 4 ld [wMaxMenuItem], a - hlCoord 2, 8 + coord hl, 2, 8 ld de, PKMNLeaguePCText call PlaceString - hlCoord 2, 10 + coord hl, 2, 10 ld de, LogOffPCText jr .next3 .noLeaguePC - hlCoord 2, 8 + coord hl, 2, 8 ld de, LogOffPCText jr .next3 .noOaksPC2 ld a, $2 ld [wMaxMenuItem], a - hlCoord 2, 6 + coord hl, 2, 6 ld de, LogOffPCText .next3 call PlaceString @@ -122,11 +122,11 @@ BillsPCMenu: ; 214e8 (8:54e8) ld bc, (BANK(PokeballTileGraphics) << 8) + $01 call CopyVideoData call LoadScreenTilesFromBuffer2DisableBGTransfer - hlCoord 0, 0 + coord hl, 0, 0 ld b, 10 ld c, 12 call TextBoxBorder - hlCoord 2, 2 + coord hl, 2, 2 ld de, BillsPCMenuText call PlaceString ld hl, wTopMenuItemY @@ -149,7 +149,7 @@ BillsPCMenu: ; 214e8 (8:54e8) ld [wPlayerMonNumber], a ld hl, WhatText call PrintText - hlCoord 9, 14 + coord hl, 9, 14 ld b, 2 ld c, 9 call TextBoxBorder @@ -159,7 +159,7 @@ BillsPCMenu: ; 214e8 (8:54e8) jr c, .singleDigitBoxNum ; two digit box num sub 9 - hlCoord 17, 16 + coord hl, 17, 16 ld [hl], "1" add "0" jr .next @@ -167,7 +167,7 @@ BillsPCMenu: ; 214e8 (8:54e8) add "1" .next Coorda 18, 16 - hlCoord 10, 16 + coord hl, 10, 16 ld de, BoxNoPCText call PlaceString ld a, 1 @@ -391,7 +391,7 @@ HMMoveArray: ; 21745 (8:5745) db -1 DisplayDepositWithdrawMenu: ; 2174b (8:574b) - hlCoord 9, 10 + coord hl, 9, 10 ld b, 6 ld c, 9 call TextBoxBorder @@ -401,9 +401,9 @@ DisplayDepositWithdrawMenu: ; 2174b (8:574b) jr nz, .next ld de, WithdrawPCText .next - hlCoord 11, 12 + coord hl, 11, 12 call PlaceString - hlCoord 11, 14 + coord hl, 11, 14 ld de, StatsCancelPCText call PlaceString ld hl, wTopMenuItemY diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm index 33453a53..56373dd3 100755 --- a/engine/menu/diploma.asm +++ b/engine/menu/diploma.asm @@ -12,7 +12,7 @@ DisplayDiploma: ; 566e2 (15:66e2) ld bc, $0010 ld a, BANK(CircleTile) call FarCopyData2 - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $1012 predef Diploma_TextBoxBorder ld hl, DiplomaTextPointersAndCoords @@ -33,7 +33,7 @@ DisplayDiploma: ; 566e2 (15:66e2) pop bc dec c jr nz, .asm_56715 - hlCoord 10, 4 + coord hl, 10, 4 ld de, wPlayerName call PlaceString callba DrawPlayerCharacter diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index c38ab86b..560ed421 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -95,18 +95,18 @@ LeaguePCShowMon: ; 76610 (1d:6610) ld b, $0B ld c, 0 call GoPAL_SET - hlCoord 12, 5 + coord hl, 12, 5 call GetMonHeader call LoadFrontSpriteByMonIndex call GBPalNormal - hlCoord 0, 13 + coord hl, 0, 13 ld b, 2 ld c, $12 call TextBoxBorder - hlCoord 1, 15 + coord hl, 1, 15 ld de, HallOfFameNoText call PlaceString - hlCoord 16, 15 + coord hl, 16, 15 ld de, wHoFTeamNo ld bc, $0103 call PrintNumber diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 10ad7a2d..9e160f81 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -33,20 +33,20 @@ MainMenu: ; 5af2 (1:5af2) ld a,[wd088] cp a,1 jr z,.next1 - hlCoord 0, 0 + coord hl, 0, 0 ld b,6 ld c,13 call TextBoxBorder - hlCoord 2, 2 + coord hl, 2, 2 ld de,ContinueText call PlaceString jr .next2 .next1 - hlCoord 0, 0 + coord hl, 0, 0 ld b,4 ld c,13 call TextBoxBorder - hlCoord 2, 2 + coord hl, 2, 2 ld de,NewGameText call PlaceString .next2 @@ -139,12 +139,12 @@ LinkMenu: ; 5c0a (1:5c0a) call SaveScreenTilesToBuffer1 ld hl, WhereWouldYouLikeText call PrintText - hlCoord 5, 5 + coord hl, 5, 5 ld b, $6 ld c, $d call TextBoxBorder call UpdateSprites - hlCoord 7, 7 + coord hl, 7, 7 ld de, CableClubOptionsText call PlaceString xor a @@ -340,21 +340,21 @@ CableClubOptionsText: ; 5d97 (1:5d97) ContinueGame: ; 5db5 (1:5db5) xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 4, 7 + coord hl, 4, 7 ld b, $8 ld c, $e call TextBoxBorder - hlCoord 5, 9 + coord hl, 5, 9 ld de, SaveScreenInfoText call PlaceString - hlCoord 12, 9 + coord hl, 12, 9 ld de, wPlayerName call PlaceString - hlCoord 17, 11 + coord hl, 17, 11 call Func_5e2f - hlCoord 16, 13 + coord hl, 16, 13 call Func_5e42 - hlCoord 13, 15 + coord hl, 13, 15 call Func_5e55 ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -364,23 +364,23 @@ ContinueGame: ; 5db5 (1:5db5) PrintSaveScreenText: ; 5def (1:5def) xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 4, 0 + coord hl, 4, 0 ld b, $8 ld c, $e call TextBoxBorder call LoadTextBoxTilePatterns call UpdateSprites - hlCoord 5, 2 + coord hl, 5, 2 ld de, SaveScreenInfoText call PlaceString - hlCoord 12, 2 + coord hl, 12, 2 ld de, wPlayerName call PlaceString - hlCoord 17, 4 + coord hl, 17, 4 call Func_5e2f - hlCoord 16, 6 + coord hl, 16, 6 call Func_5e42 - hlCoord 13, 8 + coord hl, 13, 8 call Func_5e55 ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -424,28 +424,28 @@ SaveScreenInfoText: ; 5e6a (1:5e6a) next "TIME@" DisplayOptionMenu: ; 5e8a (1:5e8a) - hlCoord 0, 0 + coord hl, 0, 0 ld b,3 ld c,18 call TextBoxBorder - hlCoord 0, 5 + coord hl, 0, 5 ld b,3 ld c,18 call TextBoxBorder - hlCoord 0, 10 + coord hl, 0, 10 ld b,3 ld c,18 call TextBoxBorder - hlCoord 1, 1 + coord hl, 1, 1 ld de,TextSpeedOptionText call PlaceString - hlCoord 1, 6 + coord hl, 1, 6 ld de,BattleAnimationOptionText call PlaceString - hlCoord 1, 11 + coord hl, 1, 11 ld de,BattleStyleOptionText call PlaceString - hlCoord 2, 16 + coord hl, 2, 16 ld de,OptionMenuCancelText call PlaceString xor a @@ -639,7 +639,7 @@ SetCursorPositionsFromOptions: ; 604c (1:604c) dec hl ld a,[hl] ld [wOptionsTextSpeedCursorX],a ; text speed cursor X coordinate - hlCoord 0, 3 + coord hl, 0, 3 call .placeUnfilledRightArrow sla c ld a,1 ; On @@ -647,7 +647,7 @@ SetCursorPositionsFromOptions: ; 604c (1:604c) ld a,10 ; Off .storeBattleAnimationCursorX ld [wOptionsBattleAnimCursorX],a ; battle animation cursor X coordinate - hlCoord 0, 8 + coord hl, 0, 8 call .placeUnfilledRightArrow sla c ld a,1 @@ -655,10 +655,10 @@ SetCursorPositionsFromOptions: ; 604c (1:604c) ld a,10 .storeBattleStyleCursorX ld [wOptionsBattleStyleCursorX],a ; battle style cursor X coordinate - hlCoord 0, 13 + coord hl, 0, 13 call .placeUnfilledRightArrow ; cursor in front of Cancel - hlCoord 0, 16 + coord hl, 0, 16 ld a,1 .placeUnfilledRightArrow ld e,a diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 2416f0da..20deb834 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -4,7 +4,7 @@ AskName: ; 64eb (1:64eb) push hl ld a, [W_ISINBATTLE] dec a - hlCoord 0, 0 + coord hl, 0, 0 ld b, $4 ld c, $b call z, ClearScreenArea ; only if in wild batle @@ -13,7 +13,7 @@ AskName: ; 64eb (1:64eb) call GetMonName ld hl, DoYouWantToNicknameText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc, $80f ld a, TWO_OPTION_MENU ld [wTextBoxID], a @@ -93,7 +93,7 @@ DisplayNamingScreen: ; 6596 (1:6596) call LoadHpBarAndStatusTilePatterns call LoadEDTile callba LoadMonPartySpriteGfx - hlCoord 0, 4 + coord hl, 0, 4 ld b, $9 ld c, $12 call TextBoxBorder @@ -343,7 +343,7 @@ PrintAlphabet: ; 676f (1:676f) jr nz, .lowercase ld de, UpperCaseAlphabet .lowercase - hlCoord 2, 5 + coord hl, 2, 5 ld bc, $509 ; 5 rows, 9 columns .outerLoop push bc @@ -374,13 +374,13 @@ PrintNicknameAndUnderscores: ; 680e (1:680e) call CalcStringLength ld a, c ld [wHPBarMaxHP], a - hlCoord 10, 2 + coord hl, 10, 2 ld bc, $10a call ClearScreenArea - hlCoord 10, 2 + coord hl, 10, 2 ld de, wcf4b call PlaceString - hlCoord 10, 3 + coord hl, 10, 3 ld a, [wNamingScreenType] cp NAME_MON_SCREEN jr nc, .pokemon1 @@ -419,7 +419,7 @@ PrintNicknameAndUnderscores: ; 680e (1:680e) .emptySpacesRemaining ld c, a ld b, $0 - hlCoord 10, 3 + coord hl, 10, 3 add hl, bc ld [hl], $77 ; raised underscore tile id ret @@ -467,7 +467,7 @@ CalcStringLength: ; 68eb (1:68eb) jr .loop PrintNamingText: ; 68f8 (1:68f8) - hlCoord 0, 1 + coord hl, 0, 1 ld a, [wNamingScreenType] ld de, YourTextString and a @@ -482,12 +482,12 @@ PrintNamingText: ; 68f8 (1:68f8) pop af ld [wd11e], a call GetMonName - hlCoord 4, 1 + coord hl, 4, 1 call PlaceString ld hl, $1 add hl, bc ld [hl], $c9 - hlCoord 1, 3 + coord hl, 1, 3 ld de, NicknameTextString jr .placeString .notNickname diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index fcdd5c50..00ae3912 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -30,7 +30,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) jp z,.printMessage call ErasePartyMenuCursors callba SendBlkPacket_PartyMenu - hlCoord 3, 0 + coord hl, 3, 0 ld de,wPartySpecies xor a ld c,a diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm index f436ae24..89974dd0 100755 --- a/engine/menu/players_pc.asm +++ b/engine/menu/players_pc.asm @@ -22,12 +22,12 @@ PlayerPCMenu: ; 790c (1:790c) ld hl, wFlags_0xcd60 set 5, [hl] call LoadScreenTilesFromBuffer2 - hlCoord 0, 0 + coord hl, 0, 0 ld b, $8 ld c, $e call TextBoxBorder call UpdateSprites - hlCoord 2, 2 + coord hl, 2, 2 ld de, PlayersPCMenuEntries call PlaceString ld hl, wTopMenuItemY diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 80eedecd..08ce0da9 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -118,7 +118,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) pop af ld [wCurrentMenuItem],a push bc - hlCoord 0, 3 + coord hl, 0, 3 ld de,20 ld bc,$7f0d ; 13 blank tiles call DrawTileLine ; cover up the menu cursor in the pokemon list @@ -126,7 +126,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ret .buttonBPressed push bc - hlCoord 15, 10 + coord hl, 15, 10 ld de,20 ld bc,$7f07 ; 7 blank tiles call DrawTileLine ; cover up the menu cursor in the side menu @@ -153,43 +153,43 @@ HandlePokedexListMenu: ; 40111 (10:4111) xor a ld [H_AUTOBGTRANSFERENABLED],a ; draw the horizontal line separating the seen and owned amounts from the menu - hlCoord 15, 8 + coord hl, 15, 8 ld a,$7a ; horizontal line tile ld [hli],a ld [hli],a ld [hli],a ld [hli],a ld [hli],a - hlCoord 14, 0 + coord hl, 14, 0 ld [hl],$71 ; vertical line tile - hlCoord 14, 1 + coord hl, 14, 1 call DrawPokedexVerticalLine - hlCoord 14, 9 + coord hl, 14, 9 call DrawPokedexVerticalLine ld hl,wPokedexSeen ld b,wPokedexSeenEnd - wPokedexSeen call CountSetBits ld de,wd11e - hlCoord 16, 3 + coord hl, 16, 3 ld bc,$0103 call PrintNumber ; print number of seen pokemon ld hl,wPokedexOwned ld b,wPokedexOwnedEnd - wPokedexOwned call CountSetBits ld de,wd11e - hlCoord 16, 6 + coord hl, 16, 6 ld bc,$0103 call PrintNumber ; print number of owned pokemon - hlCoord 16, 2 + coord hl, 16, 2 ld de,PokedexSeenText call PlaceString - hlCoord 16, 5 + coord hl, 16, 5 ld de,PokedexOwnText call PlaceString - hlCoord 1, 1 + coord hl, 1, 1 ld de,PokedexContentsText call PlaceString - hlCoord 16, 10 + coord hl, 16, 10 ld de,PokedexMenuItemsText call PlaceString ; find the highest pokedex number among the pokemon the player has seen @@ -211,10 +211,10 @@ HandlePokedexListMenu: ; 40111 (10:4111) .loop xor a ld [H_AUTOBGTRANSFERENABLED],a - hlCoord 4, 2 + coord hl, 4, 2 ld bc,$0e0a call ClearScreenArea - hlCoord 1, 3 + coord hl, 1, 3 ld a,[wListScrollOffset] ld [wd11e],a ld d,7 @@ -411,18 +411,18 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) push af xor a ld [hTilesetType],a - hlCoord 0, 0 + coord hl, 0, 0 ld de,1 ld bc,$6414 call DrawTileLine ; draw top border - hlCoord 0, 17 + coord hl, 0, 17 ld b,$6f call DrawTileLine ; draw bottom border - hlCoord 0, 1 + coord hl, 0, 1 ld de,20 ld bc,$6610 call DrawTileLine ; draw left border - hlCoord 19, 1 + coord hl, 19, 1 ld b,$67 call DrawTileLine ; draw right border ld a,$63 ; upper left corner tile @@ -433,14 +433,14 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) Coorda 0, 17 ld a,$6e ; lower right corner tile Coorda 19, 17 - hlCoord 0, 9 + coord hl, 0, 9 ld de,PokedexDataDividerLine call PlaceString ; draw horizontal divider line - hlCoord 9, 6 + coord hl, 9, 6 ld de,HeightWeightText call PlaceString call GetMonName - hlCoord 9, 2 + coord hl, 9, 2 call PlaceString ld hl,PokedexEntryPointers ld a,[wd11e] @@ -452,7 +452,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld a,[hli] ld e,a ld d,[hl] ; de = address of pokedex entry - hlCoord 9, 4 + coord hl, 9, 4 call PlaceString ; print species name ld h,b ld l,c @@ -460,7 +460,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld a,[wd11e] push af call IndexToPokedex - hlCoord 2, 8 + coord hl, 2, 8 ld a, "№" ld [hli],a ld a,$f2 @@ -482,7 +482,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) call Delay3 call GBPalNormal call GetMonHeader ; load pokemon picture location - hlCoord 1, 1 + coord hl, 1, 1 call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture ld a,[wcf91] call PlayCry ; play pokemon cry @@ -495,14 +495,14 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description inc de ; de = address of feet (height) ld a,[de] ; reads feet, but a is overwritten without being used - hlCoord 12, 6 + coord hl, 12, 6 ld bc,$0102 call PrintNumber ; print feet (height) ld a,$60 ; feet symbol tile (one tick) ld [hl],a inc de inc de ; de = address of inches (height) - hlCoord 15, 6 + coord hl, 15, 6 ld bc,$8102 call PrintNumber ; print inches (height) ld a,$61 ; inches symbol tile (two ticks) @@ -524,10 +524,10 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld a,[de] ; a = lower byte of weight ld [hl],a ; store lower byte of weight in [hDexWeight + 1] ld de,hDexWeight - hlCoord 11, 8 + coord hl, 11, 8 ld bc,$0205 ; no leading zeroes, right-aligned, 2 bytes, 5 digits call PrintNumber ; print weight - hlCoord 14, 8 + coord hl, 14, 8 ld a,[hDexWeight + 1] sub a,10 ld a,[hDexWeight] @@ -545,7 +545,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2) ld [hDexWeight],a ; restore original value of [hDexWeight] pop hl inc hl ; hl = address of pokedex description text - bcCoord 1, 11 + coord bc, 1, 11 ld a,2 ld [$fff4],a call TextCommandProcessor ; print pokedex description text diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index f7206a7f..d1fa0c72 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -22,7 +22,7 @@ CeladonPrizeMenu: ; 5271b (14:671b) ld a,$01 ld [wTopMenuItemX],a call PrintPrizePrice - hlCoord 0, 2 + coord hl, 0, 2 ld b,$08 ld c,$10 call TextBoxBorder @@ -93,42 +93,42 @@ GetPrizeMenuId: ; 5278e (14:678e) ld a,[W_PRIZE1] ld [wd11e],a call GetItemName - hlCoord 2, 4 + coord hl, 2, 4 call PlaceString ld a,[W_PRIZE2] ld [wd11e],a call GetItemName - hlCoord 2, 6 + coord hl, 2, 6 call PlaceString ld a,[W_PRIZE3] ld [wd11e],a call GetItemName - hlCoord 2, 8 + coord hl, 2, 8 call PlaceString jr .putNoThanksText .putMonName ld a,[W_PRIZE1] ld [wd11e],a call GetMonName - hlCoord 2, 4 + coord hl, 2, 4 call PlaceString ld a,[W_PRIZE2] ld [wd11e],a call GetMonName - hlCoord 2, 6 + coord hl, 2, 6 call PlaceString ld a,[W_PRIZE3] ld [wd11e],a call GetMonName - hlCoord 2, 8 + coord hl, 2, 8 call PlaceString .putNoThanksText - hlCoord 2, 10 + coord hl, 2, 10 ld de,NoThanksText call PlaceString ; put prices on the right side of the textbox ld de,wd141 - hlCoord 13, 5 + coord hl, 13, 5 ; reg. c: ; [low nybble] number of bytes ; [bit 765 = %100] space-padding (not zero-padding) @@ -137,29 +137,29 @@ GetPrizeMenuId: ; 5278e (14:678e) ; used by text-command $02) call PrintBCDNumber ld de,wd143 - hlCoord 13, 7 + coord hl, 13, 7 ld c,(%1 << 7 | 2) call PrintBCDNumber ld de,wd145 - hlCoord 13, 9 + coord hl, 13, 9 ld c,(1 << 7 | 2) jp PrintBCDNumber INCLUDE "data/prizes.asm" PrintPrizePrice: ; 5287a (14:687a) - hlCoord 11, 0 + coord hl, 11, 0 ld b,$01 ld c,$07 call TextBoxBorder call UpdateSprites - hlCoord 12, 0 + coord hl, 12, 0 ld de,.CoinText call PlaceString - hlCoord 13, 1 + coord hl, 13, 1 ld de,.SixSpacesText call PlaceString - hlCoord 13, 1 + coord hl, 13, 1 ld de,wPlayerCoins ld c,%10000010 call PrintBCDNumber diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index 2804ef7b..0036d66e 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -285,7 +285,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) ; writes a blank tile to all possible menu cursor positions on the party menu ErasePartyMenuCursors: ; 132ed (4:72ed) - hlCoord 0, 1 + coord hl, 0, 1 ld bc,2 * 20 ; menu cursor positions are 2 rows apart ld a,6 ; 6 menu cursor positions .loop @@ -526,10 +526,10 @@ DrawTrainerInfo: ; 1349a (4:749a) ld bc,(BANK(RedPicFront) << 8) | $01 predef DisplayPicCenteredOrUpperRight call DisableLCD - hlCoord 0, 2 + coord hl, 0, 2 ld a," " call TrainerInfo_DrawVerticalLine - hlCoord 1, 2 + coord hl, 1, 2 call TrainerInfo_DrawVerticalLine ld hl,vChars2 + $70 ld de,vChars2 @@ -572,7 +572,7 @@ DrawTrainerInfo: ; 1349a (4:749a) dec a ld [hli],a ld [hl],1 - hlCoord 0, 0 + coord hl, 0, 0 call TrainerInfo_DrawTextBox ld hl,wTrainerInfoTextBoxWidthPlus1 ld a,16 + 1 @@ -580,27 +580,27 @@ DrawTrainerInfo: ; 1349a (4:749a) dec a ld [hli],a ld [hl],3 - hlCoord 1, 10 + coord hl, 1, 10 call TrainerInfo_DrawTextBox - hlCoord 0, 10 + coord hl, 0, 10 ld a,$d7 call TrainerInfo_DrawVerticalLine - hlCoord 19, 10 + coord hl, 19, 10 call TrainerInfo_DrawVerticalLine - hlCoord 6, 9 + coord hl, 6, 9 ld de,TrainerInfo_BadgesText call PlaceString - hlCoord 2, 2 + coord hl, 2, 2 ld de,TrainerInfo_NameMoneyTimeText call PlaceString - hlCoord 7, 2 + coord hl, 7, 2 ld de,wPlayerName call PlaceString - hlCoord 8, 4 + coord hl, 8, 4 ld de,wPlayerMoney ld c,$e3 call PrintBCDNumber - hlCoord 9, 6 + coord hl, 9, 6 ld de,W_PLAYTIMEHOURS + 1 ; hours ld bc,$4103 call PrintNumber @@ -713,7 +713,7 @@ SwitchPartyMon: ; 13613 (4:7613) SwitchPartyMon_ClearGfx: ; 13625 (4:7625) push af - hlCoord 0, 0 + coord hl, 0, 0 ld bc, SCREEN_WIDTH * 2 call AddNTimes ld c, SCREEN_WIDTH * 2 diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 3f73a84f..75de182b 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -105,7 +105,7 @@ StatusScreen: ; 12953 (4:6953) push af xor a ld [hTilesetType], a - hlCoord 19, 1 + coord hl, 19, 1 ld bc, $060a call DrawLineBox ; Draws the box around name, HP and status ld de, $fffa @@ -113,54 +113,54 @@ StatusScreen: ; 12953 (4:6953) ld [hl], $f2 ; . after No ("." is a different one) dec hl ld [hl], "№" - hlCoord 19, 9 + coord hl, 19, 9 ld bc, $0806 call DrawLineBox ; Draws the box around types, ID No. and OT - hlCoord 10, 9 + coord hl, 10, 9 ld de, Type1Text call PlaceString ; "TYPE1/" - hlCoord 11, 3 + coord hl, 11, 3 predef DrawHP ld hl, wcf25 call GetHealthBarColor ld b, $3 call GoPAL_SET ; SGB palette - hlCoord 16, 6 + coord hl, 16, 6 ld de, wLoadedMonStatus call PrintStatusCondition jr nz, .StatusWritten - hlCoord 16, 6 + coord hl, 16, 6 ld de, OKText call PlaceString ; "OK" .StatusWritten - hlCoord 9, 6 + coord hl, 9, 6 ld de, StatusText call PlaceString ; "STATUS/" - hlCoord 14, 2 + coord hl, 14, 2 call PrintLevel ; Pokémon level ld a, [W_MONHDEXNUM] ld [wd11e], a ld [wd0b5], a predef IndexToPokedex - hlCoord 3, 7 + coord hl, 3, 7 ld de, wd11e ld bc, $8103 ; Zero-padded, 3 call PrintNumber ; Pokémon no. - hlCoord 11, 10 + coord hl, 11, 10 predef PrintMonType ld hl, NamePointers2 call .GetStringPointer ld d, h ld e, l - hlCoord 9, 1 + coord hl, 9, 1 call PlaceString ; Pokémon name ld hl, OTPointers call .GetStringPointer ld d, h ld e, l - hlCoord 12, 16 + coord hl, 12, 16 call PlaceString ; OT - hlCoord 12, 14 + coord hl, 12, 14 ld de, wLoadedMonOTID ld bc, $8205 ; 5 call PrintNumber ; ID Number @@ -168,7 +168,7 @@ StatusScreen: ; 12953 (4:6953) call PrintStatsBox call Delay3 call GBPalNormal - hlCoord 1, 0 + coord hl, 1, 0 call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture ld a, [wcf91] call PlayCry ; play Pokémon cry @@ -247,19 +247,19 @@ PrintStatsBox: ; 12ae4 (4:6ae4) ld a, d and a ; a is 0 from the status screen jr nz, .DifferentBox - hlCoord 0, 8 + coord hl, 0, 8 ld b, $8 ld c, $8 call TextBoxBorder ; Draws the box - hlCoord 1, 9 ; Start printing stats from here + coord hl, 1, 9 ; Start printing stats from here ld bc, $0019 ; Number offset jr .PrintStats .DifferentBox - hlCoord 9, 2 + coord hl, 9, 2 ld b, $8 ld c, $9 call TextBoxBorder - hlCoord 11, 3 + coord hl, 11, 3 ld bc, $0018 .PrintStats push bc @@ -306,16 +306,16 @@ StatusScreen2: ; 12b57 (4:6b57) ld bc, NUM_MOVES call CopyData callab FormatMovesString - hlCoord 9, 2 + coord hl, 9, 2 ld bc, $050a call ClearScreenArea ; Clear under name - hlCoord 19, 3 + coord hl, 19, 3 ld [hl], $78 - hlCoord 0, 8 + coord hl, 0, 8 ld b, $8 ld c, $12 call TextBoxBorder ; Draw move container - hlCoord 2, 9 + coord hl, 2, 9 ld de, wMovesString call PlaceString ; Print moves ld a, [wNumMovesMinusOne] @@ -324,7 +324,7 @@ StatusScreen2: ; 12b57 (4:6b57) ld a, $4 sub c ld b, a ; Number of moves ? - hlCoord 11, 10 + coord hl, 11, 10 ld de, SCREEN_WIDTH * 2 ld a, $72 ; special P tile id call StatusScreen_PrintPP ; Print "PP" @@ -336,7 +336,7 @@ StatusScreen2: ; 12b57 (4:6b57) call StatusScreen_PrintPP ; Fill the rest with -- .InitPP ; 12bbb ld hl, wLoadedMonMoves - deCoord 14, 10 + coord de, 14, 10 ld b, 0 .PrintPP ; 12bc3 ld a, [hli] @@ -386,7 +386,7 @@ StatusScreen2: ; 12b57 (4:6b57) cp $4 jr nz, .PrintPP .PPDone - hlCoord 9, 3 + coord hl, 9, 3 ld de, EXPPointsText call PlaceString ld a, [wLoadedMonLevel] ; level @@ -396,7 +396,7 @@ StatusScreen2: ; 12b57 (4:6b57) inc a ld [wLoadedMonLevel], a ; Increase temporarily if not 100 .Level100 - hlCoord 14, 6 + coord hl, 14, 6 ld [hl], $70 ; 1-tile "to" inc hl inc hl @@ -404,22 +404,22 @@ StatusScreen2: ; 12b57 (4:6b57) pop af ld [wLoadedMonLevel], a ld de, wLoadedMonExp - hlCoord 12, 4 + coord hl, 12, 4 ld bc, $0307 call PrintNumber ; exp call .asm_12c86 ld de, wLoadedMonExp - hlCoord 7, 6 + coord hl, 7, 6 ld bc, $0307 call PrintNumber - hlCoord 9, 0 + coord hl, 9, 0 call StatusScreen_ClearName - hlCoord 9, 1 + coord hl, 9, 1 call StatusScreen_ClearName ld a, [W_MONHDEXNUM] ld [wd11e], a call GetMonName - hlCoord 9, 1 + coord hl, 9, 1 call PlaceString ld a, $1 ld [$ffba], a diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 07cf8854..0f6c6a13 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -17,15 +17,15 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld [wTopMenuItemX], a ld hl, wd730 set 6, [hl] - hlCoord 0, 3 + coord hl, 0, 3 ld b, 8 ld c, 12 call TextBoxBorder call UpdateSprites - hlCoord 2, 5 + coord hl, 2, 5 ld de, DrinkText call PlaceString - hlCoord 9, 6 + coord hl, 9, 6 ld de, DrinkPriceText call PlaceString ld hl, wd730 diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index bd7f672e..c7b2f4d6 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -68,7 +68,7 @@ OakSpeech: ; 6115 (1:6115) ld [wd0b5],a ld [wcf91],a call GetMonHeader - hlCoord 6, 4 + coord hl, 6, 4 call LoadFlippedFrontSpriteByMonIndex call MovePicLeft ld hl,OakSpeechText2 @@ -141,7 +141,7 @@ OakSpeech: ; 6115 (1:6115) ld [MBC1RomBank],a ld c,20 call DelayFrames - hlCoord 6, 5 + coord hl, 6, 5 ld b,7 ld c,7 call ClearScreenArea @@ -224,9 +224,9 @@ IntroDisplayPicCenteredOrUpperRight: ; 62a4 (1:62a4) pop bc ld a,c and a - hlCoord 15, 1 + coord hl, 15, 1 jr nz,.next - hlCoord 6, 4 + coord hl, 6, 4 .next xor a ld [$FFE1],a diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm index f881b43b..bdc4d38f 100755 --- a/engine/oak_speech2.asm +++ b/engine/oak_speech2.asm @@ -66,7 +66,7 @@ HisNameIsText: ; 69e7 (1:69e7) OakSpeechSlidePicLeft: ; 69ec (1:69ec) push de - hlCoord 0, 0 + coord hl, 0, 0 lb bc, 12, 11 call ClearScreenArea ; clear the name list text box ld c, 10 @@ -76,13 +76,13 @@ OakSpeechSlidePicLeft: ; 69ec (1:69ec) ld bc, $b call CopyData call Delay3 - hlCoord 12, 4 + coord hl, 12, 4 lb de, 6, 6 * SCREEN_WIDTH + 5 ld a, $ff jr OakSpeechSlidePicCommon OakSpeechSlidePicRight: ; 6a12 (1:6a12) - hlCoord 5, 4 + coord hl, 5, 4 lb de, 6, 6 * SCREEN_WIDTH + 5 xor a @@ -161,15 +161,15 @@ OakSpeechSlidePicCommon: ; 6a19 (1:6a19) DisplayIntroNameTextBox: ; 6a6c (1:6a6c) push de - hlCoord 0, 0 + coord hl, 0, 0 ld b, $a ld c, $9 call TextBoxBorder - hlCoord 3, 0 + coord hl, 3, 0 ld de, .namestring call PlaceString pop de - hlCoord 2, 2 + coord hl, 2, 2 call PlaceString call UpdateSprites xor a diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm index 3d39ad6b..18ce23ed 100755 --- a/engine/overworld/cinnabar_lab.asm +++ b/engine/overworld/cinnabar_lab.asm @@ -20,7 +20,7 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006) dec l ld b, l ld c, $d - hlCoord 0, 0 + coord hl, 0, 0 call TextBoxBorder call UpdateSprites call Func_610c2 @@ -101,7 +101,7 @@ Func_610c2: ; 610c2 (18:50c2) push hl ld [wd11e], a call GetItemName - hlCoord 2, 2 + coord hl, 2, 2 ld a, [$ffdb] ld bc, SCREEN_WIDTH * 2 call AddNTimes diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index c85a4174..89b09bba 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -704,7 +704,7 @@ GetTileSpriteStandsOn: ; 5207 (1:5207) add SCREEN_WIDTH ; screen X tile + 20 ld d, $0 ld e, a - hlCoord 0, 0 + coord hl, 0, 0 add hl, bc add hl, bc add hl, bc diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm index e6fdfc92..ebc99eed 100755 --- a/engine/overworld/pokemart.asm +++ b/engine/overworld/pokemart.asm @@ -84,7 +84,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) ld hl,PokemartTellSellPriceText ld bc,$0e01 call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc,$080f ld a,TWO_OPTION_MENU ld [wTextBoxID],a @@ -162,7 +162,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20) call CopyStringToCF4B ; copy name to wcf4b ld hl,PokemartTellBuyPriceText call PrintText - hlCoord 14, 7 + coord hl, 14, 7 ld bc,$080f ld a,TWO_OPTION_MENU ld [wTextBoxID],a diff --git a/engine/save.asm b/engine/save.asm index 6dc1a46c..56468595 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -151,10 +151,10 @@ SaveSAV: ; 7370a (1c:770a) ret nz .save call SaveSAVtoSRAM - hlCoord 1, 13 + coord hl, 1, 13 ld bc,$0412 call ClearScreenArea ; clear area 4x12 starting at 13,1 - hlCoord 1, 14 + coord hl, 1, 14 ld de,NowSavingString call PlaceString ld c,120 @@ -172,7 +172,7 @@ NowSavingString: SaveSAVConfirm: ; 73768 (1c:7768) call PrintText - hlCoord 0, 7 + coord hl, 0, 7 ld bc,$0801 ld a,TWO_OPTION_MENU ld [wTextBoxID],a @@ -426,20 +426,20 @@ Func_7393f: ; 7393f (1c:793f) and $7f ld [wCurrentMenuItem], a ld [wLastMenuItem], a - hlCoord 0, 0 + coord hl, 0, 0 ld b, $2 ld c, $9 call TextBoxBorder ld hl, ChooseABoxText call PrintText - hlCoord 11, 0 + coord hl, 11, 0 ld b, $c ld c, $7 call TextBoxBorder ld hl, hFlags_0xFFF6 set 2, [hl] ld de, BoxNames - hlCoord 13, 1 + coord hl, 13, 1 call PlaceString ld hl, hFlags_0xFFF6 res 2, [hl] @@ -448,7 +448,7 @@ Func_7393f: ; 7393f (1c:793f) cp 9 jr c, .asm_739a6 sub 9 - hlCoord 8, 2 + coord hl, 8, 2 ld [hl], "1" add "0" jr .asm_739a8 @@ -456,11 +456,11 @@ Func_7393f: ; 7393f (1c:793f) add "1" .asm_739a8 Coorda 9, 2 - hlCoord 1, 2 + coord hl, 1, 2 ld de, BoxNoText call PlaceString call Func_73a84 - hlCoord 18, 1 + coord hl, 18, 1 ld de, wWhichTrade ld bc, SCREEN_WIDTH ld a, $c diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 9a4c85da..ea1eb315 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -79,11 +79,11 @@ MainSlotMachineLoop: ; 37395 (d:7395) ld [wCurrentMenuItem], a ld [wLastMenuItem], a ld [wMenuWatchMovingOutOfBounds], a - hlCoord 14, 11 + coord hl, 14, 11 ld b, 5 ld c, 4 call TextBoxBorder - hlCoord 16, 12 + coord hl, 16, 12 ld de, CoinMultiplierSlotMachineText call PlaceString call HandleMenuInput @@ -133,7 +133,7 @@ MainSlotMachineLoop: ; 37395 (d:7395) .skip2 ld hl, OneMoreGoSlotMachineText call PrintText - hlCoord 14, 12 + coord hl, 14, 12 ld bc, $0d0f xor a ; YES_NO_MENU ld [wTwoOptionMenuID], a @@ -614,7 +614,7 @@ YeahText: ; 37722 (d:7722) SlotMachine_PrintWinningSymbol: ; 37728 (d:7728) ; prints winning symbol and down arrow in text box - hlCoord 2, 14 + coord hl, 2, 14 ld a, [wSlotMachineWinningSymbol] add $25 ld [hli], a @@ -626,7 +626,7 @@ SlotMachine_PrintWinningSymbol: ; 37728 (d:7728) ld [hli], a inc a ld [hl], a - hlCoord 18, 16 + coord hl, 18, 16 ld [hl], $ee ; down arrow ret @@ -641,13 +641,13 @@ SlotMachine_SubtractBetFromPlayerCoins: ; 37741 (d:7741) predef SubBCDPredef SlotMachine_PrintCreditCoins: ; 37754 (d:7754) - hlCoord 5, 1 + coord hl, 5, 1 ld de, wPlayerCoins ld c, $2 jp PrintBCDNumber SlotMachine_PrintPayoutCoins: ; 3775f (d:775f) - hlCoord 11, 1 + coord hl, 11, 1 ld de, wPayoutCoins ld bc, $8204 ; 2 bytes, 4 digits, leading zeroes jp PrintNumber @@ -724,19 +724,19 @@ SlotMachine_LightBalls: ; 377d5 (d:77d5) jr z, SlotMachine_UpdateTwoCoinBallTiles SlotMachine_UpdateThreeCoinBallTiles: ; 377e3 (d:77e3) - hlCoord 3, 2 + coord hl, 3, 2 call SlotMachine_UpdateBallTiles - hlCoord 3, 10 + coord hl, 3, 10 call SlotMachine_UpdateBallTiles SlotMachine_UpdateTwoCoinBallTiles: ; 377ef (d:77ef) - hlCoord 3, 4 + coord hl, 3, 4 call SlotMachine_UpdateBallTiles - hlCoord 3, 8 + coord hl, 3, 8 call SlotMachine_UpdateBallTiles SlotMachine_UpdateOneCoinBallTiles: ; 377fb (d:77fb) - hlCoord 3, 6 + coord hl, 3, 6 SlotMachine_UpdateBallTiles: ; 377fe (d:77fe) ld a, [wd08a] @@ -863,7 +863,7 @@ LoadSlotMachineTiles: ; 378a8 (d:78a8) ld a, BANK(SlotMachineTiles2) call FarCopyData2 ld hl, SlotMachineMap - deCoord 0, 0 + coord de, 0, 0 ld bc, $00f0 call CopyData call EnableLCD diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 74f7ad61..3a4e2e4c 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -70,7 +70,7 @@ ENDC call ClearBothBGMaps ; place tiles for pokemon logo (except for the last row) - hlCoord 2, 1 + coord hl, 2, 1 ld a, $80 ld de, SCREEN_WIDTH ld c, 6 @@ -88,7 +88,7 @@ ENDC jr nz, .pokemonLogoTileLoop ; place tiles for the last row of the pokemon logo - hlCoord 2, 7 + coord hl, 2, 7 ld a, $31 ld b, $10 .pokemonLogoLastTileRowLoop @@ -105,7 +105,7 @@ ENDC ld [hl], a ; place tiles for title screen copyright - hlCoord 2, 17 + coord hl, 2, 17 ld de, .tileScreenCopyrightTiles ld b, $10 .tileScreenCopyrightTilesLoop @@ -362,7 +362,7 @@ ClearBothBGMaps: ; 4519 (1:4519) LoadTitleMonSprite: ; 4524 (1:4524) ld [wcf91], a ld [wd0b5], a - hlCoord 5, 10 + coord hl, 5, 10 call GetMonHeader jp LoadFrontSpriteByMonIndex @@ -381,7 +381,7 @@ LoadCopyrightTiles: ; 4541 (1:4541) ld hl, vChars2 + $600 ld bc, (BANK(NintendoCopyrightLogoGraphics) << 8) + $1c call CopyVideoData - hlCoord 2, 7 + coord hl, 2, 7 ld de, CopyrightTextString jp PlaceString @@ -395,7 +395,7 @@ INCLUDE "data/title_mons.asm" ; prints version text (red, blue) PrintGameVersionOnTitleScreen: ; 4598 (1:4598) - hlCoord 7, 8 + coord hl, 7, 8 ld de, VersionOnTitleScreenText jp PlaceString diff --git a/engine/town_map.asm b/engine/town_map.asm index a92f49e4..302efa0f 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -11,7 +11,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) push af ld b, $0 call DrawPlayerOrBirdSprite ; player sprite - hlCoord 1, 0 + coord hl, 1, 0 ld de, wcd6d call PlaceString ld hl, wOAMBuffer @@ -28,7 +28,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) jr .enterLoop .townMapLoop - hlCoord 0, 0 + coord hl, 0, 0 ld bc, $114 call ClearScreenArea ld hl, TownMapOrder @@ -55,7 +55,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) inc de cp $50 jr nz, .copyMapName - hlCoord 1, 0 + coord hl, 1, 0 ld de, wcd6d call PlaceString ld hl, wOAMBuffer + $10 @@ -117,7 +117,7 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60) push hl call DisplayWildLocations call GetMonName - hlCoord 1, 0 + coord hl, 1, 0 call PlaceString ld h, b ld l, c @@ -152,34 +152,34 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) push af ld [hl], $ff push hl - hlCoord 0, 0 + coord hl, 0, 0 ld de, ToText call PlaceString ld a, [W_CURMAP] ld b, $0 call DrawPlayerOrBirdSprite ld hl, wFlyLocationsList - deCoord 18, 0 + coord de, 18, 0 .townMapFlyLoop ld a, $7f ld [de], a push hl push hl - hlCoord 3, 0 + coord hl, 3, 0 ld bc, $10f call ClearScreenArea pop hl ld a, [hl] ld b, $4 call DrawPlayerOrBirdSprite ; draw bird sprite - hlCoord 3, 0 + coord hl, 3, 0 ld de, wcd6d call PlaceString ld c, 15 call DelayFrames - hlCoord 18, 0 + coord hl, 18, 0 ld [hl], $ed - hlCoord 19, 0 + coord hl, 19, 0 ld [hl], $ee pop hl .inputLoop @@ -218,7 +218,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) ld [hl], a ret .pressedUp - deCoord 18, 0 + coord de, 18, 0 inc hl ld a, [hl] cp $ff @@ -230,7 +230,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) ld hl, wFlyLocationsList jp .townMapFlyLoop .pressedDown - deCoord 19, 0 + coord de, 19, 0 dec hl ld a, [hl] cp $ff @@ -276,7 +276,7 @@ LoadTownMap: ; 7109b (1c:509b) call GBPalWhiteOutWithDelay3 call ClearScreen call UpdateSprites - hlCoord 0, 0 + coord hl, 0, 0 ld b, $12 ld c, $12 call TextBoxBorder @@ -291,7 +291,7 @@ LoadTownMap: ; 7109b (1c:509b) ld bc, $8 ld a, BANK(MonNestIcon) call FarCopyDataDouble - hlCoord 0, 0 + coord hl, 0, 0 ld de, CompressedMap .nextTile ld a, [de] @@ -394,11 +394,11 @@ DisplayWildLocations: ; 711ef (1c:51ef) and a ; were any OAM entries written? jr nz, .drawPlayerSprite ; if no OAM entries were written, print area unknown text - hlCoord 1, 7 + coord hl, 1, 7 ld b, $2 ld c, $f call TextBoxBorder - hlCoord 2, 9 + coord hl, 2, 9 ld de, AreaUnknownText call PlaceString jr .done diff --git a/engine/trade.asm b/engine/trade.asm index 37ff5c05..531085b9 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -148,7 +148,7 @@ Trade_Delay80: ; 41191 (10:5191) jp DelayFrames Trade_ClearTileMap: ; 41196 (10:5196) - hlCoord 0, 0 + coord hl, 0, 0 ld bc, 20 * 18 ld a, " " jp FillMemory @@ -234,7 +234,7 @@ Trade_ShowPlayerMon: ; 41245 (10:5245) ld [hSCX], a xor a ld [H_AUTOBGTRANSFERENABLED], a - hlCoord 4, 0 + coord hl, 4, 0 ld b, 6 ld c, 10 call TextBoxBorder @@ -283,7 +283,7 @@ Trade_DrawOpenEndOfLinkCable: ; 41298 (10:5298) call DelayFrame ld a, %10001011 ld [rLCDC], a - hlCoord 6, 2 + coord hl, 6, 2 ld b, $7 ; open end of link cable tile ID list index call CopyTileIDsFromList_ZeroBaseTileID call Trade_CopyTileMapToVRAM @@ -355,7 +355,7 @@ Trade_ShowEnemyMon: ; 41336 (10:5336) ld a, TRADE_BALL_TILT_ANIM call Trade_ShowAnimation call Trade_ShowClearedWindow - hlCoord 4, 10 + coord hl, 4, 10 ld b, 6 ld c, 10 call TextBoxBorder @@ -372,7 +372,7 @@ Trade_ShowEnemyMon: ; 41336 (10:5336) ld a, [wTradedEnemyMonSpecies] call PlayCry call Trade_Delay100 - hlCoord 4, 10 + coord hl, 4, 10 ld bc, $80c call ClearScreenArea jp PrintTradeTakeCareText @@ -464,7 +464,7 @@ Trade_DrawLeftGameboy: ; 4142d (10:542d) call Trade_ClearTileMap ; draw link cable - hlCoord 11, 4 + coord hl, 11, 4 ld a, $5d ld [hli], a ld a, $5e @@ -475,16 +475,16 @@ Trade_DrawLeftGameboy: ; 4142d (10:542d) jr nz, .loop ; draw gameboy pic - hlCoord 5, 3 + coord hl, 5, 3 ld b, $6 call CopyTileIDsFromList_ZeroBaseTileID ; draw text box with player name below gameboy pic - hlCoord 4, 12 + coord hl, 4, 12 ld b, 2 ld c, 7 call TextBoxBorder - hlCoord 5, 14 + coord hl, 5, 14 ld de, wPlayerName call PlaceString @@ -494,7 +494,7 @@ Trade_DrawRightGameboy: ; 4145c (10:545c) call Trade_ClearTileMap ; draw horizontal segment of link cable - hlCoord 0, 4 + coord hl, 0, 4 ld a, $5e ld c, $e .loop @@ -522,16 +522,16 @@ Trade_DrawRightGameboy: ; 4145c (10:545c) ld [hl], a ; draw gameboy pic - hlCoord 7, 8 + coord hl, 7, 8 ld b, $6 call CopyTileIDsFromList_ZeroBaseTileID ; draw text box with enemy name above link cable - hlCoord 6, 0 + coord hl, 6, 0 ld b, $2 ld c, $7 call TextBoxBorder - hlCoord 7, 2 + coord hl, 7, 2 ld de, wLinkEnemyTrainerName call PlaceString @@ -540,7 +540,7 @@ Trade_DrawRightGameboy: ; 4145c (10:545c) Trade_DrawCableAcrossScreen: ; 4149f (10:549f) ; Draws the link cable across the screen. call Trade_ClearTileMap - hlCoord 0, 4 + coord hl, 0, 4 ld a, $5e ld c, SCREEN_WIDTH .loop @@ -553,7 +553,7 @@ Trade_CopyCableTilesOffScreen: ; 414ae (10:54ae) ; This is used to copy the link cable tiles off screen so that the cable ; continues when the screen is scrolled. push hl - hlCoord 0, 4 + coord hl, 0, 4 call CopyToScreenEdgeTiles pop hl ld a, h @@ -737,7 +737,7 @@ Trade_LoadMonSprite: ; 415a4 (10:55a4) xor $1 ld [H_AUTOBGTRANSFERENABLED], a call GetMonHeader - hlCoord 7, 2 + coord hl, 7, 2 call LoadFlippedFrontSpriteByMonIndex ld c, 10 jp DelayFrames diff --git a/engine/trade2.asm b/engine/trade2.asm index da199e77..d7a16716 100755 --- a/engine/trade2.asm +++ b/engine/trade2.asm @@ -1,43 +1,43 @@ Trade_PrintPlayerMonInfoText: ; 42769 (10:6769) - hlCoord 5, 0 + coord hl, 5, 0 ld de,Trade_MonInfoText call PlaceString ld a,[wTradedPlayerMonSpecies] ld [wd11e],a predef IndexToPokedex - hlCoord 9, 0 + coord hl, 9, 0 ld de,wd11e ld bc,$8103 call PrintNumber - hlCoord 5, 2 + coord hl, 5, 2 ld de,wcf4b call PlaceString - hlCoord 8, 4 + coord hl, 8, 4 ld de,wTradedPlayerMonOT call PlaceString - hlCoord 8, 6 + coord hl, 8, 6 ld de,wTradedPlayerMonOTID ld bc,$8205 jp PrintNumber Trade_PrintEnemyMonInfoText: ; 427a7 (10:67a7) - hlCoord 5, 10 + coord hl, 5, 10 ld de,Trade_MonInfoText call PlaceString ld a,[wTradedEnemyMonSpecies] ld [wd11e],a predef IndexToPokedex - hlCoord 9, 10 + coord hl, 9, 10 ld de,wd11e ld bc,$8103 call PrintNumber - hlCoord 5, 12 + coord hl, 5, 12 ld de,wcd6d call PlaceString - hlCoord 8, 14 + coord hl, 8, 14 ld de,wTradedEnemyMonOT call PlaceString - hlCoord 8, 16 + coord hl, 8, 16 ld de,wTradedEnemyMonOTID ld bc,$8205 jp PrintNumber diff --git a/home.asm b/home.asm index f9004e7e..1b910054 100644 --- a/home.asm +++ b/home.asm @@ -1405,7 +1405,7 @@ DisplayListMenuID:: ; 2be6 (0:2be6) call DisplayTextBoxID ; draw the menu text box call UpdateSprites ; disable sprites behind the text box ; the code up to .skipMovingSprites appears to be useless - hlCoord 4, 2 ; coordinates of upper left corner of menu text box + coord hl, 4, 2 ; coordinates of upper left corner of menu text box ld de,$090e ; height and width of menu text box ld a,[wListMenuID] and a ; is it a PC pokemon list? @@ -1446,7 +1446,7 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53) call DelayFrames xor a ld [wCurrentMenuItem],a - hlCoord 5, 4 + coord hl, 5, 4 ld a,l ld [wMenuCursorLocation],a ld a,h @@ -1568,23 +1568,23 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53) DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) ; text box dimensions/coordinates for just quantity - hlCoord 15, 9 + coord hl, 15, 9 ld b,1 ; height ld c,3 ; width ld a,[wListMenuID] cp a,PRICEDITEMLISTMENU jr nz,.drawTextBox ; text box dimensions/coordinates for quantity and price - hlCoord 7, 9 + coord hl, 7, 9 ld b,1 ; height ld c,11 ; width .drawTextBox call TextBoxBorder - hlCoord 16, 10 + coord hl, 16, 10 ld a,[wListMenuID] cp a,PRICEDITEMLISTMENU jr nz,.printInitialQuantity - hlCoord 8, 10 + coord hl, 8, 10 .printInitialQuantity ld de,InitialQuantityText call PlaceString @@ -1624,7 +1624,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) ld a,[wMaxItemQuantity] ld [hl],a .handleNewQuantity - hlCoord 17, 10 + coord hl, 17, 10 ld a,[wListMenuID] cp a,PRICEDITEMLISTMENU jr nz,.printQuantity @@ -1663,13 +1663,13 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57) ld a,[hDivideBCDQuotient + 2] ld [hMoney + 2],a .skipHalvingPrice - hlCoord 12, 10 + coord hl, 12, 10 ld de,SpacesBetweenQuantityAndPriceText call PlaceString ld de,hMoney ; total price ld c,$a3 call PrintBCDNumber - hlCoord 9, 10 + coord hl, 9, 10 .printQuantity ld de,wItemQuantity ; current quantity ld bc,$8102 ; print leading zeroes, 1 byte, 2 digits @@ -1708,7 +1708,7 @@ ExitListMenu:: ; 2e3b (0:2e3b) ret PrintListMenuEntries:: ; 2e5a (0:2e5a) - hlCoord 5, 3 + coord hl, 5, 3 ld b,$09 ld c,$0e call ClearScreenArea @@ -1733,7 +1733,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a) jr nc,.noCarry inc d .noCarry - hlCoord 6, 4 ; coordinates of first list entry name + coord hl, 6, 4 ; coordinates of first list entry name ld b,4 ; print 4 names .loop ld a,b @@ -3011,7 +3011,7 @@ Func_35f4:: ; 35f4 (0:35f4) InitYesNoTextBoxParameters:: ; 35ff (0:35ff) xor a ; YES_NO_MENU ld [wTwoOptionMenuID], a - hlCoord 14, 7 + coord hl, 14, 7 ld bc, $80f ret @@ -3019,7 +3019,7 @@ YesNoChoicePokeCenter:: ; 360a (0:360a) call SaveScreenTilesToBuffer1 ld a, HEAL_CANCEL_MENU ld [wTwoOptionMenuID], a - hlCoord 11, 6 + coord hl, 11, 6 ld bc, $80c jr DisplayYesNoChoice @@ -3027,7 +3027,7 @@ Func_361a:: ; 361a (0:361a) call SaveScreenTilesToBuffer1 ld a, WIDE_YES_NO_MENU ld [wTwoOptionMenuID], a - hlCoord 12, 7 + coord hl, 12, 7 ld bc, $080d DisplayYesNoChoice:: ; 3628 (0:3628) ld a, TWO_OPTION_MENU @@ -3176,7 +3176,7 @@ UncompressSpriteFromDE:: ; 36eb (0:36eb) SaveScreenTilesToBuffer2:: ; 36f4 (0:36f4) - hlCoord 0, 0 + coord hl, 0, 0 ld de, wTileMapBackup2 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyData @@ -3193,13 +3193,13 @@ LoadScreenTilesFromBuffer2DisableBGTransfer:: ; 3709 (0:3709) xor a ld [H_AUTOBGTRANSFERENABLED], a ld hl, wTileMapBackup2 - deCoord 0, 0 + coord de, 0, 0 ld bc, $168 call CopyData ret SaveScreenTilesToBuffer1:: ; 3719 (0:3719) - hlCoord 0, 0 + coord hl, 0, 0 ld de, wTileMapBackup ld bc, SCREEN_WIDTH * SCREEN_HEIGHT jp CopyData @@ -3208,7 +3208,7 @@ LoadScreenTilesFromBuffer1:: ; 3725 (0:3725) xor a ld [H_AUTOBGTRANSFERENABLED], a ld hl, wTileMapBackup - deCoord 0, 0 + coord de, 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyData ld a, $1 @@ -3470,7 +3470,7 @@ WaitForTextScrollButtonPress:: ; 3865 (0:3865) jr z, .skipAnimation call TownMapSpriteBlinkingAnimation .skipAnimation - hlCoord 18, 16 + coord hl, 18, 16 call HandleDownArrowBlinkTiming pop hl call JoypadLowSensitivity @@ -3946,7 +3946,7 @@ HandleMenuInputPokemonSelection:: ; 3ac2 (0:3ac2) and a ; was a key pressed? jr nz,.keyPressed push hl - hlCoord 18, 11 ; coordinates of blinking down arrow in some menus + coord hl, 18, 11 ; coordinates of blinking down arrow in some menus call HandleDownArrowBlinkTiming ; blink down arrow (if any) pop hl ld a,[wMenuJoypadPollCount] @@ -4037,7 +4037,7 @@ PlaceMenuCursor:: ; 3b7c (0:3b7c) ld a,[wTopMenuItemY] and a ; is the y coordinate 0? jr z,.adjustForXCoord - hlCoord 0, 0 + coord hl, 0, 0 ld bc,SCREEN_WIDTH .topMenuItemLoop add hl,bc @@ -4207,7 +4207,7 @@ PrintText:: ; 3c49 (0:3c49) call Delay3 pop hl Func_3c59:: ; 3c59 (0:3c59) - bcCoord 1, 14 + coord bc, 1, 14 jp TextCommandProcessor diff --git a/home/copy2.asm b/home/copy2.asm index f872ebbc..3f7a4400 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -184,17 +184,17 @@ CopyScreenTileBufferToVRAM:: ld c, 6 ld hl, $600 * 0 - deCoord 0, 6 * 0 + coord de, 0, 6 * 0 call .setup call DelayFrame ld hl, $600 * 1 - deCoord 0, 6 * 1 + coord de, 0, 6 * 1 call .setup call DelayFrame ld hl, $600 * 2 - deCoord 0, 6 * 2 + coord de, 0, 6 * 2 call .setup jp DelayFrame @@ -217,7 +217,7 @@ ClearScreen:: ; for the bg map to update. ld bc, 20 * 18 inc b - hlCoord 0, 0 + coord hl, 0, 0 ld a, $7f .loop ld [hli], a diff --git a/home/overworld.asm b/home/overworld.asm index da514763..0485335a 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1420,7 +1420,7 @@ LoadCurrentMapView:: ; 0caa (0:0caa) ld bc,$0002 add hl,bc .copyToVisibleAreaBuffer - deCoord 0, 0 ; base address for the tiles that are directly transfered to VRAM during V-blank + coord de, 0, 0 ; base address for the tiles that are directly transfered to VRAM during V-blank ld b, SCREEN_HEIGHT .rowLoop2 ld c, SCREEN_WIDTH @@ -1693,7 +1693,7 @@ MoveTileBlockMapPointerNorth:: ; 0e85 (0:0e85) ; the portion of the map that was newly exposed due to the player's movement ScheduleNorthRowRedraw:: ; 0e91 (0:0e91) - hlCoord 0, 0 + coord hl, 0, 0 call CopyToScreenEdgeTiles ld a,[wMapViewVRAMPointer] ld [H_SCREENEDGEREDRAWADDR],a @@ -1715,7 +1715,7 @@ CopyToScreenEdgeTiles:: ; 0ea6 (0:0ea6) ret ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2) - hlCoord 0, 16 + coord hl, 0, 16 call CopyToScreenEdgeTiles ld a,[wMapViewVRAMPointer] ld l,a @@ -1734,7 +1734,7 @@ ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2) ret ScheduleEastColumnRedraw:: ; 0ed3 (0:0ed3) - hlCoord 18, 0 + coord hl, 18, 0 call ScheduleColumnRedrawHelper ld a,[wMapViewVRAMPointer] ld c,a @@ -1772,7 +1772,7 @@ ScheduleColumnRedrawHelper:: ; 0ef2 (0:0ef2) ret ScheduleWestColumnRedraw:: ; 0f08 (0:0f08) - hlCoord 0, 0 + coord hl, 0, 0 call ScheduleColumnRedrawHelper ld a,[wMapViewVRAMPointer] ld [H_SCREENEDGEREDRAWADDR],a @@ -2323,7 +2323,7 @@ LoadMapData:: ; 1241 (0:1241) call LoadTilesetTilePatternData call LoadCurrentMapView ; copy current map view to VRAM - hlCoord 0, 0 + coord hl, 0, 0 ld de,vBGMap0 ld b,18 .vramCopyLoop diff --git a/home/text.asm b/home/text.asm index ebdc83f4..7eb5148b 100644 --- a/home/text.asm +++ b/home/text.asm @@ -76,7 +76,7 @@ PlaceNextChar:: ; 1956 (0:1956) cp $4F jr nz,.next3 pop hl - hlCoord 1, 16 + coord hl, 1, 16 push hl jp PlaceNextChar_inc @@ -290,13 +290,13 @@ Char51:: ; 1ab4 (0:1ab4) Coorda 18, 16 call ProtectedDelay3 call ManualTextScroll - hlCoord 1, 13 + coord hl, 1, 13 ld bc,$0412 call ClearScreenArea ld c,20 call DelayFrames pop de - hlCoord 1, 14 + coord hl, 1, 14 jp PlaceNextChar_inc Char49:: ; 1ad5 (0:1ad5) @@ -305,14 +305,14 @@ Char49:: ; 1ad5 (0:1ad5) Coorda 18, 16 call ProtectedDelay3 call ManualTextScroll - hlCoord 1, 10 + coord hl, 1, 10 ld bc,$0712 call ClearScreenArea ld c,20 call DelayFrames pop de pop hl - hlCoord 1, 11 + coord hl, 1, 11 push hl jp PlaceNextChar_inc @@ -330,13 +330,13 @@ Char4C:: ; 1b0a (0:1b0a) push de call Next1B18 call Next1B18 - hlCoord 1, 16 + coord hl, 1, 16 pop de jp PlaceNextChar_inc Next1B18:: ; 1b18 (0:1b18) - hlCoord 0, 14 - deCoord 0, 13 + coord hl, 0, 14 + coord de, 0, 13 ld b,60 .next ld a,[hli] @@ -344,7 +344,7 @@ Next1B18:: ; 1b18 (0:1b18) inc de dec b jr nz,.next - hlCoord 1, 16 + coord hl, 1, 16 ld a, " " ld b,SCREEN_WIDTH - 2 .next2 @@ -499,7 +499,7 @@ TextCommand03:: ; 1bb7 (0:1bb7) ; (no arguments) TextCommand05:: ; 1bc5 (0:1bc5) pop hl - bcCoord 1, 16 ; address of second line of dialogue text box + coord bc, 1, 16 ; address of second line of dialogue text box jp NextTextCommand ; blink arrow and wait for A or B to be pressed @@ -528,7 +528,7 @@ TextCommand07:: ; 1be7 (0:1be7) call Next1B18 ; scroll up text call Next1B18 pop hl - bcCoord 1, 16 ; address of second line of dialogue text box + coord bc, 1, 16 ; address of second line of dialogue text box jp NextTextCommand ; execute asm inline diff --git a/home/vcopy.asm b/home/vcopy.asm index d42293d9..e90accb5 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -130,7 +130,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57) dec a jr z,.transferMiddleThird .transferBottomThird - hlCoord 0, 12 + coord hl, 0, 12 ld sp,hl ld a,[H_AUTOBGTRANSFERDEST + 1] ld h,a @@ -141,7 +141,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57) xor a ; TRANSFERTOP jr .doTransfer .transferTopThird - hlCoord 0, 0 + coord hl, 0, 0 ld sp,hl ld a,[H_AUTOBGTRANSFERDEST + 1] ld h,a @@ -150,7 +150,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57) ld a,TRANSFERMIDDLE jr .doTransfer .transferMiddleThird - hlCoord 0, 6 + coord hl, 0, 6 ld sp,hl ld a,[H_AUTOBGTRANSFERDEST + 1] ld h,a diff --git a/macros.asm b/macros.asm index a25c0006..10317246 100644 --- a/macros.asm +++ b/macros.asm @@ -67,22 +67,11 @@ bcd3: MACRO coins equs "bcd2" money equs "bcd3" -;\1 = X -;\2 = Y -hlCoord: MACRO - ld hl, wTileMap + 20 * \2 + \1 - ENDM - -;\1 = X -;\2 = Y -deCoord: MACRO - ld de, wTileMap + 20 * \2 + \1 - ENDM - -;\1 = X -;\2 = Y -bcCoord: MACRO - ld bc, wTileMap + 20 * \2 + \1 +;\1 = r +;\2 = X +;\3 = Y +coord: MACRO + ld \1, wTileMap + 20 * \3 + \2 ENDM ;\1 = X diff --git a/main.asm b/main.asm index 9ceb5f81..08747a5a 100755 --- a/main.asm +++ b/main.asm @@ -158,7 +158,7 @@ INCLUDE "engine/overworld/oam.asm" INCLUDE "engine/oam_dma.asm" PrintWaitingText: - hlCoord 3, 10 + coord hl, 3, 10 ld b, $1 ld c, $b ld a, [W_ISINBATTLE] @@ -169,7 +169,7 @@ PrintWaitingText: .asm_4c17 call CableClub_TextBoxBorder .asm_4c1a - hlCoord 4, 11 + coord hl, 4, 11 ld de, WaitingText call PlaceString ld c, 50 @@ -1005,18 +1005,18 @@ DisplayTextIDInit: ; 7096 (1:7096) ld a,[wd74b] bit 5,a ; does the player have the pokedex? ; start menu with pokedex - hlCoord 10, 0 + coord hl, 10, 0 ld b,$0e ld c,$08 jr nz,.drawTextBoxBorder ; start menu without pokedex - hlCoord 10, 0 + coord hl, 10, 0 ld b,$0c ld c,$08 jr .drawTextBoxBorder ; if text ID is not 0 (i.e. not the start menu) then do a standard dialogue text box .notStartMenu - hlCoord 0, 12 + coord hl, 0, 12 ld b,$04 ld c,$12 .drawTextBoxBorder @@ -1074,12 +1074,12 @@ DrawStartMenu: ; 710b (1:710b) ld a,[wd74b] bit 5,a ; does the player have the pokedex? ; menu with pokedex - hlCoord 10, 0 + coord hl, 10, 0 ld b,$0e ld c,$08 jr nz,.drawTextBoxBorder ; shorter menu if the player doesn't have the pokedex - hlCoord 10, 0 + coord hl, 10, 0 ld b,$0c ld c,$08 .drawTextBoxBorder @@ -1097,7 +1097,7 @@ DrawStartMenu: ; 710b (1:710b) ld [wMenuWatchMovingOutOfBounds],a ld hl,wd730 set 6,[hl] ; no pauses between printing each letter - hlCoord 12, 2 + coord hl, 12, 2 ld a,[wd74b] bit 5,a ; does the player have the pokedex? ; case for not having pokdex @@ -1276,7 +1276,7 @@ GetTextBoxIDText: ; 7367 (1:7367) ; hl = address of upper left corner of text box GetAddressOfScreenCoords: ; 7375 (1:7375) push bc - hlCoord 0, 0 + coord hl, 0, 0 ld bc,20 .loop ; loop to add d rows to the base address ld a,d @@ -1437,11 +1437,11 @@ DisplayMoneyBox: ; 74ba (1:74ba) ld a, MONEY_BOX_TEMPLATE ld [wTextBoxID], a call DisplayTextBoxID - hlCoord 13, 1 + coord hl, 13, 1 ld b, $1 ld c, $6 call ClearScreenArea - hlCoord 12, 1 + coord hl, 12, 1 ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber @@ -1734,14 +1734,14 @@ DisplayFieldMoveMonMenu: ; 76e1 (1:76e1) jr nz, .fieldMovesExist ; no field moves - hlCoord 11, 11 + coord hl, 11, 11 ld b, 5 ld c, 7 call TextBoxBorder call UpdateSprites ld a, 12 ld [hFieldMoveMonMenuTopMenuItemX], a - hlCoord 13, 12 + coord hl, 13, 12 ld de, PokemonMenuEntries jp PlaceString @@ -1750,7 +1750,7 @@ DisplayFieldMoveMonMenu: ; 76e1 (1:76e1) ; Calculate the text box position and dimensions based on the leftmost X coord ; of the field move names before adjusting for the number of field moves. - hlCoord 0, 11 + coord hl, 0, 11 ld a, [wFieldMovesLeftmostXCoord] dec a ld e, a @@ -1781,7 +1781,7 @@ DisplayFieldMoveMonMenu: ; 76e1 (1:76e1) call UpdateSprites ; Calculate the position of the first field move name to print. - hlCoord 0, 12 + coord hl, 0, 12 ld a, [wFieldMovesLeftmostXCoord] inc a ld e, a @@ -1830,7 +1830,7 @@ DisplayFieldMoveMonMenu: ; 76e1 (1:76e1) pop hl ld a, [wFieldMovesLeftmostXCoord] ld [hFieldMoveMonMenuTopMenuItemX], a - hlCoord 0, 12 + coord hl, 0, 12 ld a, [wFieldMovesLeftmostXCoord] inc a ld e, a @@ -2316,28 +2316,28 @@ PrintSafariZoneSteps: ; c52f (3:452f) ret c cp UNKNOWN_DUNGEON_2 ret nc - hlCoord 0, 0 + coord hl, 0, 0 ld b, $3 ld c, $7 call TextBoxBorder - hlCoord 1, 1 + coord hl, 1, 1 ld de, wSafariSteps ld bc, $203 call PrintNumber - hlCoord 4, 1 + coord hl, 4, 1 ld de, SafariSteps call PlaceString - hlCoord 1, 3 + coord hl, 1, 3 ld de, SafariBallText call PlaceString ld a, [W_NUMSAFARIBALLS] cp $a jr nc, .asm_c56d - hlCoord 5, 3 + coord hl, 5, 3 ld a, $7f ld [hl], a .asm_c56d - hlCoord 6, 3 + coord hl, 6, 3 ld de, W_NUMSAFARIBALLS ld bc, $102 jp PrintNumber @@ -3025,11 +3025,11 @@ DrawBadges: ; ea03 (3:6a03) ld [hli], a ld [hl], $60 ; First name - hlCoord 2, 11 + coord hl, 2, 11 ld de, wTempObtainedBadgesBooleans call .DrawBadgeRow - hlCoord 2, 14 + coord hl, 2, 14 ld de, wTempObtainedBadgesBooleans + 4 ; call .DrawBadgeRow ; ret diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index 55ceb5cc..6779d9f6 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -51,15 +51,15 @@ BikeShopText1: ; 1d745 (7:5745) ld [wTopMenuItemX], a ld hl, wd730 set 6, [hl] - hlCoord 0, 0 + coord hl, 0, 0 ld b, $4 ld c, $f call TextBoxBorder call UpdateSprites - hlCoord 2, 2 + coord hl, 2, 2 ld de, BikeShopMenuText call PlaceString - hlCoord 8, 3 + coord hl, 8, 3 ld de, BikeShopMenuPrice call PlaceString ld hl, BikeShopText_1d815 diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index b9c006d1..519c0c67 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -480,32 +480,32 @@ CeladonGameCornerText_48f19: ; 48f19 (12:4f19) CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) ld hl, wd730 set 6, [hl] - hlCoord 11, 0 + coord hl, 11, 0 ld b, $5 ld c, $7 call TextBoxBorder call UpdateSprites - hlCoord 12, 1 + coord hl, 12, 1 ld b, $4 ld c, $7 call ClearScreenArea - hlCoord 12, 2 + coord hl, 12, 2 ld de, GameCornerMoneyText call PlaceString - hlCoord 12, 3 + coord hl, 12, 3 ld de, GameCornerBlankText1 call PlaceString - hlCoord 12, 3 + coord hl, 12, 3 ld de, wPlayerMoney ld c, $a3 call PrintBCDNumber - hlCoord 12, 4 + coord hl, 12, 4 ld de, GameCornerCoinText call PlaceString - hlCoord 12, 5 + coord hl, 12, 5 ld de, GameCornerBlankText2 call PlaceString - hlCoord 15, 5 + coord hl, 15, 5 ld de, wPlayerCoins ld c, $82 call PrintBCDNumber diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 8b6ff60f..b0afbee0 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -63,7 +63,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) dec l ld b, l ld c, $c - hlCoord 0, 0 + coord hl, 0, 0 call TextBoxBorder call UpdateSprites call CeladonMartRoofScript_48532 @@ -200,7 +200,7 @@ CeladonMartRoofScript_48532: ; 48532 (12:4532) push hl ld [wd11e], a call GetItemName - hlCoord 2, 2 + coord hl, 2, 2 ld a, [$ffdb] ld bc, SCREEN_WIDTH * 2 call AddNTimes diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index 361f4997..a8cf3b8d 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -53,7 +53,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) call DelayFrames ld b, $9c call CopyScreenTileBufferToVRAM - hlCoord 0, 10 + coord hl, 0, 10 ld bc, $0078 ld a, $14 call FillMemory -- cgit v1.3.1-sl0p From 0e48333fb864b0c8b6914fe1b5e57929d5258080 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 18 Jul 2015 22:22:51 -0500 Subject: Map object macro closes https://github.com/iimarckus/pokered/issues/89 --- data/mapObjects/agatha.asm | 4 +-- data/mapObjects/beach_house.asm | 6 ++-- data/mapObjects/bikeshop.asm | 8 ++--- data/mapObjects/billshouse.asm | 8 ++--- data/mapObjects/blueshouse.asm | 8 ++--- data/mapObjects/bruno.asm | 4 +-- data/mapObjects/celadoncity.asm | 20 ++++++------ data/mapObjects/celadondiner.asm | 12 +++---- data/mapObjects/celadongamecorner.asm | 24 +++++++------- data/mapObjects/celadongym.asm | 18 +++++----- data/mapObjects/celadonhotel.asm | 8 ++--- data/mapObjects/celadonhouse.asm | 8 ++--- data/mapObjects/celadonmansion1.asm | 10 +++--- data/mapObjects/celadonmansion2.asm | 2 +- data/mapObjects/celadonmansion3.asm | 10 +++--- data/mapObjects/celadonmansion4.asm | 2 +- data/mapObjects/celadonmansion5.asm | 6 ++-- data/mapObjects/celadonmart1.asm | 4 +-- data/mapObjects/celadonmart2.asm | 10 +++--- data/mapObjects/celadonmart3.asm | 12 +++---- data/mapObjects/celadonmart4.asm | 8 ++--- data/mapObjects/celadonmart5.asm | 10 +++--- data/mapObjects/celadonmartelevator.asm | 2 +- data/mapObjects/celadonmartroof.asm | 6 ++-- data/mapObjects/celadonpokecenter.asm | 10 +++--- data/mapObjects/celadonprizeroom.asm | 6 ++-- data/mapObjects/ceruleancity.asm | 24 +++++++------- data/mapObjects/ceruleangym.asm | 10 +++--- data/mapObjects/ceruleanhouse1.asm | 6 ++-- data/mapObjects/ceruleanhouse2.asm | 4 +-- data/mapObjects/ceruleanhousetrashed.asm | 6 ++-- data/mapObjects/ceruleanmart.asm | 8 ++--- data/mapObjects/ceruleanpokecenter.asm | 10 +++--- data/mapObjects/cinnabargym.asm | 20 ++++++------ data/mapObjects/cinnabarisland.asm | 6 ++-- data/mapObjects/cinnabarmart.asm | 8 ++--- data/mapObjects/cinnabarpokecenter.asm | 10 +++--- data/mapObjects/colosseum.asm | 4 +-- data/mapObjects/copycatshouse1f.asm | 8 ++--- data/mapObjects/copycatshouse2f.asm | 12 +++---- data/mapObjects/daycarem.asm | 4 +-- data/mapObjects/diglettscave.asm | 2 +- data/mapObjects/diglettscaveroute11.asm | 4 +-- data/mapObjects/diglettscaveroute2.asm | 4 +-- data/mapObjects/fanclub.asm | 14 ++++---- data/mapObjects/fightingdojo.asm | 16 ++++----- data/mapObjects/fuchsiacity.asm | 22 ++++++------- data/mapObjects/fuchsiagym.asm | 18 +++++----- data/mapObjects/fuchsiahouse1.asm | 8 ++--- data/mapObjects/fuchsiahouse2.asm | 8 ++--- data/mapObjects/fuchsiahouse3.asm | 4 +-- data/mapObjects/fuchsiamart.asm | 8 ++--- data/mapObjects/fuchsiameetingroom.asm | 8 ++--- data/mapObjects/fuchsiapokecenter.asm | 10 +++--- data/mapObjects/gary.asm | 6 ++-- data/mapObjects/halloffameroom.asm | 4 +-- data/mapObjects/indigoplateau.asm | 2 +- data/mapObjects/indigoplateaulobby.asm | 12 +++---- data/mapObjects/lab1.asm | 4 +-- data/mapObjects/lab2.asm | 8 ++--- data/mapObjects/lab3.asm | 6 ++-- data/mapObjects/lab4.asm | 6 ++-- data/mapObjects/lance.asm | 4 +-- data/mapObjects/lavenderhouse1.asm | 14 ++++---- data/mapObjects/lavenderhouse2.asm | 6 ++-- data/mapObjects/lavendermart.asm | 8 ++--- data/mapObjects/lavenderpokecenter.asm | 10 +++--- data/mapObjects/lavendertown.asm | 8 ++--- data/mapObjects/lorelei.asm | 4 +-- data/mapObjects/mansion1.asm | 8 ++--- data/mapObjects/mansion2.asm | 10 +++--- data/mapObjects/mansion3.asm | 12 +++---- data/mapObjects/mansion4.asm | 18 +++++----- data/mapObjects/mtmoon1.asm | 28 ++++++++-------- data/mapObjects/mtmoon2.asm | 2 +- data/mapObjects/mtmoon3.asm | 20 ++++++------ data/mapObjects/mtmoonpokecenter.asm | 14 ++++---- data/mapObjects/museum1f.asm | 12 +++---- data/mapObjects/museum2f.asm | 12 +++---- data/mapObjects/namerater.asm | 4 +-- data/mapObjects/oakslab.asm | 24 +++++++------- data/mapObjects/pallettown.asm | 8 ++--- data/mapObjects/pewtercity.asm | 12 +++---- data/mapObjects/pewtergym.asm | 8 ++--- data/mapObjects/pewterhouse1.asm | 8 ++--- data/mapObjects/pewterhouse2.asm | 6 ++-- data/mapObjects/pewtermart.asm | 8 ++--- data/mapObjects/pewterpokecenter.asm | 10 +++--- data/mapObjects/pokemontower1.asm | 12 +++---- data/mapObjects/pokemontower2.asm | 6 ++-- data/mapObjects/pokemontower3.asm | 10 +++--- data/mapObjects/pokemontower4.asm | 14 ++++---- data/mapObjects/pokemontower5.asm | 14 ++++---- data/mapObjects/pokemontower6.asm | 12 +++---- data/mapObjects/pokemontower7.asm | 18 +++++----- data/mapObjects/powerplant.asm | 30 ++++++++--------- data/mapObjects/redshouse1f.asm | 4 +-- data/mapObjects/redshouse2f.asm | 2 +- data/mapObjects/rockethideout1.asm | 16 ++++----- data/mapObjects/rockethideout2.asm | 12 +++---- data/mapObjects/rockethideout3.asm | 10 +++--- data/mapObjects/rockethideout4.asm | 20 ++++++------ data/mapObjects/rockethideoutelevator.asm | 2 +- data/mapObjects/rocktunnel1.asm | 16 ++++----- data/mapObjects/rocktunnel2.asm | 18 +++++----- data/mapObjects/rocktunnelpokecenter.asm | 10 +++--- data/mapObjects/route1.asm | 6 ++-- data/mapObjects/route10.asm | 14 ++++---- data/mapObjects/route11.asm | 22 ++++++------- data/mapObjects/route11gate.asm | 4 +-- data/mapObjects/route11gateupstairs.asm | 6 ++-- data/mapObjects/route12.asm | 22 ++++++------- data/mapObjects/route12gate.asm | 4 +-- data/mapObjects/route12gateupstairs.asm | 4 +-- data/mapObjects/route12house.asm | 4 +-- data/mapObjects/route13.asm | 22 ++++++------- data/mapObjects/route14.asm | 22 ++++++------- data/mapObjects/route15.asm | 24 +++++++------- data/mapObjects/route15gate.asm | 4 +-- data/mapObjects/route15gateupstairs.asm | 4 +-- data/mapObjects/route16.asm | 16 ++++----- data/mapObjects/route16gate.asm | 6 ++-- data/mapObjects/route16gateupstairs.asm | 6 ++-- data/mapObjects/route16house.asm | 6 ++-- data/mapObjects/route17.asm | 22 ++++++------- data/mapObjects/route18.asm | 8 ++--- data/mapObjects/route18gate.asm | 4 +-- data/mapObjects/route18gateupstairs.asm | 4 +-- data/mapObjects/route19.asm | 28 ++++++++-------- data/mapObjects/route2.asm | 6 ++-- data/mapObjects/route20.asm | 22 ++++++------- data/mapObjects/route21.asm | 20 ++++++------ data/mapObjects/route22.asm | 6 ++-- data/mapObjects/route22gate.asm | 4 +-- data/mapObjects/route23.asm | 16 ++++----- data/mapObjects/route24.asm | 18 +++++----- data/mapObjects/route25.asm | 22 ++++++------- data/mapObjects/route2gate.asm | 6 ++-- data/mapObjects/route2house.asm | 6 ++-- data/mapObjects/route3.asm | 20 ++++++------ data/mapObjects/route4.asm | 8 ++--- data/mapObjects/route5.asm | 2 +- data/mapObjects/route5gate.asm | 4 +-- data/mapObjects/route6.asm | 14 ++++---- data/mapObjects/route6gate.asm | 4 +-- data/mapObjects/route7.asm | 2 +- data/mapObjects/route7gate.asm | 4 +-- data/mapObjects/route8.asm | 20 ++++++------ data/mapObjects/route8gate.asm | 4 +-- data/mapObjects/route9.asm | 22 ++++++------- data/mapObjects/safarizonecenter.asm | 4 +-- data/mapObjects/safarizoneeast.asm | 10 +++--- data/mapObjects/safarizoneentrance.asm | 6 ++-- data/mapObjects/safarizonenorth.asm | 6 ++-- data/mapObjects/safarizoneresthouse1.asm | 6 ++-- data/mapObjects/safarizoneresthouse2.asm | 8 ++--- data/mapObjects/safarizoneresthouse3.asm | 8 ++--- data/mapObjects/safarizoneresthouse4.asm | 8 ++--- data/mapObjects/safarizonesecrethouse.asm | 4 +-- data/mapObjects/safarizonewest.asm | 10 +++--- data/mapObjects/saffroncity.asm | 32 +++++++++--------- data/mapObjects/saffrongym.asm | 20 ++++++------ data/mapObjects/saffronhouse1.asm | 10 +++--- data/mapObjects/saffronhouse2.asm | 4 +-- data/mapObjects/saffronmart.asm | 8 ++--- data/mapObjects/saffronpokecenter.asm | 10 +++--- data/mapObjects/school.asm | 6 ++-- data/mapObjects/seafoamislands1.asm | 6 ++-- data/mapObjects/seafoamislands2.asm | 6 ++-- data/mapObjects/seafoamislands3.asm | 6 ++-- data/mapObjects/seafoamislands4.asm | 14 ++++---- data/mapObjects/seafoamislands5.asm | 8 ++--- data/mapObjects/silphco1.asm | 4 +-- data/mapObjects/silphco10.asm | 14 ++++---- data/mapObjects/silphco11.asm | 12 +++---- data/mapObjects/silphco2.asm | 12 +++---- data/mapObjects/silphco3.asm | 10 +++--- data/mapObjects/silphco4.asm | 16 ++++----- data/mapObjects/silphco5.asm | 24 +++++++------- data/mapObjects/silphco6.asm | 22 ++++++------- data/mapObjects/silphco7.asm | 24 +++++++------- data/mapObjects/silphco8.asm | 10 +++--- data/mapObjects/silphco9.asm | 10 +++--- data/mapObjects/silphcoelevator.asm | 2 +- data/mapObjects/ssanne1.asm | 6 ++-- data/mapObjects/ssanne10.asm | 24 +++++++------- data/mapObjects/ssanne2.asm | 6 ++-- data/mapObjects/ssanne3.asm | 4 +-- data/mapObjects/ssanne4.asm | 2 +- data/mapObjects/ssanne5.asm | 12 +++---- data/mapObjects/ssanne6.asm | 16 ++++----- data/mapObjects/ssanne7.asm | 4 +-- data/mapObjects/ssanne8.asm | 24 +++++++------- data/mapObjects/ssanne9.asm | 28 ++++++++-------- data/mapObjects/tradecenter.asm | 4 +-- data/mapObjects/undergroundpathentranceroute5.asm | 4 +-- data/mapObjects/undergroundpathentranceroute6.asm | 4 +-- data/mapObjects/undergroundpathentranceroute7.asm | 4 +-- .../undergroundpathentranceroute7copy.asm | 6 ++-- data/mapObjects/undergroundpathentranceroute8.asm | 4 +-- data/mapObjects/undergroundpathns.asm | 2 +- data/mapObjects/undergroundpathwe.asm | 2 +- data/mapObjects/unknowndungeon1.asm | 8 ++--- data/mapObjects/unknowndungeon2.asm | 8 ++--- data/mapObjects/unknowndungeon3.asm | 8 ++--- data/mapObjects/vermilioncity.asm | 14 ++++---- data/mapObjects/vermiliondock.asm | 2 +- data/mapObjects/vermiliongym.asm | 12 +++---- data/mapObjects/vermilionhouse1.asm | 8 ++--- data/mapObjects/vermilionhouse2.asm | 4 +-- data/mapObjects/vermilionhouse3.asm | 4 +-- data/mapObjects/vermilionmart.asm | 8 ++--- data/mapObjects/vermilionpokecenter.asm | 10 +++--- data/mapObjects/victoryroad1.asm | 16 ++++----- data/mapObjects/victoryroad2.asm | 28 ++++++++-------- data/mapObjects/victoryroad3.asm | 22 ++++++------- data/mapObjects/viridiancity.asm | 16 ++++----- data/mapObjects/viridianforest.asm | 18 +++++----- data/mapObjects/viridianforestentrance.asm | 6 ++-- data/mapObjects/viridianforestexit.asm | 6 ++-- data/mapObjects/viridiangym.asm | 24 +++++++------- data/mapObjects/viridianhouse.asm | 10 +++--- data/mapObjects/viridianmart.asm | 8 ++--- data/mapObjects/viridianpokecenter.asm | 10 +++--- macros.asm | 38 ++++++++++++++++++++++ 225 files changed, 1189 insertions(+), 1151 deletions(-) (limited to 'macros.asm') diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index 4b434885..3ed1f344 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -9,8 +9,8 @@ AgathaObject: ; 0x76534 (size=44) db $0 ; signs - db $1 ; people - db SPRITE_AGATHA, $2 + 4, $5 + 4, $ff, $d0, TRAINER | $1, AGATHA + $C8, $1 + db $1 ; objects + object SPRITE_AGATHA, $5, $2, FACE, DOWN, $1, AGATHA + $C8, $1 ; warp-to EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm index ad648931..0f660357 100644 --- a/data/mapObjects/beach_house.asm +++ b/data/mapObjects/beach_house.asm @@ -11,9 +11,9 @@ BeachHouseObjects: ; 0xf23a4 db 0,$b,5 db 1,$d,6 - db 2 ; people - db SPRITE_FISHER, 3+4, 2+4, $ff, $d0, 1 ; surfin' dude - db $3d, 3+4, 5+4, $fe, $01, 2 ; pikachu + db 2 ; objects + object SPRITE_FISHER, 2, 3, FACE, DOWN, 1 ; surfin' dude + object $3d, 5, 3, WALK, $01, 2 ; pikachu ; warp-to EVENT_DISP BEACH_HOUSE_WIDTH,7,2 diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index 5803e3fb..fb966c17 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -7,10 +7,10 @@ BikeShopObject: ; 0x1d866 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_BIKE_SHOP_GUY, $2 + 4, $6 + 4, $ff, $ff, $1 ; person - db SPRITE_MOM_GEISHA, $6 + 4, $5 + 4, $fe, $1, $2 ; person - db SPRITE_BUG_CATCHER, $3 + 4, $1 + 4, $ff, $d1, $3 ; person + db $3 ; objects + object SPRITE_BIKE_SHOP_GUY, $6, $2, FACE, STAY, $1 ; person + object SPRITE_MOM_GEISHA, $5, $6, WALK, $1, $2 ; person + object SPRITE_BUG_CATCHER, $1, $3, FACE, UP, $3 ; person ; warp-to EVENT_DISP BIKE_SHOP_WIDTH, $7, $2 diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index 2c032bf2..d43379d7 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/billshouse.asm @@ -7,10 +7,10 @@ BillsHouseObject: ; 0x1e8df (size=38) db $0 ; signs - db $3 ; people - db SPRITE_SLOWBRO, $5 + 4, $6 + 4, $ff, $ff, $1 ; person - db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $4 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $6 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_SLOWBRO, $6, $5, FACE, STAY, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $4, FACE, STAY, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $6, $5, FACE, STAY, $3 ; person ; warp-to EVENT_DISP BILLS_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 582733c0..08b0b2fe 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -7,10 +7,10 @@ BluesHouseObject: ; 19bce (6:5bce) db $0 ; signs - db $3 ; people - db SPRITE_DAISY, $3 + 4, $2 + 4, $FF, $D3, $1 ; Daisy, sitting by map - db SPRITE_DAISY, $4 + 4, $6 + 4, $FE, $1, ITEM | $2, $0 ; Daisy, walking around - db SPRITE_BOOK_MAP_DEX, $3 + 4, $3 + 4, $FF, $FF, ITEM | $3, $0 ; map on table + db $3 ; objects + object SPRITE_DAISY, $2, $3, FACE, LEFT, $1 ; Daisy, sitting by map + object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around + object SPRITE_BOOK_MAP_DEX, $3, $3, FACE, STAY, $3, $0 ; map on table ; warp-to EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index 8cbd9411..9c164118 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -9,8 +9,8 @@ BrunoObject: ; 0x763d7 (size=44) db $0 ; signs - db $1 ; people - db SPRITE_BRUNO, $2 + 4, $5 + 4, $ff, $d0, TRAINER | $1, BRUNO + $C8, $1 + db $1 ; objects + object SPRITE_BRUNO, $5, $2, FACE, DOWN, $1, BRUNO + $C8, $1 ; warp-to EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index b19e2f87..68c88808 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -27,16 +27,16 @@ CeladonCityObject: ; 0x18022 (size=189) db $15, $21, $11 ; CeladonCityText17 db $15, $1b, $12 ; CeladonCityText18 - db $9 ; people - db SPRITE_LITTLE_GIRL, $11 + 4, $8 + 4, $fe, $0, $1 ; person - db SPRITE_OLD_PERSON, $1c + 4, $b + 4, $ff, $d1, $2 ; person - db SPRITE_GIRL, $13 + 4, $e + 4, $fe, $1, $3 ; person - db SPRITE_OLD_PERSON, $16 + 4, $19 + 4, $ff, $d0, $4 ; person - db SPRITE_OLD_PERSON, $10 + 4, $16 + 4, $ff, $d0, $5 ; person - db SPRITE_FISHER2, $c + 4, $20 + 4, $ff, $d2, $6 ; person - db SPRITE_SLOWBRO, $c + 4, $1e + 4, $ff, $d3, $7 ; person - db SPRITE_ROCKET, $1d + 4, $20 + 4, $fe, $2, $8 ; person - db SPRITE_ROCKET, $e + 4, $2a + 4, $fe, $2, $9 ; person + db $9 ; objects + object SPRITE_LITTLE_GIRL, $8, $11, WALK, $0, $1 ; person + object SPRITE_OLD_PERSON, $b, $1c, FACE, UP, $2 ; person + object SPRITE_GIRL, $e, $13, WALK, $1, $3 ; person + object SPRITE_OLD_PERSON, $19, $16, FACE, DOWN, $4 ; person + object SPRITE_OLD_PERSON, $16, $10, FACE, DOWN, $5 ; person + object SPRITE_FISHER2, $20, $c, FACE, RIGHT, $6 ; person + object SPRITE_SLOWBRO, $1e, $c, FACE, LEFT, $7 ; person + object SPRITE_ROCKET, $20, $1d, WALK, $2, $8 ; person + object SPRITE_ROCKET, $2a, $e, WALK, $2, $9 ; person ; warp-to EVENT_DISP CELADON_CITY_WIDTH, $d, $8 ; CELADON_MART_1 diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index ffb47d50..c06de73c 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -7,12 +7,12 @@ CeladonDinerObject: ; 0x491bc (size=50) db $0 ; signs - db $5 ; people - db SPRITE_COOK, $5 + 4, $8 + 4, $fe, $2, $1 ; person - db SPRITE_MOM_GEISHA, $2 + 4, $7 + 4, $ff, $ff, $2 ; person - db SPRITE_FAT_BALD_GUY, $4 + 4, $1 + 4, $ff, $d0, $3 ; person - db SPRITE_FISHER2, $3 + 4, $5 + 4, $ff, $d3, $4 ; person - db SPRITE_GYM_HELPER, $1 + 4, $0 + 4, $ff, $d0, $5 ; person + db $5 ; objects + object SPRITE_COOK, $8, $5, WALK, $2, $1 ; person + object SPRITE_MOM_GEISHA, $7, $2, FACE, STAY, $2 ; person + object SPRITE_FAT_BALD_GUY, $1, $4, FACE, DOWN, $3 ; person + object SPRITE_FISHER2, $5, $3, FACE, LEFT, $4 ; person + object SPRITE_GYM_HELPER, $0, $1, FACE, DOWN, $5 ; person ; warp-to EVENT_DISP CELADON_DINER_WIDTH, $7, $3 diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index 50f85ed0..7cd4e147 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -9,18 +9,18 @@ CeladonGameCornerObject: ; 0x48fa0 (size=99) db $1 ; signs db $4, $9, $c ; CeladonGameCornerText12 - db $b ; people - db SPRITE_FOULARD_WOMAN, $6 + 4, $2 + 4, $ff, $d0, $1 ; person - db SPRITE_MART_GUY, $6 + 4, $5 + 4, $ff, $d0, $2 ; person - db SPRITE_FAT_BALD_GUY, $a + 4, $2 + 4, $ff, $d2, $3 ; person - db SPRITE_FOULARD_WOMAN, $d + 4, $2 + 4, $ff, $d2, $4 ; person - db SPRITE_FISHER, $b + 4, $5 + 4, $ff, $d3, $5 ; person - db SPRITE_MOM_GEISHA, $b + 4, $8 + 4, $ff, $d2, $6 ; person - db SPRITE_GYM_HELPER, $e + 4, $8 + 4, $ff, $d2, $7 ; person - db SPRITE_GAMBLER, $f + 4, $b + 4, $ff, $d3, $8 ; person - db SPRITE_MART_GUY, $b + 4, $e + 4, $ff, $d2, $9 ; person - db SPRITE_GENTLEMAN, $d + 4, $11 + 4, $ff, $d3, $a ; person - db SPRITE_ROCKET, $5 + 4, $9 + 4, $ff, $d1, TRAINER | $b, ROCKET + $C8, $7 + db $b ; objects + object SPRITE_FOULARD_WOMAN, $2, $6, FACE, DOWN, $1 ; person + object SPRITE_MART_GUY, $5, $6, FACE, DOWN, $2 ; person + object SPRITE_FAT_BALD_GUY, $2, $a, FACE, RIGHT, $3 ; person + object SPRITE_FOULARD_WOMAN, $2, $d, FACE, RIGHT, $4 ; person + object SPRITE_FISHER, $5, $b, FACE, LEFT, $5 ; person + object SPRITE_MOM_GEISHA, $8, $b, FACE, RIGHT, $6 ; person + object SPRITE_GYM_HELPER, $8, $e, FACE, RIGHT, $7 ; person + object SPRITE_GAMBLER, $b, $f, FACE, LEFT, $8 ; person + object SPRITE_MART_GUY, $e, $b, FACE, RIGHT, $9 ; person + object SPRITE_GENTLEMAN, $11, $d, FACE, LEFT, $a ; person + object SPRITE_ROCKET, $9, $5, FACE, UP, $b, ROCKET + $C8, $7 ; warp-to EVENT_DISP GAME_CORNER_WIDTH, $11, $f diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index 7b90d159..f3de0cf1 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -7,15 +7,15 @@ CeladonGymObject: ; 0x48b30 (size=84) db $0 ; signs - db $8 ; people - db SPRITE_ERIKA, $3 + 4, $4 + 4, $ff, $d0, TRAINER | $1, ERIKA + $C8, $1 - db SPRITE_LASS, $b + 4, $2 + 4, $ff, $d3, TRAINER | $2, LASS + $C8, $11 - db SPRITE_FOULARD_WOMAN, $a + 4, $7 + 4, $ff, $d2, TRAINER | $3, BEAUTY + $C8, $1 - db SPRITE_LASS, $5 + 4, $9 + 4, $ff, $d0, TRAINER | $4, JR__TRAINER_F + $C8, $b - db SPRITE_FOULARD_WOMAN, $5 + 4, $1 + 4, $ff, $d0, TRAINER | $5, BEAUTY + $C8, $2 - db SPRITE_LASS, $3 + 4, $6 + 4, $ff, $d0, TRAINER | $6, LASS + $C8, $12 - db SPRITE_FOULARD_WOMAN, $3 + 4, $3 + 4, $ff, $d0, TRAINER | $7, BEAUTY + $C8, $3 - db SPRITE_LASS, $3 + 4, $5 + 4, $ff, $d0, TRAINER | $8, COOLTRAINER_F + $C8, $1 + db $8 ; objects + object SPRITE_ERIKA, $4, $3, FACE, DOWN, $1, ERIKA + $C8, $1 + object SPRITE_LASS, $2, $b, FACE, LEFT, $2, LASS + $C8, $11 + object SPRITE_FOULARD_WOMAN, $7, $a, FACE, RIGHT, $3, BEAUTY + $C8, $1 + object SPRITE_LASS, $9, $5, FACE, DOWN, $4, JR__TRAINER_F + $C8, $b + object SPRITE_FOULARD_WOMAN, $1, $5, FACE, DOWN, $5, BEAUTY + $C8, $2 + object SPRITE_LASS, $6, $3, FACE, DOWN, $6, LASS + $C8, $12 + object SPRITE_FOULARD_WOMAN, $3, $3, FACE, DOWN, $7, BEAUTY + $C8, $3 + object SPRITE_LASS, $5, $3, FACE, DOWN, $8, COOLTRAINER_F + $C8, $1 ; warp-to EVENT_DISP CELADON_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index b1052def..74499869 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/celadonhotel.asm @@ -7,10 +7,10 @@ CeladonHotelObject: ; 0x49281 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_OLD_MEDIUM_WOMAN, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_FOULARD_WOMAN, $4 + 4, $2 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $8 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_OLD_MEDIUM_WOMAN, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_FOULARD_WOMAN, $2, $4, FACE, STAY, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $8, $4, WALK, $2, $3 ; person ; warp-to EVENT_DISP CELADON_HOTEL_WIDTH, $7, $3 diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 19be473b..0919e99a 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/celadonhouse.asm @@ -7,10 +7,10 @@ CeladonHouseObject: ; 0x49227 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_OLD_PERSON, $2 + 4, $4 + 4, $ff, $d0, $1 ; person - db SPRITE_ROCKET, $4 + 4, $1 + 4, $fe, $0, $2 ; person - db SPRITE_SAILOR, $6 + 4, $5 + 4, $ff, $d2, $3 ; person + db $3 ; objects + object SPRITE_OLD_PERSON, $4, $2, FACE, DOWN, $1 ; person + object SPRITE_ROCKET, $1, $4, WALK, $0, $2 ; person + object SPRITE_SAILOR, $5, $6, FACE, RIGHT, $3 ; person ; warp-to EVENT_DISP CELADON_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index decb14e7..3ff485ea 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -11,11 +11,11 @@ CeladonMansion1Object: ; 0x486cf (size=71) db $1 ; signs db $9, $4, $5 ; CeladonMansion1Text5 - db $4 ; people - db SPRITE_SLOWBRO, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_OLD_MEDIUM_WOMAN, $5 + 4, $1 + 4, $ff, $d0, $2 ; person - db SPRITE_CLEFAIRY, $8 + 4, $1 + 4, $fe, $2, $3 ; person - db SPRITE_SLOWBRO, $4 + 4, $4 + 4, $fe, $1, $4 ; person + db $4 ; objects + object SPRITE_SLOWBRO, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_OLD_MEDIUM_WOMAN, $1, $5, FACE, DOWN, $2 ; person + object SPRITE_CLEFAIRY, $1, $8, WALK, $2, $3 ; person + object SPRITE_SLOWBRO, $4, $4, WALK, $1, $4 ; person ; warp-to EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $4 diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm index 3ed15a66..9271c22d 100755 --- a/data/mapObjects/celadonmansion2.asm +++ b/data/mapObjects/celadonmansion2.asm @@ -10,7 +10,7 @@ CeladonMansion2Object: ; 0x48745 (size=39) db $1 ; signs db $9, $4, $1 ; CeladonMansion2Text1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $6 ; CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index e64bac61..bf61ec8c 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/celadonmansion3.asm @@ -13,11 +13,11 @@ CeladonMansion3Object: ; 0x487ff (size=72) db $6, $1, $7 ; CeladonMansion3Text7 db $9, $4, $8 ; CeladonMansion3Text8 - db $4 ; people - db SPRITE_BIKE_SHOP_GUY, $4 + 4, $0 + 4, $ff, $d1, $1 ; person - db SPRITE_MART_GUY, $4 + 4, $3 + 4, $ff, $d1, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $7 + 4, $0 + 4, $ff, $d1, $3 ; person - db SPRITE_LAPRAS_GIVER, $3 + 4, $2 + 4, $ff, $ff, $4 ; person + db $4 ; objects + object SPRITE_BIKE_SHOP_GUY, $0, $4, FACE, UP, $1 ; person + object SPRITE_MART_GUY, $3, $4, FACE, UP, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $0, $7, FACE, UP, $3 ; person + object SPRITE_LAPRAS_GIVER, $2, $3, FACE, STAY, $4 ; person ; warp-to EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $6 ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm index 4181bd17..0241725d 100755 --- a/data/mapObjects/celadonmansion4.asm +++ b/data/mapObjects/celadonmansion4.asm @@ -9,7 +9,7 @@ CeladonMansion4Object: ; 0x48875 (size=31) db $1 ; signs db $7, $3, $1 ; CeladonMansion4Text1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $6 ; CELADON_MANSION_3 diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index efc74275..c65a23b5 100755 --- a/data/mapObjects/celadonmansion5.asm +++ b/data/mapObjects/celadonmansion5.asm @@ -7,9 +7,9 @@ CeladonMansion5Object: ; 0x1dd5c (size=32) db $0 ; signs - db $2 ; people - db SPRITE_HIKER, $2 + 4, $2 + 4, $ff, $d0, $1 ; person - db SPRITE_BALL, $3 + 4, $4 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_HIKER, $2, $2, FACE, DOWN, $1 ; person + object SPRITE_BALL, $4, $3, FACE, STAY, $2 ; person ; warp-to EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $2 ; CELADON_MANSION_4 diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index 10593f46..842de216 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/celadonmart1.asm @@ -13,8 +13,8 @@ CeladonMart1Object: ; 0x60f9e (size=64) db $4, $b, $2 ; CeladonMart1Text2 db $1, $e, $3 ; CeladonMart1Text3 - db $1 ; people - db SPRITE_CABLE_CLUB_WOMAN, $3 + 4, $8 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_CABLE_CLUB_WOMAN, $8, $3, FACE, DOWN, $1 ; person ; warp-to EVENT_DISP CELADON_MART_1_WIDTH, $7, $2 diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index 6b40ed11..55c4d741 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -9,11 +9,11 @@ CeladonMart2Object: ; 0x56111 (size=55) db $1 ; signs db $1, $e, $5 ; CeladonMart2Text5 - db $4 ; people - db SPRITE_MART_GUY, $3 + 4, $5 + 4, $ff, $d0, $1 ; person - db SPRITE_MART_GUY, $3 + 4, $6 + 4, $ff, $d0, $2 ; person - db SPRITE_FAT_BALD_GUY, $5 + 4, $13 + 4, $ff, $ff, $3 ; person - db SPRITE_GIRL, $4 + 4, $e + 4, $fe, $1, $4 ; person + db $4 ; objects + object SPRITE_MART_GUY, $5, $3, FACE, DOWN, $1 ; person + object SPRITE_MART_GUY, $6, $3, FACE, DOWN, $2 ; person + object SPRITE_FAT_BALD_GUY, $13, $5, FACE, STAY, $3 ; person + object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person ; warp-to EVENT_DISP CELADON_MART_2_WIDTH, $1, $c ; CELADON_MART_1 diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 8ffbf823..2f17cbb5 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -20,12 +20,12 @@ CeladonMart3Object: ; 0x482c4 (size=94) db $1, $6, $10 ; CeladonMart3Text16 db $1, $a, $11 ; CeladonMart3Text17 - db $5 ; people - db SPRITE_MART_GUY, $5 + 4, $10 + 4, $ff, $ff, $1 ; person - db SPRITE_GAMEBOY_KID_COPY, $6 + 4, $b + 4, $ff, $d3, $2 ; person - db SPRITE_GAMEBOY_KID_COPY, $2 + 4, $7 + 4, $ff, $d0, $3 ; person - db SPRITE_GAMEBOY_KID_COPY, $2 + 4, $8 + 4, $ff, $d0, $4 ; person - db SPRITE_YOUNG_BOY, $5 + 4, $2 + 4, $ff, $d1, $5 ; person + db $5 ; objects + object SPRITE_MART_GUY, $10, $5, FACE, STAY, $1 ; person + object SPRITE_GAMEBOY_KID_COPY, $b, $6, FACE, LEFT, $2 ; person + object SPRITE_GAMEBOY_KID_COPY, $7, $2, FACE, DOWN, $3 ; person + object SPRITE_GAMEBOY_KID_COPY, $8, $2, FACE, DOWN, $4 ; person + object SPRITE_YOUNG_BOY, $2, $5, FACE, UP, $5 ; person ; warp-to EVENT_DISP CELADON_MART_3_WIDTH, $1, $c ; CELADON_MART_4 diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 5bdbbf4a..4773644a 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -9,10 +9,10 @@ CeladonMart4Object: ; 0x48370 (size=49) db $1 ; signs db $1, $e, $4 ; CeladonMart4Text4 - db $3 ; people - db SPRITE_MART_GUY, $7 + 4, $5 + 4, $ff, $ff, $1 ; person - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $f + 4, $fe, $2, $2 ; person - db SPRITE_BUG_CATCHER, $2 + 4, $5 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $5, $7, FACE, STAY, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $f, $5, WALK, $2, $2 ; person + object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person ; warp-to EVENT_DISP CELADON_MART_4_WIDTH, $1, $c ; CELADON_MART_3 diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index 9914d51b..1834bb80 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/celadonmart5.asm @@ -9,11 +9,11 @@ CeladonMart5Object: ; 0x49085 (size=55) db $1 ; signs db $1, $e, $5 ; CeladonMart5Text5 - db $4 ; people - db SPRITE_GENTLEMAN, $5 + 4, $e + 4, $fe, $1, $1 ; person - db SPRITE_SAILOR, $6 + 4, $2 + 4, $ff, $ff, $2 ; person - db SPRITE_MART_GUY, $3 + 4, $5 + 4, $ff, $d0, $3 ; person - db SPRITE_MART_GUY, $3 + 4, $6 + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_GENTLEMAN, $e, $5, WALK, $1, $1 ; person + object SPRITE_SAILOR, $2, $6, FACE, STAY, $2 ; person + object SPRITE_MART_GUY, $5, $3, FACE, DOWN, $3 ; person + object SPRITE_MART_GUY, $6, $3, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP CELADON_MART_5_WIDTH, $1, $c ; CELADON_MART_ROOF diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm index ca9a8f08..6b778043 100755 --- a/data/mapObjects/celadonmartelevator.asm +++ b/data/mapObjects/celadonmartelevator.asm @@ -8,7 +8,7 @@ CeladonMartElevatorObject: ; 0x4866d (size=23) db $1 ; signs db $0, $3, $1 ; CeladonMartElevatorText1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $1 ; CELADON_MART_1 diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index 119eb4f8..f4bcf8e2 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -10,9 +10,9 @@ CeladonMartRoofObject: ; 0x485a8 (size=36) db $2, $c, $5 ; CeladonMartRoofText5 db $2, $d, $6 ; CeladonMartRoofText6 - db $2 ; people - db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $a + 4, $ff, $d2, $1 ; person - db SPRITE_LITTLE_GIRL, $5 + 4, $5 + 4, $fe, $0, $2 ; person + db $2 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $a, $4, FACE, RIGHT, $1 ; person + object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person ; warp-to EVENT_DISP CELADON_MART_ROOF_WIDTH, $2, $f ; CELADON_MART_5 diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index dcfeceb7..1bdf7ad4 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -7,11 +7,11 @@ CeladonPokecenterObject: ; 0x488d2 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_GENTLEMAN, $3 + 4, $7 + 4, $fe, $2, $2 ; person - db SPRITE_FOULARD_WOMAN, $5 + 4, $a + 4, $fe, $0, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person + object SPRITE_FOULARD_WOMAN, $a, $5, WALK, $0, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index f280b050..d5ccac9c 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -10,9 +10,9 @@ CeladonPrizeRoomObject: ; 0x49108 (size=41) db $2, $4, $4 ; CeladonPrizeRoomText4 db $2, $6, $5 ; CeladonPrizeRoomText5 - db $2 ; people - db SPRITE_BALDING_GUY, $4 + 4, $1 + 4, $ff, $ff, $1 ; person - db SPRITE_GAMBLER, $3 + 4, $7 + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_BALDING_GUY, $1, $4, FACE, STAY, $1 ; person + object SPRITE_GAMBLER, $7, $3, WALK, $2, $2 ; person ; warp-to EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $4 diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 3f57457b..5dc51512 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -21,18 +21,18 @@ CeruleanCityObject: ; 0x18786 (size=170) db $19, $b, $10 ; CeruleanCityText16 db $15, $1b, $11 ; CeruleanCityText17 - db $b ; people - db SPRITE_BLUE, $2 + 4, $14 + 4, $ff, $d0, $1 ; person - db SPRITE_ROCKET, $8 + 4, $1e + 4, $ff, $ff, TRAINER | $2, ROCKET + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_1, $14 + 4, $1f + 4, $ff, $d0, $3 ; person - db SPRITE_BLACK_HAIR_BOY_2, $12 + 4, $f + 4, $fe, $1, $4 ; person - db SPRITE_BLACK_HAIR_BOY_2, $15 + 4, $9 + 4, $fe, $2, $5 ; person - db SPRITE_GUARD, $c + 4, $1c + 4, $ff, $d0, $6 ; person - db SPRITE_LASS, $1a + 4, $1d + 4, $ff, $d2, $7 ; person - db SPRITE_SLOWBRO, $1a + 4, $1c + 4, $ff, $d0, $8 ; person - db SPRITE_LASS, $1b + 4, $9 + 4, $fe, $2, $9 ; person - db SPRITE_BLACK_HAIR_BOY_2, $c + 4, $4 + 4, $ff, $d0, $a ; person - db SPRITE_GUARD, $c + 4, $1b + 4, $ff, $d0, $b ; person + db $b ; objects + object SPRITE_BLUE, $14, $2, FACE, DOWN, $1 ; person + object SPRITE_ROCKET, $1e, $8, FACE, STAY, $2, ROCKET + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, FACE, DOWN, $3 ; person + object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person + object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person + object SPRITE_GUARD, $1c, $c, FACE, DOWN, $6 ; person + object SPRITE_LASS, $1d, $1a, FACE, RIGHT, $7 ; person + object SPRITE_SLOWBRO, $1c, $1a, FACE, DOWN, $8 ; person + object SPRITE_LASS, $9, $1b, WALK, $2, $9 ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $c, FACE, DOWN, $a ; person + object SPRITE_GUARD, $1b, $c, FACE, DOWN, $b ; person ; warp-to EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 87128c5b..239e27fb 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -7,11 +7,11 @@ CeruleanGymObject: ; 0x5c834 (size=50) db $0 ; signs - db $4 ; people - db SPRITE_BRUNETTE_GIRL, $2 + 4, $4 + 4, $ff, $d0, TRAINER | $1, MISTY + $C8, $1 - db SPRITE_LASS, $3 + 4, $2 + 4, $ff, $d3, TRAINER | $2, JR__TRAINER_F + $C8, $1 - db SPRITE_SWIMMER, $7 + 4, $8 + 4, $ff, $d2, TRAINER | $3, SWIMMER + $C8, $1 - db SPRITE_GYM_HELPER, $a + 4, $7 + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_BRUNETTE_GIRL, $4, $2, FACE, DOWN, $1, MISTY + $C8, $1 + object SPRITE_LASS, $2, $3, FACE, LEFT, $2, JR__TRAINER_F + $C8, $1 + object SPRITE_SWIMMER, $8, $7, FACE, RIGHT, $3, SWIMMER + $C8, $1 + object SPRITE_GYM_HELPER, $7, $a, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP CERULEAN_GYM_WIDTH, $d, $4 diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index a5d10033..6d1e7154 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -7,9 +7,9 @@ CeruleanHouse1Object: ; 0x1d710 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_OLD_MEDIUM_WOMAN, $4 + 4, $5 + 4, $ff, $d2, $1 ; person - db SPRITE_GAMBLER, $2 + 4, $1 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, FACE, RIGHT, $1 ; person + object SPRITE_GAMBLER, $1, $2, FACE, STAY, $2 ; person ; warp-to EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index c8c4ee51..f74d2b02 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -8,8 +8,8 @@ CeruleanHouse2Object: ; 0x74ebe (size=34) db $0 ; signs - db $1 ; people - db SPRITE_FAT_BALD_GUY, $3 + 4, $5 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_FAT_BALD_GUY, $5, $3, FACE, LEFT, $1 ; person ; warp-to EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $0, $2 diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index ce5e0e69..57210482 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -9,9 +9,9 @@ CeruleanHouseTrashedObject: ; 0x1d6bf (size=43) db $1 ; signs db $0, $3, $3 ; CeruleanHouseTrashedText3 - db $2 ; people - db SPRITE_FISHER, $1 + 4, $2 + 4, $ff, $d0, $1 ; person - db SPRITE_GIRL, $6 + 4, $5 + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_FISHER, $2, $1, FACE, DOWN, $1 ; person + object SPRITE_GIRL, $5, $6, WALK, $2, $2 ; person ; warp-to EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index bc8c4818..ba540723 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -7,10 +7,10 @@ CeruleanMartObject: ; 0x5c8a8 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BLACK_HAIR_BOY_1, $4 + 4, $3 + 4, $fe, $1, $2 ; person - db SPRITE_LASS, $2 + 4, $6 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $3, $4, WALK, $1, $2 ; person + object SPRITE_LASS, $6, $2, WALK, $2, $3 ; person ; warp-to EVENT_DISP CERULEAN_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index c7e8cb8b..5ee65625 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -7,11 +7,11 @@ CeruleanPokecenterObject: ; 0x5c65f (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $a + 4, $fe, $0, $2 ; person - db SPRITE_GENTLEMAN, $3 + 4, $4 + 4, $ff, $d0, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $a, $5, WALK, $0, $2 ; person + object SPRITE_GENTLEMAN, $4, $3, FACE, DOWN, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index ba18fdc6..26783c95 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -7,16 +7,16 @@ CinnabarGymObject: ; 0x75acc (size=90) db $0 ; signs - db $9 ; people - db SPRITE_FAT_BALD_GUY, $3 + 4, $3 + 4, $ff, $d0, TRAINER | $1, BLAINE + $C8, $1 - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $11 + 4, $ff, $d0, TRAINER | $2, SUPER_NERD + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $11 + 4, $ff, $d0, TRAINER | $3, BURGLAR + $C8, $4 - db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $b + 4, $ff, $d0, TRAINER | $4, SUPER_NERD + $C8, $a - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $b + 4, $ff, $d0, TRAINER | $5, BURGLAR + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_2, $e + 4, $b + 4, $ff, $d0, TRAINER | $6, SUPER_NERD + $C8, $b - db SPRITE_BLACK_HAIR_BOY_2, $e + 4, $3 + 4, $ff, $d0, TRAINER | $7, BURGLAR + $C8, $6 - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $3 + 4, $ff, $d0, TRAINER | $8, SUPER_NERD + $C8, $c - db SPRITE_GYM_HELPER, $d + 4, $10 + 4, $ff, $d0, $9 ; person + db $9 ; objects + object SPRITE_FAT_BALD_GUY, $3, $3, FACE, DOWN, $1, BLAINE + $C8, $1 + object SPRITE_BLACK_HAIR_BOY_2, $11, $2, FACE, DOWN, $2, SUPER_NERD + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $11, $8, FACE, DOWN, $3, BURGLAR + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_2, $b, $4, FACE, DOWN, $4, SUPER_NERD + $C8, $a + object SPRITE_BLACK_HAIR_BOY_2, $b, $8, FACE, DOWN, $5, BURGLAR + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_2, $b, $e, FACE, DOWN, $6, SUPER_NERD + $C8, $b + object SPRITE_BLACK_HAIR_BOY_2, $3, $e, FACE, DOWN, $7, BURGLAR + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_2, $3, $8, FACE, DOWN, $8, SUPER_NERD + $C8, $c + object SPRITE_GYM_HELPER, $10, $d, FACE, DOWN, $9 ; person ; warp-to EVENT_DISP CINNABAR_GYM_WIDTH, $11, $10 diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index f2a53d7c..1dcaa6e2 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -15,9 +15,9 @@ CinnabarIslandObject: ; 0x1c022 (size=71) db $b, $9, $6 ; CinnabarIslandText6 db $3, $d, $7 ; CinnabarIslandText7 - db $2 ; people - db SPRITE_GIRL, $5 + 4, $c + 4, $fe, $2, $1 ; person - db SPRITE_GAMBLER, $6 + 4, $e + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_GIRL, $c, $5, WALK, $2, $1 ; person + object SPRITE_GAMBLER, $e, $6, FACE, STAY, $2 ; person ; warp-to EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $6 ; MANSION_1 diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index b976d0be..15fb0d80 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -7,10 +7,10 @@ CinnabarMartObject: ; 0x75e91 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_ERIKA, $2 + 4, $6 + 4, $ff, $ff, $2 ; person - db SPRITE_OAK_AIDE, $4 + 4, $3 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_ERIKA, $6, $2, FACE, STAY, $2 ; person + object SPRITE_OAK_AIDE, $3, $4, FACE, STAY, $3 ; person ; warp-to EVENT_DISP CINNABAR_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index 35a344e2..ec2b25e4 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -7,11 +7,11 @@ CinnabarPokecenterObject: ; 0x75e46 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_LASS, $4 + 4, $9 + 4, $fe, $0, $2 ; person - db SPRITE_GENTLEMAN, $6 + 4, $2 + 4, $ff, $ff, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_LASS, $9, $4, WALK, $0, $2 ; person + object SPRITE_GENTLEMAN, $2, $6, FACE, STAY, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm index 300dd75a..0304368d 100755 --- a/data/mapObjects/colosseum.asm +++ b/data/mapObjects/colosseum.asm @@ -5,5 +5,5 @@ ColosseumObject: ; 0x4fd87 (size=10) db $0 ; signs - db $1 ; people - db SPRITE_RED, $2 + 4, $2 + 4, $ff, $0, $1 ; person + db $1 ; objects + object SPRITE_RED, $2, $2, $ff, $0, $1 ; person diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index ccd839f8..56ca06b5 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -8,10 +8,10 @@ CopycatsHouse1FObject: ; 0x75ee3 (size=46) db $0 ; signs - db $3 ; people - db SPRITE_MOM_GEISHA, $2 + 4, $2 + 4, $ff, $d0, $1 ; person - db SPRITE_FAT_BALD_GUY, $4 + 4, $5 + 4, $ff, $d2, $2 ; person - db SPRITE_CLEFAIRY, $4 + 4, $1 + 4, $fe, $1, $3 ; person + db $3 ; objects + object SPRITE_MOM_GEISHA, $2, $2, FACE, DOWN, $1 ; person + object SPRITE_FAT_BALD_GUY, $5, $4, FACE, RIGHT, $2 ; person + object SPRITE_CLEFAIRY, $1, $4, WALK, $1, $3 ; person ; warp-to EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $2 diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index 3d0432c6..f97befd4 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -8,12 +8,12 @@ CopycatsHouse2FObject: ; 0x5cd21 (size=48) db $5, $3, $6 ; CopycatsHouse2FText6 db $1, $0, $7 ; CopycatsHouse2FText7 - db $5 ; people - db SPRITE_BRUNETTE_GIRL, $3 + 4, $4 + 4, $fe, $0, $1 ; person - db SPRITE_BIRD, $6 + 4, $4 + 4, $fe, $2, $2 ; person - db SPRITE_SLOWBRO, $1 + 4, $5 + 4, $ff, $d0, $3 ; person - db SPRITE_BIRD, $0 + 4, $2 + 4, $ff, $d0, $4 ; person - db SPRITE_CLEFAIRY, $6 + 4, $1 + 4, $ff, $d3, $5 ; person + db $5 ; objects + object SPRITE_BRUNETTE_GIRL, $4, $3, WALK, $0, $1 ; person + object SPRITE_BIRD, $4, $6, WALK, $2, $2 ; person + object SPRITE_SLOWBRO, $5, $1, FACE, DOWN, $3 ; person + object SPRITE_BIRD, $2, $0, FACE, DOWN, $4 ; person + object SPRITE_CLEFAIRY, $1, $6, FACE, LEFT, $5 ; person ; warp-to EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index 8311853a..7f47bbd3 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/daycarem.asm @@ -7,8 +7,8 @@ DayCareMObject: ; 0x56459 (size=26) db $0 ; signs - db $1 ; people - db SPRITE_GENTLEMAN, $3 + 4, $2 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_GENTLEMAN, $2, $3, FACE, LEFT, $1 ; person ; warp-to EVENT_DISP DAYCAREM_WIDTH, $7, $2 diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm index 858005ce..74bbf775 100755 --- a/data/mapObjects/diglettscave.asm +++ b/data/mapObjects/diglettscave.asm @@ -7,7 +7,7 @@ DiglettsCaveObject: ; 0x61f72 (size=20) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP DIGLETTS_CAVE_WIDTH, $5, $5 ; DIGLETTS_CAVE_EXIT diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index e232b1cc..b20e2b78 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/diglettscaveroute11.asm @@ -8,8 +8,8 @@ DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34) db $0 ; signs - db $1 ; people - db SPRITE_GAMBLER, $3 + 4, $2 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GAMBLER, $2, $3, FACE, STAY, $1 ; person ; warp-to EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $2 diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index 2e86600f..c51a84e1 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/diglettscaveroute2.asm @@ -8,8 +8,8 @@ DiglettsCaveRoute2Object: ; 0x1debf (size=34) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $3 + 4, $3 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $3, $3, FACE, STAY, $1 ; person ; warp-to EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $2 diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index 15b9a89f..4113343e 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -9,13 +9,13 @@ FanClubObject: ; 0x59c97 (size=62) db $0, $1, $7 ; FanClubText7 db $0, $6, $8 ; FanClubText8 - db $6 ; people - db SPRITE_FISHER2, $3 + 4, $6 + 4, $ff, $d2, $1 ; person - db SPRITE_GIRL, $3 + 4, $1 + 4, $ff, $d3, $2 ; person - db SPRITE_CLEFAIRY, $4 + 4, $6 + 4, $ff, $d2, $3 ; person - db SPRITE_SEEL, $4 + 4, $1 + 4, $ff, $d3, $4 ; person - db SPRITE_GENTLEMAN, $1 + 4, $3 + 4, $ff, $d0, $5 ; person - db SPRITE_CABLE_CLUB_WOMAN, $1 + 4, $5 + 4, $ff, $d0, $6 ; person + db $6 ; objects + object SPRITE_FISHER2, $6, $3, FACE, RIGHT, $1 ; person + object SPRITE_GIRL, $1, $3, FACE, LEFT, $2 ; person + object SPRITE_CLEFAIRY, $6, $4, FACE, RIGHT, $3 ; person + object SPRITE_SEEL, $1, $4, FACE, LEFT, $4 ; person + object SPRITE_GENTLEMAN, $3, $1, FACE, DOWN, $5 ; person + object SPRITE_CABLE_CLUB_WOMAN, $5, $1, FACE, DOWN, $6 ; person ; warp-to EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $2 diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index f84f3ee7..ae8b89dc 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -7,14 +7,14 @@ FightingDojoObject: ; 0x5cf9b (size=72) db $0 ; signs - db $7 ; people - db SPRITE_HIKER, $3 + 4, $5 + 4, $ff, $d0, TRAINER | $1, BLACKBELT + $C8, $1 - db SPRITE_HIKER, $4 + 4, $3 + 4, $ff, $d3, TRAINER | $2, BLACKBELT + $C8, $2 - db SPRITE_HIKER, $6 + 4, $3 + 4, $ff, $d3, TRAINER | $3, BLACKBELT + $C8, $3 - db SPRITE_HIKER, $5 + 4, $5 + 4, $ff, $d2, TRAINER | $4, BLACKBELT + $C8, $4 - db SPRITE_HIKER, $7 + 4, $5 + 4, $ff, $d2, TRAINER | $5, BLACKBELT + $C8, $5 - db SPRITE_BALL, $1 + 4, $4 + 4, $ff, $ff, $6 ; person - db SPRITE_BALL, $1 + 4, $5 + 4, $ff, $ff, $7 ; person + db $7 ; objects + object SPRITE_HIKER, $5, $3, FACE, DOWN, $1, BLACKBELT + $C8, $1 + object SPRITE_HIKER, $3, $4, FACE, LEFT, $2, BLACKBELT + $C8, $2 + object SPRITE_HIKER, $3, $6, FACE, LEFT, $3, BLACKBELT + $C8, $3 + object SPRITE_HIKER, $5, $5, FACE, RIGHT, $4, BLACKBELT + $C8, $4 + object SPRITE_HIKER, $5, $7, FACE, RIGHT, $5, BLACKBELT + $C8, $5 + object SPRITE_BALL, $4, $1, FACE, STAY, $6 ; person + object SPRITE_BALL, $5, $1, FACE, STAY, $7 ; person ; warp-to EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $4 diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index f6ce2ec3..8fa30ef0 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -28,17 +28,17 @@ FuchsiaCityObject: ; 0x18bd4 (size=178) db $f, $d, $17 ; FuchsiaCityText23 db $7, $7, $18 ; FuchsiaCityText24 - db $a ; people - db SPRITE_BUG_CATCHER, $c + 4, $a + 4, $fe, $2, $1 ; person - db SPRITE_GAMBLER, $11 + 4, $1c + 4, $fe, $2, $2 ; person - db SPRITE_FISHER2, $e + 4, $1e + 4, $ff, $d0, $3 ; person - db SPRITE_BUG_CATCHER, $8 + 4, $18 + 4, $ff, $d1, $4 ; person - db SPRITE_CLEFAIRY, $5 + 4, $1f + 4, $fe, $0, $5 ; person - db SPRITE_BALL, $6 + 4, $19 + 4, $ff, $ff, $6 ; person - db SPRITE_SLOWBRO, $6 + 4, $c + 4, $fe, $2, $7 ; person - db SPRITE_SLOWBRO, $c + 4, $1e + 4, $fe, $2, $8 ; person - db SPRITE_SEEL, $11 + 4, $8 + 4, $fe, $0, $9 ; person - db SPRITE_OMANYTE, $5 + 4, $6 + 4, $ff, $ff, $a ; person + db $a ; objects + object SPRITE_BUG_CATCHER, $a, $c, WALK, $2, $1 ; person + object SPRITE_GAMBLER, $1c, $11, WALK, $2, $2 ; person + object SPRITE_FISHER2, $1e, $e, FACE, DOWN, $3 ; person + object SPRITE_BUG_CATCHER, $18, $8, FACE, UP, $4 ; person + object SPRITE_CLEFAIRY, $1f, $5, WALK, $0, $5 ; person + object SPRITE_BALL, $19, $6, FACE, STAY, $6 ; person + object SPRITE_SLOWBRO, $c, $6, WALK, $2, $7 ; person + object SPRITE_SLOWBRO, $1e, $c, WALK, $2, $8 ; person + object SPRITE_SEEL, $8, $11, WALK, $0, $9 ; person + object SPRITE_OMANYTE, $6, $5, FACE, STAY, $a ; person ; warp-to EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $5 ; FUCHSIA_MART diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index e48c597c..12834fe4 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -7,15 +7,15 @@ FuchsiaGymObject: ; 0x75658 (size=82) db $0 ; signs - db $8 ; people - db SPRITE_BLACKBELT, $a + 4, $4 + 4, $ff, $d0, TRAINER | $1, KOGA + $C8, $1 - db SPRITE_ROCKER, $d + 4, $8 + 4, $ff, $d0, TRAINER | $2, JUGGLER + $C8, $7 - db SPRITE_ROCKER, $8 + 4, $7 + 4, $ff, $d3, TRAINER | $3, JUGGLER + $C8, $3 - db SPRITE_ROCKER, $c + 4, $1 + 4, $ff, $d0, TRAINER | $4, JUGGLER + $C8, $8 - db SPRITE_ROCKER, $5 + 4, $3 + 4, $ff, $d1, TRAINER | $5, TAMER + $C8, $1 - db SPRITE_ROCKER, $2 + 4, $8 + 4, $ff, $d0, TRAINER | $6, TAMER + $C8, $2 - db SPRITE_ROCKER, $7 + 4, $2 + 4, $ff, $d2, TRAINER | $7, JUGGLER + $C8, $4 - db SPRITE_GYM_HELPER, $f + 4, $7 + 4, $ff, $d0, $8 ; person + db $8 ; objects + object SPRITE_BLACKBELT, $4, $a, FACE, DOWN, $1, KOGA + $C8, $1 + object SPRITE_ROCKER, $8, $d, FACE, DOWN, $2, JUGGLER + $C8, $7 + object SPRITE_ROCKER, $7, $8, FACE, LEFT, $3, JUGGLER + $C8, $3 + object SPRITE_ROCKER, $1, $c, FACE, DOWN, $4, JUGGLER + $C8, $8 + object SPRITE_ROCKER, $3, $5, FACE, UP, $5, TAMER + $C8, $1 + object SPRITE_ROCKER, $8, $2, FACE, DOWN, $6, TAMER + $C8, $2 + object SPRITE_ROCKER, $2, $7, FACE, RIGHT, $7, JUGGLER + $C8, $4 + object SPRITE_GYM_HELPER, $7, $f, FACE, DOWN, $8 ; person ; warp-to EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index 4e3ec676..da44e7d3 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/fuchsiahouse1.asm @@ -7,10 +7,10 @@ FuchsiaHouse1Object: ; 0x75031 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MOM_GEISHA, $3 + 4, $2 + 4, $ff, $d3, $1 ; person - db SPRITE_GAMBLER, $2 + 4, $7 + 4, $ff, $d1, $2 ; person - db SPRITE_BUG_CATCHER, $5 + 4, $5 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_MOM_GEISHA, $2, $3, FACE, LEFT, $1 ; person + object SPRITE_GAMBLER, $7, $2, FACE, UP, $2 ; person + object SPRITE_BUG_CATCHER, $5, $5, FACE, STAY, $3 ; person ; warp-to EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index f2958f02..8fb8fd34 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -9,10 +9,10 @@ FuchsiaHouse2Object: ; 0x75180 (size=45) db $3, $4, $4 ; FuchsiaHouse2Text4 db $3, $5, $5 ; FuchsiaHouse2Text5 - db $3 ; people - db SPRITE_WARDEN, $3 + 4, $2 + 4, $ff, $ff, $1 ; person - db SPRITE_BALL, $3 + 4, $8 + 4, $ff, $ff, ITEM | $2, RARE_CANDY - db SPRITE_BOULDER, $4 + 4, $8 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $3 ; person + db $3 ; objects + object SPRITE_WARDEN, $2, $3, FACE, STAY, $1 ; person + object SPRITE_BALL, $8, $3, FACE, STAY, $2, RARE_CANDY + object SPRITE_BOULDER, $8, $4, FACE, BOULDER_MOVEMENT_BYTE_2, $3 ; person ; warp-to EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4 diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index 141f895f..4c0962ac 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/fuchsiahouse3.asm @@ -8,8 +8,8 @@ FuchsiaHouse3Object: ; 0x56221 (size=34) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $3 + 4, $5 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $5, $3, FACE, LEFT, $1 ; person ; warp-to EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $0, $2 diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index cb859734..52c51910 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/fuchsiamart.asm @@ -7,10 +7,10 @@ FuchsiaMartObject: ; 0x1dd9b (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_FAT_BALD_GUY, $2 + 4, $4 + 4, $ff, $ff, $2 ; person - db SPRITE_LASS, $5 + 4, $6 + 4, $fe, $1, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_FAT_BALD_GUY, $4, $2, FACE, STAY, $2 ; person + object SPRITE_LASS, $6, $5, WALK, $1, $3 ; person ; warp-to EVENT_DISP FUCHSIA_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index fb243f4b..5e0541e5 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -7,10 +7,10 @@ FuchsiaMeetingRoomObject: ; 0x756fc (size=38) db $0 ; signs - db $3 ; people - db SPRITE_WHITE_PLAYER, $1 + 4, $4 + 4, $ff, $d0, $1 ; person - db SPRITE_WHITE_PLAYER, $2 + 4, $0 + 4, $ff, $d1, $2 ; person - db SPRITE_WHITE_PLAYER, $1 + 4, $a + 4, $ff, $d0, $3 ; person + db $3 ; objects + object SPRITE_WHITE_PLAYER, $4, $1, FACE, DOWN, $1 ; person + object SPRITE_WHITE_PLAYER, $0, $2, FACE, UP, $2 ; person + object SPRITE_WHITE_PLAYER, $a, $1, FACE, DOWN, $3 ; person ; warp-to EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $4 diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index 1efcd255..c5d37611 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -7,11 +7,11 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_ROCKER, $3 + 4, $2 + 4, $ff, $ff, $2 ; person - db SPRITE_LASS, $5 + 4, $6 + 4, $fe, $2, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_ROCKER, $2, $3, FACE, STAY, $2 ; person + object SPRITE_LASS, $6, $5, WALK, $2, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index e94ad9b3..3f3eb89a 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -9,9 +9,9 @@ GaryObject: ; 0x7612f (size=48) db $0 ; signs - db $2 ; people - db SPRITE_BLUE, $2 + 4, $4 + 4, $ff, $d0, $1 ; person - db SPRITE_OAK, $7 + 4, $3 + 4, $ff, $d1, $2 ; person + db $2 ; objects + object SPRITE_BLUE, $4, $2, FACE, DOWN, $1 ; person + object SPRITE_OAK, $3, $7, FACE, UP, $2 ; person ; warp-to EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $3 ; LANCES_ROOM diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index 6d528135..3b77a05c 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/halloffameroom.asm @@ -7,8 +7,8 @@ HallofFameRoomObject: ; 0x5a571 (size=26) db $0 ; signs - db $1 ; people - db SPRITE_OAK, $2 + 4, $5 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_OAK, $5, $2, FACE, DOWN, $1 ; person ; warp-to EVENT_DISP HALL_OF_FAME_WIDTH, $7, $4 ; CHAMPIONS_ROOM diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/indigoplateau.asm index 6970963f..a30cfbfe 100755 --- a/data/mapObjects/indigoplateau.asm +++ b/data/mapObjects/indigoplateau.asm @@ -7,7 +7,7 @@ IndigoPlateauObject: ; 0x50936 (size=20) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $9 ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index 6b9c1e99..15e6720d 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -8,12 +8,12 @@ IndigoPlateauLobbyObject: ; 0x19c95 (size=58) db $0 ; signs - db $5 ; people - db SPRITE_NURSE, $5 + 4, $7 + 4, $ff, $d0, $1 ; person - db SPRITE_GYM_HELPER, $9 + 4, $4 + 4, $ff, $d3, $2 ; person - db SPRITE_LASS, $1 + 4, $5 + 4, $ff, $d0, $3 ; person - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $4 ; person - db SPRITE_CABLE_CLUB_WOMAN, $6 + 4, $d + 4, $ff, $d0, $5 ; person + db $5 ; objects + object SPRITE_NURSE, $7, $5, FACE, DOWN, $1 ; person + object SPRITE_GYM_HELPER, $4, $9, FACE, LEFT, $2 ; person + object SPRITE_LASS, $5, $1, FACE, DOWN, $3 ; person + object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $4 ; person + object SPRITE_CABLE_CLUB_WOMAN, $d, $6, FACE, DOWN, $5 ; person ; warp-to EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7 diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index 52db2e24..cc4f17a5 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -14,8 +14,8 @@ Lab1Object: ; 0x75bb3 (size=62) db $4, $d, $4 ; Lab1Text4 db $4, $11, $5 ; Lab1Text5 - db $1 ; people - db SPRITE_FISHER, $3 + 4, $1 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $1, $3, FACE, STAY, $1 ; person ; warp-to EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $2 diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 52556c69..53801f67 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -7,10 +7,10 @@ Lab2Object: ; 0x75c45 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_OLD_PERSON, $4 + 4, $1 + 4, $ff, $ff, $2 ; person - db SPRITE_FOULARD_WOMAN, $5 + 4, $5 + 4, $ff, $d1, $3 ; person + db $3 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $3, $2, FACE, DOWN, $1 ; person + object SPRITE_OLD_PERSON, $1, $4, FACE, STAY, $2 ; person + object SPRITE_FOULARD_WOMAN, $5, $5, FACE, UP, $3 ; person ; warp-to EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $2 ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index 8b4396cc..e6de877c 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -10,9 +10,9 @@ Lab3Object: ; 0x75cec (size=41) db $4, $1, $4 ; Lab3Text4 db $1, $2, $5 ; Lab3Text5 - db $2 ; people - db SPRITE_OAK_AIDE, $2 + 4, $7 + 4, $ff, $d0, $1 ; person - db SPRITE_OAK_AIDE, $3 + 4, $2 + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_OAK_AIDE, $7, $2, FACE, DOWN, $1 ; person + object SPRITE_OAK_AIDE, $2, $3, WALK, $2, $2 ; person ; warp-to EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $2 ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index 66b73ebd..7f7be1fd 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -7,9 +7,9 @@ Lab4Object: ; 0x75df0 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_OAK_AIDE, $2 + 4, $5 + 4, $fe, $2, $1 ; person - db SPRITE_OAK_AIDE, $6 + 4, $7 + 4, $ff, $d1, $2 ; person + db $2 ; objects + object SPRITE_OAK_AIDE, $5, $2, WALK, $2, $1 ; person + object SPRITE_OAK_AIDE, $7, $6, FACE, UP, $2 ; person ; warp-to EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $2 ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index e4ae6dfb..316720ed 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -8,8 +8,8 @@ LanceObject: ; 0x5a3c5 (size=36) db $0 ; signs - db $1 ; people - db SPRITE_LANCE, $1 + 4, $6 + 4, $ff, $d0, TRAINER | $1, LANCE + $C8, $1 + db $1 ; objects + object SPRITE_LANCE, $6, $1, FACE, DOWN, $1, LANCE + $C8, $1 ; warp-to EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index 4472c7ed..0b198199 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/lavenderhouse1.asm @@ -7,13 +7,13 @@ LavenderHouse1Object: ; 0x1d96a (size=56) db $0 ; signs - db $6 ; people - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $3 + 4, $ff, $ff, $1 ; person - db SPRITE_LITTLE_GIRL, $3 + 4, $6 + 4, $ff, $d0, $2 ; person - db SPRITE_SLOWBRO, $4 + 4, $6 + 4, $ff, $d1, $3 ; person - db SPRITE_SLOWBRO, $3 + 4, $1 + 4, $ff, $ff, $4 ; person - db SPRITE_MR_FUJI, $1 + 4, $3 + 4, $ff, $ff, $5 ; person - db SPRITE_BOOK_MAP_DEX, $3 + 4, $3 + 4, $ff, $ff, $6 ; person + db $6 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $3, $5, FACE, STAY, $1 ; person + object SPRITE_LITTLE_GIRL, $6, $3, FACE, DOWN, $2 ; person + object SPRITE_SLOWBRO, $6, $4, FACE, UP, $3 ; person + object SPRITE_SLOWBRO, $1, $3, FACE, STAY, $4 ; person + object SPRITE_MR_FUJI, $3, $1, FACE, STAY, $5 ; person + object SPRITE_BOOK_MAP_DEX, $3, $3, FACE, STAY, $6 ; person ; warp-to EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index cbb7dda7..5eb427ca 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/lavenderhouse2.asm @@ -7,9 +7,9 @@ LavenderHouse2Object: ; 0x1d9e6 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_SLOWBRO, $5 + 4, $3 + 4, $ff, $d1, $1 ; person - db SPRITE_BRUNETTE_GIRL, $4 + 4, $2 + 4, $ff, $d3, $2 ; person + db $2 ; objects + object SPRITE_SLOWBRO, $3, $5, FACE, UP, $1 ; person + object SPRITE_BRUNETTE_GIRL, $2, $4, FACE, LEFT, $2 ; person ; warp-to EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index 79d80c35..9825311b 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/lavendermart.asm @@ -7,10 +7,10 @@ LavenderMartObject: ; 0x5c95d (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BALDING_GUY, $4 + 4, $3 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $7 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_BALDING_GUY, $3, $4, FACE, STAY, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $7, $2, FACE, STAY, $3 ; person ; warp-to EVENT_DISP LAVENDER_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index a35bf4dc..dd52d07b 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -7,11 +7,11 @@ LavenderPokecenterObject: ; 0x5c8f4 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_GENTLEMAN, $3 + 4, $5 + 4, $ff, $ff, $2 ; person - db SPRITE_LITTLE_GIRL, $6 + 4, $2 + 4, $fe, $1, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $5, $3, FACE, STAY, $2 ; person + object SPRITE_LITTLE_GIRL, $2, $6, WALK, $1, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index 7dc75512..46781595 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/lavendertown.asm @@ -17,10 +17,10 @@ LavenderTownObject: ; 0x4402d (size=88) db $9, $5, $8 ; LavenderTownText8 db $7, $11, $9 ; LavenderTownText9 - db $3 ; people - db SPRITE_LITTLE_GIRL, $9 + 4, $f + 4, $fe, $0, $1 ; person - db SPRITE_BLACK_HAIR_BOY_1, $a + 4, $9 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $7 + 4, $8 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_LITTLE_GIRL, $f, $9, WALK, $0, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $9, $a, FACE, STAY, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $8, $7, WALK, $2, $3 ; person ; warp-to EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $3 ; LAVENDER_POKECENTER diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 074063bf..4cffb012 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -9,8 +9,8 @@ LoreleiObject: ; 0x76280 (size=44) db $0 ; signs - db $1 ; people - db SPRITE_LORELEI, $2 + 4, $5 + 4, $ff, $d0, TRAINER | $1, LORELEI + $C8, $1 + db $1 ; objects + object SPRITE_LORELEI, $5, $2, FACE, DOWN, $1, LORELEI + $C8, $1 ; warp-to EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 89d636b8..0e890098 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -13,10 +13,10 @@ Mansion1Object: ; 0x443a4 (size=90) db $0 ; signs - db $3 ; people - db SPRITE_OAK_AIDE, $11 + 4, $11 + 4, $ff, $d2, TRAINER | $1, SCIENTIST + $C8, $4 - db SPRITE_BALL, $3 + 4, $e + 4, $ff, $ff, ITEM | $2, ESCAPE_ROPE - db SPRITE_BALL, $15 + 4, $12 + 4, $ff, $ff, ITEM | $3, CARBOS + db $3 ; objects + object SPRITE_OAK_AIDE, $11, $11, FACE, RIGHT, $1, SCIENTIST + $C8, $4 + object SPRITE_BALL, $e, $3, FACE, STAY, $2, ESCAPE_ROPE + object SPRITE_BALL, $12, $15, FACE, STAY, $3, CARBOS ; warp-to EVENT_DISP MANSION_1_WIDTH, $1b, $4 diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index 6b2be31e..d3fdf9fd 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -9,11 +9,11 @@ Mansion2Object: ; 0x520d1 (size=63) db $0 ; signs - db $4 ; people - db SPRITE_BLACK_HAIR_BOY_2, $11 + 4, $3 + 4, $fe, $2, TRAINER | $1, BURGLAR + $C8, $7 - db SPRITE_BALL, $7 + 4, $1c + 4, $ff, $ff, ITEM | $2, CALCIUM - db SPRITE_BOOK_MAP_DEX, $2 + 4, $12 + 4, $ff, $ff, $3 ; person - db SPRITE_BOOK_MAP_DEX, $16 + 4, $3 + 4, $ff, $ff, $4 ; person + db $4 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, BURGLAR + $C8, $7 + object SPRITE_BALL, $1c, $7, FACE, STAY, $2, CALCIUM + object SPRITE_BOOK_MAP_DEX, $12, $2, FACE, STAY, $3 ; person + object SPRITE_BOOK_MAP_DEX, $3, $16, FACE, STAY, $4 ; person ; warp-to EVENT_DISP MANSION_2_WIDTH, $a, $5 ; MANSION_1 diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index ff42bee3..f956f122 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -8,12 +8,12 @@ Mansion3Object: ; 0x522e6 (size=64) db $0 ; signs - db $5 ; people - db SPRITE_BLACK_HAIR_BOY_2, $b + 4, $5 + 4, $fe, $2, TRAINER | $1, BURGLAR + $C8, $8 - db SPRITE_OAK_AIDE, $b + 4, $14 + 4, $ff, $d2, TRAINER | $2, SCIENTIST + $C8, $c - db SPRITE_BALL, $10 + 4, $1 + 4, $ff, $ff, ITEM | $3, MAX_POTION - db SPRITE_BALL, $5 + 4, $19 + 4, $ff, $ff, ITEM | $4, IRON - db SPRITE_BOOK_MAP_DEX, $c + 4, $6 + 4, $ff, $ff, $5 ; person + db $5 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, BURGLAR + $C8, $8 + object SPRITE_OAK_AIDE, $14, $b, FACE, RIGHT, $2, SCIENTIST + $C8, $c + object SPRITE_BALL, $1, $10, FACE, STAY, $3, MAX_POTION + object SPRITE_BALL, $19, $5, FACE, STAY, $4, IRON + object SPRITE_BOOK_MAP_DEX, $6, $c, FACE, STAY, $5 ; person ; warp-to EVENT_DISP MANSION_3_WIDTH, $a, $7 ; MANSION_2 diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index 5432f676..67e81064 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -6,15 +6,15 @@ Mansion4Object: ; 0x52498 (size=69) db $0 ; signs - db $8 ; people - db SPRITE_BLACK_HAIR_BOY_2, $17 + 4, $10 + 4, $ff, $ff, TRAINER | $1, BURGLAR + $C8, $9 - db SPRITE_OAK_AIDE, $b + 4, $1b + 4, $ff, $d0, TRAINER | $2, SCIENTIST + $C8, $d - db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, ITEM | $3, RARE_CANDY - db SPRITE_BALL, $16 + 4, $1 + 4, $ff, $ff, ITEM | $4, FULL_RESTORE - db SPRITE_BALL, $19 + 4, $13 + 4, $ff, $ff, ITEM | $5, TM_14 - db SPRITE_BALL, $4 + 4, $5 + 4, $ff, $ff, ITEM | $6, TM_22 - db SPRITE_BOOK_MAP_DEX, $14 + 4, $10 + 4, $ff, $ff, $7 ; person - db SPRITE_BALL, $d + 4, $5 + 4, $ff, $ff, ITEM | $8, SECRET_KEY + db $8 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $10, $17, FACE, STAY, $1, BURGLAR + $C8, $9 + object SPRITE_OAK_AIDE, $1b, $b, FACE, DOWN, $2, SCIENTIST + $C8, $d + object SPRITE_BALL, $a, $2, FACE, STAY, $3, RARE_CANDY + object SPRITE_BALL, $1, $16, FACE, STAY, $4, FULL_RESTORE + object SPRITE_BALL, $13, $19, FACE, STAY, $5, TM_14 + object SPRITE_BALL, $5, $4, FACE, STAY, $6, TM_22 + object SPRITE_BOOK_MAP_DEX, $10, $14, FACE, STAY, $7 ; person + object SPRITE_BALL, $5, $d, FACE, STAY, $8, SECRET_KEY ; warp-to EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index 6f0c05e9..6444ca10 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -11,20 +11,20 @@ MtMoon1Object: ; 0x49b06 (size=145) db $1 ; signs db $17, $f, $e ; MtMoon1Text14 - db $d ; people - db SPRITE_HIKER, $6 + 4, $5 + 4, $ff, $d0, TRAINER | $1, HIKER + $C8, $1 - db SPRITE_BUG_CATCHER, $10 + 4, $c + 4, $ff, $d3, TRAINER | $2, YOUNGSTER + $C8, $3 - db SPRITE_LASS, $4 + 4, $1e + 4, $ff, $d0, TRAINER | $3, LASS + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_2, $1f + 4, $18 + 4, $ff, $d1, TRAINER | $4, SUPER_NERD + $C8, $1 - db SPRITE_LASS, $17 + 4, $10 + 4, $ff, $d0, TRAINER | $5, LASS + $C8, $6 - db SPRITE_BUG_CATCHER, $16 + 4, $7 + 4, $ff, $d0, TRAINER | $6, BUG_CATCHER + $C8, $7 - db SPRITE_BUG_CATCHER, $1b + 4, $1e + 4, $ff, $d3, TRAINER | $7, BUG_CATCHER + $C8, $8 - db SPRITE_BALL, $14 + 4, $2 + 4, $ff, $ff, ITEM | $8, POTION - db SPRITE_BALL, $2 + 4, $2 + 4, $ff, $ff, ITEM | $9, MOON_STONE - db SPRITE_BALL, $1f + 4, $23 + 4, $ff, $ff, ITEM | $a, RARE_CANDY - db SPRITE_BALL, $17 + 4, $24 + 4, $ff, $ff, ITEM | $b, ESCAPE_ROPE - db SPRITE_BALL, $21 + 4, $14 + 4, $ff, $ff, ITEM | $c, POTION - db SPRITE_BALL, $20 + 4, $5 + 4, $ff, $ff, ITEM | $d, TM_12 + db $d ; objects + object SPRITE_HIKER, $5, $6, FACE, DOWN, $1, HIKER + $C8, $1 + object SPRITE_BUG_CATCHER, $c, $10, FACE, LEFT, $2, YOUNGSTER + $C8, $3 + object SPRITE_LASS, $1e, $4, FACE, DOWN, $3, LASS + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, FACE, UP, $4, SUPER_NERD + $C8, $1 + object SPRITE_LASS, $10, $17, FACE, DOWN, $5, LASS + $C8, $6 + object SPRITE_BUG_CATCHER, $7, $16, FACE, DOWN, $6, BUG_CATCHER + $C8, $7 + object SPRITE_BUG_CATCHER, $1e, $1b, FACE, LEFT, $7, BUG_CATCHER + $C8, $8 + object SPRITE_BALL, $2, $14, FACE, STAY, $8, POTION + object SPRITE_BALL, $2, $2, FACE, STAY, $9, MOON_STONE + object SPRITE_BALL, $23, $1f, FACE, STAY, $a, RARE_CANDY + object SPRITE_BALL, $24, $17, FACE, STAY, $b, ESCAPE_ROPE + object SPRITE_BALL, $14, $21, FACE, STAY, $c, POTION + object SPRITE_BALL, $5, $20, FACE, STAY, $d, TM_12 ; warp-to EVENT_DISP MT_MOON_1_WIDTH, $23, $e diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index 33313f17..2cf6be6b 100755 --- a/data/mapObjects/mtmoon2.asm +++ b/data/mapObjects/mtmoon2.asm @@ -13,7 +13,7 @@ MtMoon2Object: ; 0x51a4d (size=68) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP MT_MOON_2_WIDTH, $5, $5 ; MT_MOON_1 diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index e17a6a8b..41e925c6 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -9,16 +9,16 @@ MtMoon3Object: ; 0x49fdb (size=102) db $0 ; signs - db $9 ; people - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $c + 4, $ff, $d3, TRAINER | $1, SUPER_NERD + $C8, $2 - db SPRITE_ROCKET, $10 + 4, $b + 4, $ff, $d0, TRAINER | $2, ROCKET + $C8, $1 - db SPRITE_ROCKET, $16 + 4, $f + 4, $ff, $d0, TRAINER | $3, ROCKET + $C8, $2 - db SPRITE_ROCKET, $b + 4, $1d + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $3 - db SPRITE_ROCKET, $11 + 4, $1d + 4, $ff, $d2, TRAINER | $5, ROCKET + $C8, $4 - db SPRITE_OMANYTE, $6 + 4, $c + 4, $ff, $ff, $6 ; person - db SPRITE_OMANYTE, $6 + 4, $d + 4, $ff, $ff, $7 ; person - db SPRITE_BALL, $15 + 4, $19 + 4, $ff, $ff, ITEM | $8, HP_UP - db SPRITE_BALL, $5 + 4, $1d + 4, $ff, $ff, ITEM | $9, TM_01 + db $9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $c, $8, FACE, LEFT, $1, SUPER_NERD + $C8, $2 + object SPRITE_ROCKET, $b, $10, FACE, DOWN, $2, ROCKET + $C8, $1 + object SPRITE_ROCKET, $f, $16, FACE, DOWN, $3, ROCKET + $C8, $2 + object SPRITE_ROCKET, $1d, $b, FACE, UP, $4, ROCKET + $C8, $3 + object SPRITE_ROCKET, $1d, $11, FACE, RIGHT, $5, ROCKET + $C8, $4 + object SPRITE_OMANYTE, $c, $6, FACE, STAY, $6 ; person + object SPRITE_OMANYTE, $d, $6, FACE, STAY, $7 ; person + object SPRITE_BALL, $19, $15, FACE, STAY, $8, HP_UP + object SPRITE_BALL, $1d, $5, FACE, STAY, $9, TM_01 ; warp-to EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2 diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index f5f52f65..b15813fc 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -7,13 +7,13 @@ MtMoonPokecenterObject: ; 0x49376 (size=56) db $0 ; signs - db $6 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_BUG_CATCHER, $3 + 4, $4 + 4, $ff, $d1, $2 ; person - db SPRITE_GENTLEMAN, $3 + 4, $7 + 4, $ff, $d1, $3 ; person - db SPRITE_FAT_BALD_GUY, $6 + 4, $a + 4, $fe, $2, $4 ; person - db SPRITE_CLIPBOARD, $2 + 4, $7 + 4, $ff, $ff, $5 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $6 ; person + db $6 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_BUG_CATCHER, $4, $3, FACE, UP, $2 ; person + object SPRITE_GENTLEMAN, $7, $3, FACE, UP, $3 ; person + object SPRITE_FAT_BALD_GUY, $a, $6, WALK, $2, $4 ; person + object SPRITE_CLIPBOARD, $7, $2, FACE, STAY, $5 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $6 ; person ; warp-to EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index c6fb4b5a..84cb1da4 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -10,12 +10,12 @@ Museum1FObject: ; 0x5c2c1 (size=74) db $0 ; signs - db $5 ; people - db SPRITE_OAK_AIDE, $4 + 4, $c + 4, $ff, $d2, $1 ; person - db SPRITE_GAMBLER, $4 + 4, $1 + 4, $ff, $ff, $2 ; person - db SPRITE_OAK_AIDE, $2 + 4, $f + 4, $ff, $d0, $3 ; person - db SPRITE_OAK_AIDE, $4 + 4, $11 + 4, $ff, $ff, $4 ; person - db SPRITE_OLD_AMBER, $2 + 4, $10 + 4, $ff, $ff, $5 ; person + db $5 ; objects + object SPRITE_OAK_AIDE, $c, $4, FACE, RIGHT, $1 ; person + object SPRITE_GAMBLER, $1, $4, FACE, STAY, $2 ; person + object SPRITE_OAK_AIDE, $f, $2, FACE, DOWN, $3 ; person + object SPRITE_OAK_AIDE, $11, $4, FACE, STAY, $4 ; person + object SPRITE_OLD_AMBER, $10, $2, FACE, STAY, $5 ; person ; warp-to EVENT_DISP MUSEUM_1F_WIDTH, $7, $a diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index 88ee827c..80b2ce56 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -8,12 +8,12 @@ Museum2FObject: ; 0x5c34b (size=48) db $2, $b, $6 ; Museum2FText6 db $5, $2, $7 ; Museum2FText7 - db $5 ; people - db SPRITE_BUG_CATCHER, $7 + 4, $1 + 4, $fe, $2, $1 ; person - db SPRITE_OLD_PERSON, $5 + 4, $0 + 4, $ff, $d0, $2 ; person - db SPRITE_OAK_AIDE, $5 + 4, $7 + 4, $ff, $d0, $3 ; person - db SPRITE_BRUNETTE_GIRL, $5 + 4, $b + 4, $ff, $ff, $4 ; person - db SPRITE_HIKER, $5 + 4, $c + 4, $ff, $d0, $5 ; person + db $5 ; objects + object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person + object SPRITE_OLD_PERSON, $0, $5, FACE, DOWN, $2 ; person + object SPRITE_OAK_AIDE, $7, $5, FACE, DOWN, $3 ; person + object SPRITE_BRUNETTE_GIRL, $b, $5, FACE, STAY, $4 ; person + object SPRITE_HIKER, $c, $5, FACE, DOWN, $5 ; person ; warp-to EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index b0999d61..be2dab30 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/namerater.asm @@ -7,8 +7,8 @@ NameRaterObject: ; 0x1dad6 (size=26) db $0 ; signs - db $1 ; people - db SPRITE_MR_MASTERBALL, $3 + 4, $5 + 4, $ff, $d2, $1 ; person + db $1 ; objects + object SPRITE_MR_MASTERBALL, $5, $3, FACE, RIGHT, $1 ; person ; warp-to EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 0b2717a7..77c3b8d1 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -7,18 +7,18 @@ OaksLabObject: ; 0x1d40a (size=88) db $0 ; signs - db $b ; people - db SPRITE_BLUE, $3 + 4, $4 + 4, $ff, $ff, TRAINER | $1, SONY1 + $C8, $1 - db SPRITE_BALL, $3 + 4, $6 + 4, $ff, $ff, $2 ; person - db SPRITE_BALL, $3 + 4, $7 + 4, $ff, $ff, $3 ; person - db SPRITE_BALL, $3 + 4, $8 + 4, $ff, $ff, $4 ; person - db SPRITE_OAK, $2 + 4, $5 + 4, $ff, $d0, $5 ; person - db SPRITE_BOOK_MAP_DEX, $1 + 4, $2 + 4, $ff, $ff, $6 ; person - db SPRITE_BOOK_MAP_DEX, $1 + 4, $3 + 4, $ff, $ff, $7 ; person - db SPRITE_OAK, $a + 4, $5 + 4, $ff, $d1, $8 ; person - db SPRITE_GIRL, $9 + 4, $1 + 4, $fe, $1, $9 ; person - db SPRITE_OAK_AIDE, $a + 4, $2 + 4, $ff, $ff, $a ; person - db SPRITE_OAK_AIDE, $a + 4, $8 + 4, $ff, $ff, $b ; person + db $b ; objects + object SPRITE_BLUE, $4, $3, FACE, STAY, $1, SONY1 + $C8, $1 + object SPRITE_BALL, $6, $3, FACE, STAY, $2 ; person + object SPRITE_BALL, $7, $3, FACE, STAY, $3 ; person + object SPRITE_BALL, $8, $3, FACE, STAY, $4 ; person + object SPRITE_OAK, $5, $2, FACE, DOWN, $5 ; person + object SPRITE_BOOK_MAP_DEX, $2, $1, FACE, STAY, $6 ; person + object SPRITE_BOOK_MAP_DEX, $3, $1, FACE, STAY, $7 ; person + object SPRITE_OAK, $5, $a, FACE, UP, $8 ; person + object SPRITE_GIRL, $1, $9, WALK, $1, $9 ; person + object SPRITE_OAK_AIDE, $2, $a, FACE, STAY, $a ; person + object SPRITE_OAK_AIDE, $8, $a, FACE, STAY, $b ; person ; warp-to EVENT_DISP OAKS_LAB_WIDTH, $b, $4 diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index cef66431..f0a1c8eb 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -12,10 +12,10 @@ PalletTownObject: ; 0x182c3 (size=58) db $5, $3, $6 ; PalletTownText6 db $5, $b, $7 ; PalletTownText7 - db $3 ; people - db SPRITE_OAK, $5 + 4, $8 + 4, $ff, $ff, $1 ; person - db SPRITE_GIRL, $8 + 4, $3 + 4, $fe, $0, $2 ; person - db SPRITE_FISHER2, $e + 4, $b + 4, $fe, $0, $3 ; person + db $3 ; objects + object SPRITE_OAK, $8, $5, FACE, STAY, $1 ; person + object SPRITE_GIRL, $3, $8, WALK, $0, $2 ; person + object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person ; warp-to EVENT_DISP PALLET_TOWN_WIDTH, $5, $5 ; REDS_HOUSE_1F diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index e971ad50..fcaa97b9 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -19,12 +19,12 @@ PewterCityObject: ; 0x18577 (size=111) db $11, $b, $b ; PewterCityText11 db $17, $19, $c ; PewterCityText12 - db $5 ; people - db SPRITE_LASS, $f + 4, $8 + 4, $ff, $ff, $1 ; person - db SPRITE_BLACK_HAIR_BOY_1, $19 + 4, $11 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $11 + 4, $1b + 4, $ff, $ff, $3 ; person - db SPRITE_BLACK_HAIR_BOY_2, $19 + 4, $1a + 4, $fe, $2, $4 ; person - db SPRITE_BUG_CATCHER, $10 + 4, $23 + 4, $ff, $d0, $5 ; person + db $5 ; objects + object SPRITE_LASS, $8, $f, FACE, STAY, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $11, $19, FACE, STAY, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $1b, $11, FACE, STAY, $3 ; person + object SPRITE_BLACK_HAIR_BOY_2, $1a, $19, WALK, $2, $4 ; person + object SPRITE_BUG_CATCHER, $23, $10, FACE, DOWN, $5 ; person ; warp-to EVENT_DISP PEWTER_CITY_WIDTH, $7, $e ; MUSEUM_1F diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index f5fa120e..0381db07 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -7,10 +7,10 @@ PewterGymObject: ; 0x5c52e (size=42) db $0 ; signs - db $3 ; people - db SPRITE_BLACK_HAIR_BOY_2, $1 + 4, $4 + 4, $ff, $d0, TRAINER | $1, BROCK + $C8, $1 - db SPRITE_BLACK_HAIR_BOY_1, $6 + 4, $3 + 4, $ff, $d3, TRAINER | $2, JR__TRAINER_M + $C8, $1 - db SPRITE_GYM_HELPER, $a + 4, $7 + 4, $ff, $d0, $3 ; person + db $3 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $4, $1, FACE, DOWN, $1, BROCK + $C8, $1 + object SPRITE_BLACK_HAIR_BOY_1, $3, $6, FACE, LEFT, $2, JR__TRAINER_M + $C8, $1 + object SPRITE_GYM_HELPER, $7, $a, FACE, DOWN, $3 ; person ; warp-to EVENT_DISP PEWTER_GYM_WIDTH, $d, $4 diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index 9af4d71b..2600a370 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/pewterhouse1.asm @@ -7,10 +7,10 @@ PewterHouse1Object: ; 0x1d616 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_SLOWBRO, $5 + 4, $4 + 4, $ff, $d2, $1 ; person - db SPRITE_YOUNG_BOY, $5 + 4, $3 + 4, $ff, $d3, $2 ; person - db SPRITE_FAT_BALD_GUY, $2 + 4, $1 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_SLOWBRO, $4, $5, FACE, RIGHT, $1 ; person + object SPRITE_YOUNG_BOY, $3, $5, FACE, LEFT, $2 ; person + object SPRITE_FAT_BALD_GUY, $1, $2, FACE, STAY, $3 ; person ; warp-to EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index aa48c5bc..ac0d8ad0 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/pewterhouse2.asm @@ -7,9 +7,9 @@ PewterHouse2Object: ; 0x1d659 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_GAMBLER, $3 + 4, $2 + 4, $ff, $d3, $1 ; person - db SPRITE_BUG_CATCHER, $5 + 4, $4 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_GAMBLER, $2, $3, FACE, LEFT, $1 ; person + object SPRITE_BUG_CATCHER, $4, $5, FACE, STAY, $2 ; person ; warp-to EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index 343f70c1..a6ff161b 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/pewtermart.asm @@ -7,10 +7,10 @@ PewterMartObject: ; 0x74cda (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BUG_CATCHER, $3 + 4, $3 + 4, $fe, $1, $2 ; person - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $5 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_BUG_CATCHER, $3, $3, WALK, $1, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $5, $5, FACE, STAY, $3 ; person ; warp-to EVENT_DISP PEWTER_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index a9a03272..21b22b0a 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -7,11 +7,11 @@ PewterPokecenterObject: ; 0x5c60d (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_GENTLEMAN, $7 + 4, $b + 4, $ff, $d2, $2 ; person - db SPRITE_CLEFAIRY, $3 + 4, $1 + 4, $ff, $d0, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $b, $7, FACE, RIGHT, $2 ; person + object SPRITE_CLEFAIRY, $1, $3, FACE, DOWN, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index 30fb9cbc..b3aea3f8 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -8,12 +8,12 @@ PokemonTower1Object: ; 0x60452 (size=58) db $0 ; signs - db $5 ; people - db SPRITE_CABLE_CLUB_WOMAN, $d + 4, $f + 4, $ff, $d1, $1 ; person - db SPRITE_MOM_GEISHA, $8 + 4, $6 + 4, $ff, $ff, $2 ; person - db SPRITE_BALDING_GUY, $c + 4, $8 + 4, $ff, $ff, $3 ; person - db SPRITE_GIRL, $7 + 4, $d + 4, $ff, $ff, $4 ; person - db SPRITE_MEDIUM, $7 + 4, $11 + 4, $ff, $d2, $5 ; person + db $5 ; objects + object SPRITE_CABLE_CLUB_WOMAN, $f, $d, FACE, UP, $1 ; person + object SPRITE_MOM_GEISHA, $6, $8, FACE, STAY, $2 ; person + object SPRITE_BALDING_GUY, $8, $c, FACE, STAY, $3 ; person + object SPRITE_GIRL, $d, $7, FACE, STAY, $4 ; person + object SPRITE_MEDIUM, $11, $7, FACE, RIGHT, $5 ; person ; warp-to EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index a255065f..21e23a79 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -7,9 +7,9 @@ PokemonTower2Object: ; 0x60646 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_BLUE, $5 + 4, $e + 4, $ff, $ff, $1 ; person - db SPRITE_MEDIUM, $7 + 4, $3 + 4, $ff, $d3, $2 ; person + db $2 ; objects + object SPRITE_BLUE, $e, $5, FACE, STAY, $1 ; person + object SPRITE_MEDIUM, $3, $7, FACE, LEFT, $2 ; person ; warp-to EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $3 ; POKEMONTOWER_3 diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index 3a16070a..c083c267 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -7,11 +7,11 @@ PokemonTower3Object: ; 0x6075d (size=51) db $0 ; signs - db $4 ; people - db SPRITE_MEDIUM, $3 + 4, $c + 4, $ff, $d2, TRAINER | $1, CHANNELER + $C8, $5 - db SPRITE_MEDIUM, $8 + 4, $9 + 4, $ff, $d0, TRAINER | $2, CHANNELER + $C8, $6 - db SPRITE_MEDIUM, $d + 4, $a + 4, $ff, $d0, TRAINER | $3, CHANNELER + $C8, $8 - db SPRITE_BALL, $1 + 4, $c + 4, $ff, $ff, ITEM | $4, ESCAPE_ROPE + db $4 ; objects + object SPRITE_MEDIUM, $c, $3, FACE, RIGHT, $1, CHANNELER + $C8, $5 + object SPRITE_MEDIUM, $9, $8, FACE, DOWN, $2, CHANNELER + $C8, $6 + object SPRITE_MEDIUM, $a, $d, FACE, DOWN, $3, CHANNELER + $C8, $8 + object SPRITE_BALL, $c, $1, FACE, STAY, $4, ESCAPE_ROPE ; warp-to EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2 diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index 8647f937..b3e9f4d7 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -7,13 +7,13 @@ PokemonTower4Object: ; 0x6088b (size=65) db $0 ; signs - db $6 ; people - db SPRITE_MEDIUM, $a + 4, $5 + 4, $ff, $d3, TRAINER | $1, CHANNELER + $C8, $9 - db SPRITE_MEDIUM, $7 + 4, $f + 4, $ff, $d0, TRAINER | $2, CHANNELER + $C8, $a - db SPRITE_MEDIUM, $c + 4, $e + 4, $ff, $d2, TRAINER | $3, CHANNELER + $C8, $c - db SPRITE_BALL, $a + 4, $c + 4, $ff, $ff, ITEM | $4, ELIXER - db SPRITE_BALL, $a + 4, $9 + 4, $ff, $ff, ITEM | $5, AWAKENING - db SPRITE_BALL, $10 + 4, $c + 4, $ff, $ff, ITEM | $6, HP_UP + db $6 ; objects + object SPRITE_MEDIUM, $5, $a, FACE, LEFT, $1, CHANNELER + $C8, $9 + object SPRITE_MEDIUM, $f, $7, FACE, DOWN, $2, CHANNELER + $C8, $a + object SPRITE_MEDIUM, $e, $c, FACE, RIGHT, $3, CHANNELER + $C8, $c + object SPRITE_BALL, $c, $a, FACE, STAY, $4, ELIXER + object SPRITE_BALL, $9, $a, FACE, STAY, $5, AWAKENING + object SPRITE_BALL, $c, $10, FACE, STAY, $6, HP_UP ; warp-to EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $3 ; POKEMONTOWER_5 diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index e31a0c61..a48847f5 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -7,13 +7,13 @@ PokemonTower5Object: ; 0x60a48 (size=65) db $0 ; signs - db $6 ; people - db SPRITE_MEDIUM, $8 + 4, $c + 4, $ff, $ff, $1 ; person - db SPRITE_MEDIUM, $7 + 4, $11 + 4, $ff, $d2, TRAINER | $2, CHANNELER + $C8, $e - db SPRITE_MEDIUM, $3 + 4, $e + 4, $ff, $d2, TRAINER | $3, CHANNELER + $C8, $10 - db SPRITE_MEDIUM, $a + 4, $6 + 4, $ff, $d3, TRAINER | $4, CHANNELER + $C8, $11 - db SPRITE_MEDIUM, $10 + 4, $9 + 4, $ff, $d3, TRAINER | $5, CHANNELER + $C8, $12 - db SPRITE_BALL, $e + 4, $6 + 4, $ff, $ff, ITEM | $6, NUGGET + db $6 ; objects + object SPRITE_MEDIUM, $c, $8, FACE, STAY, $1 ; person + object SPRITE_MEDIUM, $11, $7, FACE, RIGHT, $2, CHANNELER + $C8, $e + object SPRITE_MEDIUM, $e, $3, FACE, RIGHT, $3, CHANNELER + $C8, $10 + object SPRITE_MEDIUM, $6, $a, FACE, LEFT, $4, CHANNELER + $C8, $11 + object SPRITE_MEDIUM, $9, $10, FACE, LEFT, $5, CHANNELER + $C8, $12 + object SPRITE_BALL, $6, $e, FACE, STAY, $6, NUGGET ; warp-to EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $3 ; POKEMONTOWER_4 diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index d923c3d2..4119d12b 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -7,12 +7,12 @@ PokemonTower6Object: ; 0x60c5b (size=58) db $0 ; signs - db $5 ; people - db SPRITE_MEDIUM, $a + 4, $c + 4, $ff, $d3, TRAINER | $1, CHANNELER + $C8, $13 - db SPRITE_MEDIUM, $5 + 4, $9 + 4, $ff, $d0, TRAINER | $2, CHANNELER + $C8, $14 - db SPRITE_MEDIUM, $5 + 4, $10 + 4, $ff, $d2, TRAINER | $3, CHANNELER + $C8, $15 - db SPRITE_BALL, $8 + 4, $6 + 4, $ff, $ff, ITEM | $4, RARE_CANDY - db SPRITE_BALL, $e + 4, $e + 4, $ff, $ff, ITEM | $5, X_ACCURACY + db $5 ; objects + object SPRITE_MEDIUM, $c, $a, FACE, LEFT, $1, CHANNELER + $C8, $13 + object SPRITE_MEDIUM, $9, $5, FACE, DOWN, $2, CHANNELER + $C8, $14 + object SPRITE_MEDIUM, $10, $5, FACE, RIGHT, $3, CHANNELER + $C8, $15 + object SPRITE_BALL, $6, $8, FACE, STAY, $4, RARE_CANDY + object SPRITE_BALL, $e, $e, FACE, STAY, $5, X_ACCURACY ; warp-to EVENT_DISP POKEMONTOWER_6_WIDTH, $9, $12 ; POKEMONTOWER_5 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index ca5aa669..1ad73bb8 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -7,16 +7,16 @@ PokemonTower7Object: ; 0x60ef6 (size=42) db $0 ; signs IF DEF(_YELLOW) - db 3 ; people - db SPRITE_JESSIE, 8 + 4, $a + 4, $ff, $d0, 1 - db SPRITE_JAMES, 8 + 4, $b + 4, $ff, $d0, 2 - db SPRITE_MR_FUJI, 3 + 4, $a + 4, $ff, $d0, 3 + db 3 ; objects + object SPRITE_JESSIE, $a 8, 8, FACE, DOWN, 1 + object SPRITE_JAMES, $b, 8, FACE, DOWN, 2 + object SPRITE_MR_FUJI, $a, 3, FACE, DOWN, 3 ELSE - db $4 ; people - db SPRITE_ROCKET, $b + 4, $9 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $13 - db SPRITE_ROCKET, $9 + 4, $c + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $14 - db SPRITE_ROCKET, $7 + 4, $9 + 4, $ff, $d3, TRAINER | $3, ROCKET + $C8, $15 - db SPRITE_MR_FUJI, $3 + 4, $a + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_ROCKET, $9, $b, FACE, LEFT, $1, ROCKET + $C8, $13 + object SPRITE_ROCKET, $c, $9, FACE, RIGHT, $2, ROCKET + $C8, $14 + object SPRITE_ROCKET, $9, $7, FACE, LEFT, $3, ROCKET + $C8, $15 + object SPRITE_MR_FUJI, $a, $3, FACE, DOWN, $4 ; person ENDC ; warp-to diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index 98e80ff9..822192b6 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -8,21 +8,21 @@ PowerPlantObject: ; 0x1e3bf (size=135) db $0 ; signs - db $e ; people - db SPRITE_BALL, $14 + 4, $9 + 4, $ff, $ff, TRAINER | $1, VOLTORB, 40 - db SPRITE_BALL, $12 + 4, $20 + 4, $ff, $ff, TRAINER | $2, VOLTORB, 40 - db SPRITE_BALL, $19 + 4, $15 + 4, $ff, $ff, TRAINER | $3, VOLTORB, 40 - db SPRITE_BALL, $12 + 4, $19 + 4, $ff, $ff, TRAINER | $4, ELECTRODE, 43 - db SPRITE_BALL, $22 + 4, $17 + 4, $ff, $ff, TRAINER | $5, VOLTORB, 40 - db SPRITE_BALL, $1c + 4, $1a + 4, $ff, $ff, TRAINER | $6, VOLTORB, 40 - db SPRITE_BALL, $e + 4, $15 + 4, $ff, $ff, TRAINER | $7, ELECTRODE, 43 - db SPRITE_BALL, $20 + 4, $25 + 4, $ff, $ff, TRAINER | $8, VOLTORB, 40 - db SPRITE_BIRD, $9 + 4, $4 + 4, $ff, $d1, TRAINER | $9, ZAPDOS, 50 - db SPRITE_BALL, $19 + 4, $7 + 4, $ff, $ff, ITEM | $a, CARBOS - db SPRITE_BALL, $3 + 4, $1c + 4, $ff, $ff, ITEM | $b, HP_UP - db SPRITE_BALL, $3 + 4, $22 + 4, $ff, $ff, ITEM | $c, RARE_CANDY - db SPRITE_BALL, $20 + 4, $1a + 4, $ff, $ff, ITEM | $d, TM_25 - db SPRITE_BALL, $20 + 4, $14 + 4, $ff, $ff, ITEM | $e, TM_33 + db $e ; objects + object SPRITE_BALL, $9, $14, FACE, STAY, $1, VOLTORB, 40 + object SPRITE_BALL, $20, $12, FACE, STAY, $2, VOLTORB, 40 + object SPRITE_BALL, $15, $19, FACE, STAY, $3, VOLTORB, 40 + object SPRITE_BALL, $19, $12, FACE, STAY, $4, ELECTRODE, 43 + object SPRITE_BALL, $17, $22, FACE, STAY, $5, VOLTORB, 40 + object SPRITE_BALL, $1a, $1c, FACE, STAY, $6, VOLTORB, 40 + object SPRITE_BALL, $15, $e, FACE, STAY, $7, ELECTRODE, 43 + object SPRITE_BALL, $25, $20, FACE, STAY, $8, VOLTORB, 40 + object SPRITE_BIRD, $4, $9, FACE, UP, $9, ZAPDOS, 50 + object SPRITE_BALL, $7, $19, FACE, STAY, $a, CARBOS + object SPRITE_BALL, $1c, $3, FACE, STAY, $b, HP_UP + object SPRITE_BALL, $22, $3, FACE, STAY, $c, RARE_CANDY + object SPRITE_BALL, $1a, $20, FACE, STAY, $d, TM_25 + object SPRITE_BALL, $14, $20, FACE, STAY, $e, TM_33 ; warp-to EVENT_DISP POWER_PLANT_WIDTH, $23, $4 diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 5584320e..8cae7a4e 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -9,8 +9,8 @@ RedsHouse1FObject: ; 481e4 (12:41e4) db $1 ; signs db $1, $3, $2 ; TV - db $1 ; people - db $33, $4 + 4, $5 + 4, $FF, $D2, $1 ; Mom + db $1 ; objects + object SPRITE_MOM, $5, $4, FACE, RIGHT, $1 ; Mom ; warp-to EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $2 diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/redshouse2f.asm index e7c64c6f..d668d441 100755 --- a/data/mapObjects/redshouse2f.asm +++ b/data/mapObjects/redshouse2f.asm @@ -6,7 +6,7 @@ RedsHouse2FObject: ; 0x5c0d0 db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP REDS_HOUSE_2F_WIDTH, $1, $7 diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index ab9b1041..7216872e 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -10,14 +10,14 @@ RocketHideout1Object: ; 0x44ce7 (size=98) db $0 ; signs - db $7 ; people - db SPRITE_ROCKET, $8 + 4, $1a + 4, $ff, $d2, TRAINER | $1, ROCKET + $C8, $8 - db SPRITE_ROCKET, $6 + 4, $c + 4, $ff, $d3, TRAINER | $2, ROCKET + $C8, $9 - db SPRITE_ROCKET, $11 + 4, $12 + 4, $ff, $d0, TRAINER | $3, ROCKET + $C8, $a - db SPRITE_ROCKET, $19 + 4, $f + 4, $ff, $d3, TRAINER | $4, ROCKET + $C8, $b - db SPRITE_ROCKET, $12 + 4, $1c + 4, $ff, $d2, TRAINER | $5, ROCKET + $C8, $c - db SPRITE_BALL, $e + 4, $b + 4, $ff, $ff, ITEM | $6, ESCAPE_ROPE - db SPRITE_BALL, $11 + 4, $9 + 4, $ff, $ff, ITEM | $7, HYPER_POTION + db $7 ; objects + object SPRITE_ROCKET, $1a, $8, FACE, RIGHT, $1, ROCKET + $C8, $8 + object SPRITE_ROCKET, $c, $6, FACE, LEFT, $2, ROCKET + $C8, $9 + object SPRITE_ROCKET, $12, $11, FACE, DOWN, $3, ROCKET + $C8, $a + object SPRITE_ROCKET, $f, $19, FACE, LEFT, $4, ROCKET + $C8, $b + object SPRITE_ROCKET, $1c, $12, FACE, RIGHT, $5, ROCKET + $C8, $c + object SPRITE_BALL, $b, $e, FACE, STAY, $6, ESCAPE_ROPE + object SPRITE_BALL, $9, $11, FACE, STAY, $7, HYPER_POTION ; warp-to EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $17 ; ROCKET_HIDEOUT_2 diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index 5842e5bc..f80fb22d 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -10,12 +10,12 @@ RocketHideout2Object: ; 0x450f7 (size=80) db $0 ; signs - db $5 ; people - db SPRITE_ROCKET, $c + 4, $14 + 4, $ff, $d0, TRAINER | $1, ROCKET + $C8, $d - db SPRITE_BALL, $b + 4, $1 + 4, $ff, $ff, ITEM | $2, MOON_STONE - db SPRITE_BALL, $8 + 4, $10 + 4, $ff, $ff, ITEM | $3, NUGGET - db SPRITE_BALL, $c + 4, $6 + 4, $ff, $ff, ITEM | $4, TM_07 - db SPRITE_BALL, $15 + 4, $3 + 4, $ff, $ff, ITEM | $5, SUPER_POTION + db $5 ; objects + object SPRITE_ROCKET, $14, $c, FACE, DOWN, $1, ROCKET + $C8, $d + object SPRITE_BALL, $1, $b, FACE, STAY, $2, MOON_STONE + object SPRITE_BALL, $10, $8, FACE, STAY, $3, NUGGET + object SPRITE_BALL, $6, $c, FACE, STAY, $4, TM_07 + object SPRITE_BALL, $3, $15, FACE, STAY, $5, SUPER_POTION ; warp-to EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 0464c969..8ffdcdda 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -7,11 +7,11 @@ RocketHideout3Object: ; 0x4534d (size=50) db $0 ; signs - db $4 ; people - db SPRITE_ROCKET, $16 + 4, $a + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $e - db SPRITE_ROCKET, $c + 4, $1a + 4, $ff, $d1, TRAINER | $2, ROCKET + $C8, $f - db SPRITE_BALL, $11 + 4, $1a + 4, $ff, $ff, ITEM | $3, TM_10 - db SPRITE_BALL, $e + 4, $14 + 4, $ff, $ff, ITEM | $4, RARE_CANDY + db $4 ; objects + object SPRITE_ROCKET, $a, $16, FACE, LEFT, $1, ROCKET + $C8, $e + object SPRITE_ROCKET, $1a, $c, FACE, UP, $2, ROCKET + $C8, $f + object SPRITE_BALL, $1a, $11, FACE, STAY, $3, TM_10 + object SPRITE_BALL, $14, $e, FACE, STAY, $4, RARE_CANDY ; warp-to EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2 diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index c73273bb..380408cc 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -8,16 +8,16 @@ RocketHideout4Object: ; 0x455f1 (size=95) db $0 ; signs - db $9 ; people - db SPRITE_GIOVANNI, $3 + 4, $19 + 4, $ff, $d0, TRAINER | $1, GIOVANNI + $C8, $1 - db SPRITE_ROCKET, $c + 4, $17 + 4, $ff, $d0, TRAINER | $2, ROCKET + $C8, $10 - db SPRITE_ROCKET, $c + 4, $1a + 4, $ff, $d0, TRAINER | $3, ROCKET + $C8, $11 - db SPRITE_ROCKET, $2 + 4, $b + 4, $ff, $d0, TRAINER | $4, ROCKET + $C8, $12 - db SPRITE_BALL, $c + 4, $a + 4, $ff, $ff, ITEM | $5, HP_UP - db SPRITE_BALL, $4 + 4, $9 + 4, $ff, $ff, ITEM | $6, TM_02 - db SPRITE_BALL, $14 + 4, $c + 4, $ff, $ff, ITEM | $7, IRON - db SPRITE_BALL, $2 + 4, $19 + 4, $ff, $ff, ITEM | $8, SILPH_SCOPE - db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, ITEM | $9, LIFT_KEY + db $9 ; objects + object SPRITE_GIOVANNI, $19, $3, FACE, DOWN, $1, GIOVANNI + $C8, $1 + object SPRITE_ROCKET, $17, $c, FACE, DOWN, $2, ROCKET + $C8, $10 + object SPRITE_ROCKET, $1a, $c, FACE, DOWN, $3, ROCKET + $C8, $11 + object SPRITE_ROCKET, $b, $2, FACE, DOWN, $4, ROCKET + $C8, $12 + object SPRITE_BALL, $a, $c, FACE, STAY, $5, HP_UP + object SPRITE_BALL, $9, $4, FACE, STAY, $6, TM_02 + object SPRITE_BALL, $c, $14, FACE, STAY, $7, IRON + object SPRITE_BALL, $19, $2, FACE, STAY, $8, SILPH_SCOPE + object SPRITE_BALL, $a, $2, FACE, STAY, $9, LIFT_KEY ; warp-to EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $a, $13 ; ROCKET_HIDEOUT_3 diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm index e4653a4c..477e62c9 100755 --- a/data/mapObjects/rockethideoutelevator.asm +++ b/data/mapObjects/rockethideoutelevator.asm @@ -8,7 +8,7 @@ RocketHideoutElevatorObject: ; 0x45791 (size=23) db $1 ; signs db $1, $1, $1 ; RocketHideoutElevatorText1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP ROCKET_HIDEOUT_ELEVATOR_WIDTH, $1, $2 ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index b8c8ff62..6da0264d 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -14,14 +14,14 @@ RockTunnel1Object: ; 0x445f6 (size=127) db $1 ; signs db $1d, $b, $8 ; RockTunnel1Text8 - db $7 ; people - db SPRITE_HIKER, $5 + 4, $7 + 4, $ff, $d0, TRAINER | $1, HIKER + $C8, $c - db SPRITE_HIKER, $10 + 4, $5 + 4, $ff, $d0, TRAINER | $2, HIKER + $C8, $d - db SPRITE_HIKER, $f + 4, $11 + 4, $ff, $d2, TRAINER | $3, HIKER + $C8, $e - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $17 + 4, $ff, $d2, TRAINER | $4, POKEMANIAC + $C8, $7 - db SPRITE_LASS, $15 + 4, $25 + 4, $ff, $d2, TRAINER | $5, JR__TRAINER_F + $C8, $11 - db SPRITE_LASS, $18 + 4, $16 + 4, $ff, $d0, TRAINER | $6, JR__TRAINER_F + $C8, $12 - db SPRITE_LASS, $18 + 4, $20 + 4, $ff, $d3, TRAINER | $7, JR__TRAINER_F + $C8, $13 + db $7 ; objects + object SPRITE_HIKER, $7, $5, FACE, DOWN, $1, HIKER + $C8, $c + object SPRITE_HIKER, $5, $10, FACE, DOWN, $2, HIKER + $C8, $d + object SPRITE_HIKER, $11, $f, FACE, RIGHT, $3, HIKER + $C8, $e + object SPRITE_BLACK_HAIR_BOY_2, $17, $8, FACE, RIGHT, $4, POKEMANIAC + $C8, $7 + object SPRITE_LASS, $25, $15, FACE, RIGHT, $5, JR__TRAINER_F + $C8, $11 + object SPRITE_LASS, $16, $18, FACE, DOWN, $6, JR__TRAINER_F + $C8, $12 + object SPRITE_LASS, $20, $18, FACE, LEFT, $7, JR__TRAINER_F + $C8, $13 ; warp-to EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index f75add5d..61014d31 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -9,15 +9,15 @@ RockTunnel2Object: ; 0x4613d (size=100) db $0 ; signs - db $8 ; people - db SPRITE_LASS, $d + 4, $b + 4, $ff, $d0, TRAINER | $1, JR__TRAINER_F + $C8, $9 - db SPRITE_HIKER, $a + 4, $6 + 4, $ff, $d0, TRAINER | $2, HIKER + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $3 + 4, $ff, $d0, TRAINER | $3, POKEMANIAC + $C8, $3 - db SPRITE_BLACK_HAIR_BOY_2, $15 + 4, $14 + 4, $ff, $d3, TRAINER | $4, POKEMANIAC + $C8, $4 - db SPRITE_HIKER, $a + 4, $1e + 4, $ff, $d0, TRAINER | $5, HIKER + $C8, $a - db SPRITE_LASS, $1c + 4, $e + 4, $ff, $d3, TRAINER | $6, JR__TRAINER_F + $C8, $a - db SPRITE_HIKER, $5 + 4, $21 + 4, $ff, $d3, TRAINER | $7, HIKER + $C8, $b - db SPRITE_BLACK_HAIR_BOY_2, $1e + 4, $1a + 4, $ff, $d0, TRAINER | $8, POKEMANIAC + $C8, $5 + db $8 ; objects + object SPRITE_LASS, $b, $d, FACE, DOWN, $1, JR__TRAINER_F + $C8, $9 + object SPRITE_HIKER, $6, $a, FACE, DOWN, $2, HIKER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $3, $5, FACE, DOWN, $3, POKEMANIAC + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_2, $14, $15, FACE, LEFT, $4, POKEMANIAC + $C8, $4 + object SPRITE_HIKER, $1e, $a, FACE, DOWN, $5, HIKER + $C8, $a + object SPRITE_LASS, $e, $1c, FACE, LEFT, $6, JR__TRAINER_F + $C8, $a + object SPRITE_HIKER, $21, $5, FACE, LEFT, $7, HIKER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, FACE, DOWN, $8, POKEMANIAC + $C8, $5 ; warp-to EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1 diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index 2dd7b71d..9cbe6ada 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -7,11 +7,11 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_GENTLEMAN, $3 + 4, $7 + 4, $fe, $2, $2 ; person - db SPRITE_FISHER2, $5 + 4, $2 + 4, $ff, $ff, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person + object SPRITE_FISHER2, $2, $5, FACE, STAY, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/route1.asm b/data/mapObjects/route1.asm index c16738f3..d2abf51f 100755 --- a/data/mapObjects/route1.asm +++ b/data/mapObjects/route1.asm @@ -6,9 +6,9 @@ Route1Object: ; 0x1c0e5 (size=19) db $1 ; signs db $1b, $9, $3 ; Route1Text3 - db $2 ; people - db SPRITE_BUG_CATCHER, $18 + 4, $5 + 4, $fe, $1, $1 ; person - db SPRITE_BUG_CATCHER, $d + 4, $f + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_BUG_CATCHER, $5, $18, WALK, $1, $1 ; person + object SPRITE_BUG_CATCHER, $f, $d, WALK, $2, $2 ; person ; warp-to (unused) EVENT_DISP $4, $7, $2 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index aa3f8a8e..7e3ac450 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -13,13 +13,13 @@ Route10Object: ; 0x582f6 (size=96) db $37, $9, $9 ; Route10Text9 db $29, $5, $a ; Route10Text10 - db $6 ; people - db SPRITE_BLACK_HAIR_BOY_2, $2c + 4, $a + 4, $ff, $d2, TRAINER | $1, POKEMANIAC + $C8, $1 - db SPRITE_HIKER, $39 + 4, $3 + 4, $ff, $d1, TRAINER | $2, HIKER + $C8, $7 - db SPRITE_BLACK_HAIR_BOY_2, $40 + 4, $e + 4, $ff, $d2, TRAINER | $3, POKEMANIAC + $C8, $2 - db SPRITE_LASS, $19 + 4, $7 + 4, $ff, $d2, TRAINER | $4, JR__TRAINER_F + $C8, $7 - db SPRITE_HIKER, $3d + 4, $3 + 4, $ff, $d0, TRAINER | $5, HIKER + $C8, $8 - db SPRITE_LASS, $36 + 4, $7 + 4, $ff, $d0, TRAINER | $6, JR__TRAINER_F + $C8, $8 + db $6 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, FACE, RIGHT, $1, POKEMANIAC + $C8, $1 + object SPRITE_HIKER, $3, $39, FACE, UP, $2, HIKER + $C8, $7 + object SPRITE_BLACK_HAIR_BOY_2, $e, $40, FACE, RIGHT, $3, POKEMANIAC + $C8, $2 + object SPRITE_LASS, $7, $19, FACE, RIGHT, $4, JR__TRAINER_F + $C8, $7 + object SPRITE_HIKER, $3, $3d, FACE, DOWN, $5, HIKER + $C8, $8 + object SPRITE_LASS, $7, $36, FACE, DOWN, $6, JR__TRAINER_F + $C8, $8 ; warp-to EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 167af2f8..cb8f9c35 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -11,17 +11,17 @@ Route11Object: ; 0x584e0 (size=127) db $1 ; signs db $5, $1, $b ; Route11Text11 - db $a ; people - db SPRITE_GAMBLER, $e + 4, $a + 4, $ff, $d0, TRAINER | $1, GAMBLER + $C8, $1 - db SPRITE_GAMBLER, $9 + 4, $1a + 4, $ff, $d0, TRAINER | $2, GAMBLER + $C8, $2 - db SPRITE_BUG_CATCHER, $5 + 4, $d + 4, $ff, $d2, TRAINER | $3, YOUNGSTER + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $b + 4, $24 + 4, $ff, $d0, TRAINER | $4, ENGINEER + $C8, $2 - db SPRITE_BUG_CATCHER, $4 + 4, $16 + 4, $ff, $d1, TRAINER | $5, YOUNGSTER + $C8, $a - db SPRITE_GAMBLER, $7 + 4, $2d + 4, $ff, $d0, TRAINER | $6, GAMBLER + $C8, $3 - db SPRITE_GAMBLER, $3 + 4, $21 + 4, $ff, $d1, TRAINER | $7, GAMBLER + $C8, $4 - db SPRITE_BUG_CATCHER, $5 + 4, $2b + 4, $ff, $d3, TRAINER | $8, YOUNGSTER + $C8, $b - db SPRITE_BLACK_HAIR_BOY_2, $10 + 4, $2d + 4, $ff, $d2, TRAINER | $9, ENGINEER + $C8, $3 - db SPRITE_BUG_CATCHER, $c + 4, $16 + 4, $ff, $d1, TRAINER | $a, YOUNGSTER + $C8, $c + db $a ; objects + object SPRITE_GAMBLER, $a, $e, FACE, DOWN, $1, GAMBLER + $C8, $1 + object SPRITE_GAMBLER, $1a, $9, FACE, DOWN, $2, GAMBLER + $C8, $2 + object SPRITE_BUG_CATCHER, $d, $5, FACE, RIGHT, $3, YOUNGSTER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $24, $b, FACE, DOWN, $4, ENGINEER + $C8, $2 + object SPRITE_BUG_CATCHER, $16, $4, FACE, UP, $5, YOUNGSTER + $C8, $a + object SPRITE_GAMBLER, $2d, $7, FACE, DOWN, $6, GAMBLER + $C8, $3 + object SPRITE_GAMBLER, $21, $3, FACE, UP, $7, GAMBLER + $C8, $4 + object SPRITE_BUG_CATCHER, $2b, $5, FACE, LEFT, $8, YOUNGSTER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, FACE, RIGHT, $9, ENGINEER + $C8, $3 + object SPRITE_BUG_CATCHER, $16, $c, FACE, UP, $a, YOUNGSTER + $C8, $c ; warp-to EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index 5ebfb13d..3e5dd6ed 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -10,8 +10,8 @@ Route11GateObject: ; 0x49416 (size=50) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $4, $1, FACE, STAY, $1 ; person ; warp-to EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $0 diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index 8ee0f8fa..b5564f63 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/route11gateupstairs.asm @@ -8,9 +8,9 @@ Route11GateUpstairsObject: ; 0x494da (size=30) db $2, $1, $3 ; Route11GateUpstairsText3 db $2, $6, $4 ; Route11GateUpstairsText4 - db $2 ; people - db SPRITE_BUG_CATCHER, $2 + 4, $4 + 4, $fe, $2, $1 ; person - db SPRITE_OAK_AIDE, $6 + 4, $2 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person + object SPRITE_OAK_AIDE, $2, $6, FACE, STAY, $2 ; person ; warp-to EVENT_DISP ROUTE_11_GATE_2F_WIDTH, $7, $7 ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index d0aaa847..5a971490 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -11,17 +11,17 @@ Route12Object: ; 0x5869a (size=118) db $d, $d, $b ; Route12Text11 db $3f, $b, $c ; Route12Text12 - db $a ; people - db SPRITE_SNORLAX, $3e + 4, $a + 4, $ff, $d0, $1 ; person - db SPRITE_FISHER2, $1f + 4, $e + 4, $ff, $d2, TRAINER | $2, FISHER + $C8, $3 - db SPRITE_FISHER2, $27 + 4, $5 + 4, $ff, $d1, TRAINER | $3, FISHER + $C8, $4 - db SPRITE_BLACK_HAIR_BOY_1, $5c + 4, $b + 4, $ff, $d2, TRAINER | $4, JR__TRAINER_M + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $4c + 4, $e + 4, $ff, $d1, TRAINER | $5, ROCKER + $C8, $2 - db SPRITE_FISHER2, $28 + 4, $c + 4, $ff, $d2, TRAINER | $6, FISHER + $C8, $5 - db SPRITE_FISHER2, $34 + 4, $9 + 4, $ff, $d3, TRAINER | $7, FISHER + $C8, $6 - db SPRITE_FISHER2, $57 + 4, $6 + 4, $ff, $d0, TRAINER | $8, FISHER + $C8, $b - db SPRITE_BALL, $23 + 4, $e + 4, $ff, $ff, ITEM | $9, TM_16 - db SPRITE_BALL, $59 + 4, $5 + 4, $ff, $ff, ITEM | $a, IRON + db $a ; objects + object SPRITE_SNORLAX, $a, $3e, FACE, DOWN, $1 ; person + object SPRITE_FISHER2, $e, $1f, FACE, RIGHT, $2, FISHER + $C8, $3 + object SPRITE_FISHER2, $5, $27, FACE, UP, $3, FISHER + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, FACE, RIGHT, $4, JR__TRAINER_M + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, FACE, UP, $5, ROCKER + $C8, $2 + object SPRITE_FISHER2, $c, $28, FACE, RIGHT, $6, FISHER + $C8, $5 + object SPRITE_FISHER2, $9, $34, FACE, LEFT, $7, FISHER + $C8, $6 + object SPRITE_FISHER2, $6, $57, FACE, DOWN, $8, FISHER + $C8, $b + object SPRITE_BALL, $e, $23, FACE, STAY, $9, TM_16 + object SPRITE_BALL, $5, $59, FACE, STAY, $a, IRON ; warp-to EVENT_DISP ROUTE_12_WIDTH, $f, $a ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index fc70b763..5b371bc2 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -10,8 +10,8 @@ Route12GateObject: ; 0x4950e (size=50) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $3 + 4, $1 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $1, $3, FACE, STAY, $1 ; person ; warp-to EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $4 diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm index 012dedda..9a8e4d4a 100755 --- a/data/mapObjects/route12gateupstairs.asm +++ b/data/mapObjects/route12gateupstairs.asm @@ -8,8 +8,8 @@ Route12GateUpstairsObject: ; 0x495de (size=24) db $2, $1, $2 ; Route12GateUpstairsText2 db $2, $6, $3 ; Route12GateUpstairsText3 - db $1 ; people - db SPRITE_BRUNETTE_GIRL, $4 + 4, $3 + 4, $fe, $1, $1 ; person + db $1 ; objects + object SPRITE_BRUNETTE_GIRL, $3, $4, WALK, $1, $1 ; person ; warp-to EVENT_DISP ROUTE_12_GATE_2F_WIDTH, $7, $7 ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index 74ae5bc7..b4fdb268 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/route12house.asm @@ -7,8 +7,8 @@ Route12HouseObject: ; 0x564de (size=26) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $4 + 4, $2 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $2, $4, FACE, LEFT, $1 ; person ; warp-to EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index 5cf6d0c2..6705a2a2 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -8,14 +8,14 @@ Route13Object: ; 0x5482e (size=93) db $5, $21, $c ; Route13Text12 db $b, $1f, $d ; Route13Text13 - db $a ; people - db SPRITE_BLACK_HAIR_BOY_1, $a + 4, $31 + 4, $ff, $d3, TRAINER | $1, BIRD_KEEPER + $C8, $1 - db SPRITE_LASS, $a + 4, $30 + 4, $ff, $d0, TRAINER | $2, JR__TRAINER_F + $C8, $c - db SPRITE_LASS, $9 + 4, $1b + 4, $ff, $d0, TRAINER | $3, JR__TRAINER_F + $C8, $d - db SPRITE_LASS, $a + 4, $17 + 4, $ff, $d2, TRAINER | $4, JR__TRAINER_F + $C8, $e - db SPRITE_LASS, $5 + 4, $32 + 4, $ff, $d0, TRAINER | $5, JR__TRAINER_F + $C8, $f - db SPRITE_BLACK_HAIR_BOY_1, $4 + 4, $c + 4, $ff, $d3, TRAINER | $6, BIRD_KEEPER + $C8, $2 - db SPRITE_FOULARD_WOMAN, $6 + 4, $21 + 4, $ff, $d0, TRAINER | $7, BEAUTY + $C8, $4 - db SPRITE_FOULARD_WOMAN, $6 + 4, $20 + 4, $ff, $d0, TRAINER | $8, BEAUTY + $C8, $5 - db SPRITE_BIKER, $7 + 4, $a + 4, $ff, $d1, TRAINER | $9, BIKER + $C8, $1 - db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $7 + 4, $ff, $d1, TRAINER | $a, BIRD_KEEPER + $C8, $3 + db $a ; objects + object SPRITE_BLACK_HAIR_BOY_1, $31, $a, FACE, LEFT, $1, BIRD_KEEPER + $C8, $1 + object SPRITE_LASS, $30, $a, FACE, DOWN, $2, JR__TRAINER_F + $C8, $c + object SPRITE_LASS, $1b, $9, FACE, DOWN, $3, JR__TRAINER_F + $C8, $d + object SPRITE_LASS, $17, $a, FACE, RIGHT, $4, JR__TRAINER_F + $C8, $e + object SPRITE_LASS, $32, $5, FACE, DOWN, $5, JR__TRAINER_F + $C8, $f + object SPRITE_BLACK_HAIR_BOY_1, $c, $4, FACE, LEFT, $6, BIRD_KEEPER + $C8, $2 + object SPRITE_FOULARD_WOMAN, $21, $6, FACE, DOWN, $7, BEAUTY + $C8, $4 + object SPRITE_FOULARD_WOMAN, $20, $6, FACE, DOWN, $8, BEAUTY + $C8, $5 + object SPRITE_BIKER, $a, $7, FACE, UP, $9, BIKER + $C8, $1 + object SPRITE_BLACK_HAIR_BOY_1, $7, $d, FACE, UP, $a, BIRD_KEEPER + $C8, $3 diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index a16f83e2..b7c6c421 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -6,14 +6,14 @@ Route14Object: ; 0x549bb (size=87) db $1 ; signs db $d, $11, $b ; Route14Text11 - db $a ; people - db SPRITE_BLACK_HAIR_BOY_1, $4 + 4, $4 + 4, $ff, $d0, TRAINER | $1, BIRD_KEEPER + $C8, $e - db SPRITE_BLACK_HAIR_BOY_1, $6 + 4, $f + 4, $ff, $d0, TRAINER | $2, BIRD_KEEPER + $C8, $f - db SPRITE_BLACK_HAIR_BOY_1, $b + 4, $c + 4, $ff, $d0, TRAINER | $3, BIRD_KEEPER + $C8, $10 - db SPRITE_BLACK_HAIR_BOY_1, $f + 4, $e + 4, $ff, $d1, TRAINER | $4, BIRD_KEEPER + $C8, $11 - db SPRITE_BLACK_HAIR_BOY_1, $1f + 4, $f + 4, $ff, $d2, TRAINER | $5, BIRD_KEEPER + $C8, $4 - db SPRITE_BLACK_HAIR_BOY_1, $31 + 4, $6 + 4, $ff, $d1, TRAINER | $6, BIRD_KEEPER + $C8, $5 - db SPRITE_BIKER, $27 + 4, $5 + 4, $ff, $d0, TRAINER | $7, BIKER + $C8, $d - db SPRITE_BIKER, $1e + 4, $4 + 4, $ff, $d3, TRAINER | $8, BIKER + $C8, $e - db SPRITE_BIKER, $1e + 4, $f + 4, $ff, $d2, TRAINER | $9, BIKER + $C8, $f - db SPRITE_BIKER, $1f + 4, $4 + 4, $ff, $d3, TRAINER | $a, BIKER + $C8, $2 + db $a ; objects + object SPRITE_BLACK_HAIR_BOY_1, $4, $4, FACE, DOWN, $1, BIRD_KEEPER + $C8, $e + object SPRITE_BLACK_HAIR_BOY_1, $f, $6, FACE, DOWN, $2, BIRD_KEEPER + $C8, $f + object SPRITE_BLACK_HAIR_BOY_1, $c, $b, FACE, DOWN, $3, BIRD_KEEPER + $C8, $10 + object SPRITE_BLACK_HAIR_BOY_1, $e, $f, FACE, UP, $4, BIRD_KEEPER + $C8, $11 + object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, FACE, RIGHT, $5, BIRD_KEEPER + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $31, FACE, UP, $6, BIRD_KEEPER + $C8, $5 + object SPRITE_BIKER, $5, $27, FACE, DOWN, $7, BIKER + $C8, $d + object SPRITE_BIKER, $4, $1e, FACE, LEFT, $8, BIKER + $C8, $e + object SPRITE_BIKER, $f, $1e, FACE, RIGHT, $9, BIKER + $C8, $f + object SPRITE_BIKER, $4, $1f, FACE, LEFT, $a, BIKER + $C8, $2 diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index a7165c6c..33e8f793 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -10,18 +10,18 @@ Route15Object: ; 0x5894e (size=126) db $1 ; signs db $9, $27, $c ; Route15Text12 - db $b ; people - db SPRITE_LASS, $b + 4, $29 + 4, $ff, $d0, TRAINER | $1, JR__TRAINER_F + $C8, $14 - db SPRITE_LASS, $a + 4, $35 + 4, $ff, $d2, TRAINER | $2, JR__TRAINER_F + $C8, $15 - db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $1f + 4, $ff, $d1, TRAINER | $3, BIRD_KEEPER + $C8, $6 - db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $23 + 4, $ff, $d1, TRAINER | $4, BIRD_KEEPER + $C8, $7 - db SPRITE_FOULARD_WOMAN, $b + 4, $35 + 4, $ff, $d0, TRAINER | $5, BEAUTY + $C8, $9 - db SPRITE_FOULARD_WOMAN, $a + 4, $29 + 4, $ff, $d3, TRAINER | $6, BEAUTY + $C8, $a - db SPRITE_BIKER, $a + 4, $30 + 4, $ff, $d0, TRAINER | $7, BIKER + $C8, $3 - db SPRITE_BIKER, $a + 4, $2e + 4, $ff, $d0, TRAINER | $8, BIKER + $C8, $4 - db SPRITE_LASS, $5 + 4, $25 + 4, $ff, $d3, TRAINER | $9, JR__TRAINER_F + $C8, $16 - db SPRITE_LASS, $d + 4, $12 + 4, $ff, $d1, TRAINER | $a, JR__TRAINER_F + $C8, $17 - db SPRITE_BALL, $5 + 4, $12 + 4, $ff, $ff, ITEM | $b, TM_20 + db $b ; objects + object SPRITE_LASS, $29, $b, FACE, DOWN, $1, JR__TRAINER_F + $C8, $14 + object SPRITE_LASS, $35, $a, FACE, RIGHT, $2, JR__TRAINER_F + $C8, $15 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, FACE, UP, $3, BIRD_KEEPER + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_1, $23, $d, FACE, UP, $4, BIRD_KEEPER + $C8, $7 + object SPRITE_FOULARD_WOMAN, $35, $b, FACE, DOWN, $5, BEAUTY + $C8, $9 + object SPRITE_FOULARD_WOMAN, $29, $a, FACE, LEFT, $6, BEAUTY + $C8, $a + object SPRITE_BIKER, $30, $a, FACE, DOWN, $7, BIKER + $C8, $3 + object SPRITE_BIKER, $2e, $a, FACE, DOWN, $8, BIKER + $C8, $4 + object SPRITE_LASS, $25, $5, FACE, LEFT, $9, JR__TRAINER_F + $C8, $16 + object SPRITE_LASS, $12, $d, FACE, UP, $a, JR__TRAINER_F + $C8, $17 + object SPRITE_BALL, $12, $5, FACE, STAY, $b, TM_20 ; warp-to EVENT_DISP ROUTE_15_WIDTH, $8, $7 ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index e0278fbe..2a4e88cc 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -10,8 +10,8 @@ Route15GateObject: ; 0x4960c (size=50) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $4, $1, FACE, STAY, $1 ; person ; warp-to EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $0 diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index dd7a0b2c..f922a6ab 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/route15gateupstairs.asm @@ -7,8 +7,8 @@ Route15GateUpstairsObject: ; 4969d (12:569d) db $1 ; signs db $2, $6, $2 ; Route15GateUpstairsText2 - db $1 ; people - db SPRITE_OAK_AIDE, $2 + 4, $4 + 4, $ff, $d0, $1 + db $1 ; objects + object SPRITE_OAK_AIDE, $4, $2, FACE, DOWN, $1 ; warp-to EVENT_DISP ROUTE_15_GATE_2F_WIDTH, $7, $7 ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index 3023124e..e3fd619e 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -16,14 +16,14 @@ Route16Object: ; 0x58afc (size=136) db $b, $1b, $8 ; Route16Text8 db $11, $5, $9 ; Route16Text9 - db $7 ; people - db SPRITE_BIKER, $c + 4, $11 + 4, $ff, $d2, TRAINER | $1, BIKER + $C8, $5 - db SPRITE_BIKER, $d + 4, $e + 4, $ff, $d3, TRAINER | $2, CUE_BALL + $C8, $1 - db SPRITE_BIKER, $c + 4, $b + 4, $ff, $d1, TRAINER | $3, CUE_BALL + $C8, $2 - db SPRITE_BIKER, $b + 4, $9 + 4, $ff, $d2, TRAINER | $4, BIKER + $C8, $6 - db SPRITE_BIKER, $a + 4, $6 + 4, $ff, $d3, TRAINER | $5, CUE_BALL + $C8, $3 - db SPRITE_BIKER, $c + 4, $3 + 4, $ff, $d3, TRAINER | $6, BIKER + $C8, $7 - db SPRITE_SNORLAX, $a + 4, $1a + 4, $ff, $d0, $7 ; person + db $7 ; objects + object SPRITE_BIKER, $11, $c, FACE, RIGHT, $1, BIKER + $C8, $5 + object SPRITE_BIKER, $e, $d, FACE, LEFT, $2, CUE_BALL + $C8, $1 + object SPRITE_BIKER, $b, $c, FACE, UP, $3, CUE_BALL + $C8, $2 + object SPRITE_BIKER, $9, $b, FACE, RIGHT, $4, BIKER + $C8, $6 + object SPRITE_BIKER, $6, $a, FACE, LEFT, $5, CUE_BALL + $C8, $3 + object SPRITE_BIKER, $3, $c, FACE, LEFT, $6, BIKER + $C8, $7 + object SPRITE_SNORLAX, $1a, $a, FACE, DOWN, $7 ; person ; warp-to EVENT_DISP ROUTE_16_WIDTH, $a, $11 ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index 3b493cca..c7d54664 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/route16gate.asm @@ -14,9 +14,9 @@ Route16GateObject: ; 0x4978b (size=88) db $0 ; signs - db $2 ; people - db SPRITE_GUARD, $5 + 4, $4 + 4, $ff, $d0, $1 ; person - db SPRITE_GAMBLER, $3 + 4, $4 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_GUARD, $4, $5, FACE, DOWN, $1 ; person + object SPRITE_GAMBLER, $4, $3, FACE, STAY, $2 ; person ; warp-to EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $0 diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index ee9df620..4d13b0f9 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -8,9 +8,9 @@ Route16GateUpstairsObject: ; 0x4984c (size=30) db $2, $1, $3 ; Route16GateUpstairsText3 db $2, $6, $4 ; Route16GateUpstairsText4 - db $2 ; people - db SPRITE_YOUNG_BOY, $2 + 4, $4 + 4, $ff, $ff, $1 ; person - db SPRITE_LITTLE_GIRL, $5 + 4, $2 + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_YOUNG_BOY, $4, $2, FACE, STAY, $1 ; person + object SPRITE_LITTLE_GIRL, $2, $5, WALK, $2, $2 ; person ; warp-to EVENT_DISP ROUTE_16_GATE_2F_WIDTH, $7, $7 ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index 816c0e69..bcaf7dd4 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/route16house.asm @@ -7,9 +7,9 @@ Route16HouseObject: ; 0x1e657 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_BRUNETTE_GIRL, $3 + 4, $2 + 4, $ff, $d3, $1 ; person - db SPRITE_BIRD, $4 + 4, $6 + 4, $fe, $0, $2 ; person + db $2 ; objects + object SPRITE_BRUNETTE_GIRL, $2, $3, FACE, LEFT, $1 ; person + object SPRITE_BIRD, $6, $4, WALK, $0, $2 ; person ; warp-to EVENT_DISP ROUTE_16_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index 06123998..d6d30921 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -11,14 +11,14 @@ Route17Object: ; 0x54b42 (size=102) db $6f, $9, $f ; Route17Text15 db $8d, $9, $10 ; Route17Text16 - db $a ; people - db SPRITE_BIKER, $13 + 4, $c + 4, $ff, $d2, TRAINER | $1, CUE_BALL + $C8, $4 - db SPRITE_BIKER, $10 + 4, $b + 4, $ff, $d3, TRAINER | $2, CUE_BALL + $C8, $5 - db SPRITE_BIKER, $12 + 4, $4 + 4, $ff, $d1, TRAINER | $3, BIKER + $C8, $8 - db SPRITE_BIKER, $20 + 4, $7 + 4, $ff, $d2, TRAINER | $4, BIKER + $C8, $9 - db SPRITE_BIKER, $22 + 4, $e + 4, $ff, $d3, TRAINER | $5, BIKER + $C8, $a - db SPRITE_BIKER, $3a + 4, $11 + 4, $ff, $d2, TRAINER | $6, CUE_BALL + $C8, $6 - db SPRITE_BIKER, $44 + 4, $2 + 4, $ff, $d3, TRAINER | $7, CUE_BALL + $C8, $7 - db SPRITE_BIKER, $62 + 4, $e + 4, $ff, $d3, TRAINER | $8, CUE_BALL + $C8, $8 - db SPRITE_BIKER, $62 + 4, $5 + 4, $ff, $d2, TRAINER | $9, BIKER + $C8, $b - db SPRITE_BIKER, $76 + 4, $a + 4, $ff, $d0, TRAINER | $a, BIKER + $C8, $c + db $a ; objects + object SPRITE_BIKER, $c, $13, FACE, RIGHT, $1, CUE_BALL + $C8, $4 + object SPRITE_BIKER, $b, $10, FACE, LEFT, $2, CUE_BALL + $C8, $5 + object SPRITE_BIKER, $4, $12, FACE, UP, $3, BIKER + $C8, $8 + object SPRITE_BIKER, $7, $20, FACE, RIGHT, $4, BIKER + $C8, $9 + object SPRITE_BIKER, $e, $22, FACE, LEFT, $5, BIKER + $C8, $a + object SPRITE_BIKER, $11, $3a, FACE, RIGHT, $6, CUE_BALL + $C8, $6 + object SPRITE_BIKER, $2, $44, FACE, LEFT, $7, CUE_BALL + $C8, $7 + object SPRITE_BIKER, $e, $62, FACE, LEFT, $8, CUE_BALL + $C8, $8 + object SPRITE_BIKER, $5, $62, FACE, RIGHT, $9, BIKER + $C8, $b + object SPRITE_BIKER, $a, $76, FACE, DOWN, $a, BIKER + $C8, $c diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index f4dd26f3..ff51f080 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -11,10 +11,10 @@ Route18Object: ; 0x58c5a (size=66) db $7, $2b, $4 ; Route18Text4 db $5, $21, $5 ; Route18Text5 - db $3 ; people - db SPRITE_BLACK_HAIR_BOY_1, $b + 4, $24 + 4, $ff, $d3, TRAINER | $1, BIRD_KEEPER + $C8, $8 - db SPRITE_BLACK_HAIR_BOY_1, $f + 4, $28 + 4, $ff, $d2, TRAINER | $2, BIRD_KEEPER + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $2a + 4, $ff, $d2, TRAINER | $3, BIRD_KEEPER + $C8, $a + db $3 ; objects + object SPRITE_BLACK_HAIR_BOY_1, $24, $b, FACE, LEFT, $1, BIRD_KEEPER + $C8, $8 + object SPRITE_BLACK_HAIR_BOY_1, $28, $f, FACE, RIGHT, $2, BIRD_KEEPER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, FACE, RIGHT, $3, BIRD_KEEPER + $C8, $a ; warp-to EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index 62816061..846a9a51 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/route18gate.asm @@ -10,8 +10,8 @@ Route18GateObject: ; 0x49937 (size=50) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $4, $1, FACE, DOWN, $1 ; person ; warp-to EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $0 diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/route18gateupstairs.asm index d2b55e7f..c611e0c3 100755 --- a/data/mapObjects/route18gateupstairs.asm +++ b/data/mapObjects/route18gateupstairs.asm @@ -8,8 +8,8 @@ Route18GateUpstairsObject: ; 0x499a4 (size=24) db $2, $1, $2 ; Route18GateUpstairsText2 db $2, $6, $3 ; Route18GateUpstairsText3 - db $1 ; people - db SPRITE_BUG_CATCHER, $2 + 4, $4 + 4, $fe, $2, $1 ; person + db $1 ; objects + object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person ; warp-to EVENT_DISP ROUTE_18_GATE_2F_WIDTH, $7, $7 ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index c6f80b6c..078a29fa 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -15,26 +15,26 @@ ELSE db $9, $b, $b ; Route19Text11 ENDC - db $a ; people + db $a ; objects IF DEF(_OPTION_BEACH_HOUSE) - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $9 + 4, $ff, $d3, TRAINER | 1, SWIMMER + $C8, 2 - db SPRITE_BLACK_HAIR_BOY_1, $9 + 4, $c + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3 + object SPRITE_BLACK_HAIR_BOY_1, $9, $7, FACE, LEFT, 1, SWIMMER + $C8, 2 + object SPRITE_BLACK_HAIR_BOY_1, $c, $9, FACE, RIGHT, 2, SWIMMER + $C8, 3 ELSE - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $8 + 4, $ff, $d2, TRAINER | 1, SWIMMER + $C8, 2 - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $d + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3 + object SPRITE_BLACK_HAIR_BOY_1, $8, $7, FACE, RIGHT, 1, SWIMMER + $C8, 2 + object SPRITE_BLACK_HAIR_BOY_1, $d, $7, FACE, RIGHT, 2, SWIMMER + $C8, 3 ENDC - db SPRITE_SWIMMER, $19 + 4, $d + 4, $ff, $d2, TRAINER | $3, SWIMMER + $C8, $4 - db SPRITE_SWIMMER, $1b + 4, $4 + 4, $ff, $d3, TRAINER | $4, SWIMMER + $C8, $5 - db SPRITE_SWIMMER, $1f + 4, $10 + 4, $ff, $d1, TRAINER | $5, SWIMMER + $C8, $6 + object SPRITE_SWIMMER, $d, $19, FACE, RIGHT, $3, SWIMMER + $C8, $4 + object SPRITE_SWIMMER, $4, $1b, FACE, LEFT, $4, SWIMMER + $C8, $5 + object SPRITE_SWIMMER, $10, $1f, FACE, UP, $5, SWIMMER + $C8, $6 IF DEF(_OPTION_BEACH_HOUSE) - db SPRITE_SWIMMER, $d + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7 + object SPRITE_SWIMMER, $9, $d, FACE, DOWN, $6, SWIMMER + $C8, $7 ELSE - db SPRITE_SWIMMER, $b + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7 + object SPRITE_SWIMMER, $9, $b, FACE, DOWN, $6, SWIMMER + $C8, $7 ENDC - db SPRITE_SWIMMER, $2b + 4, $8 + 4, $ff, $d2, TRAINER | $7, BEAUTY + $C8, $c - db SPRITE_SWIMMER, $2b + 4, $b + 4, $ff, $d3, TRAINER | $8, BEAUTY + $C8, $d - db SPRITE_SWIMMER, $2a + 4, $9 + 4, $ff, $d1, TRAINER | $9, SWIMMER + $C8, $8 - db SPRITE_SWIMMER, $2c + 4, $a + 4, $ff, $d0, TRAINER | $a, BEAUTY + $C8, $e + object SPRITE_SWIMMER, $8, $2b, FACE, RIGHT, $7, BEAUTY + $C8, $c + object SPRITE_SWIMMER, $b, $2b, FACE, LEFT, $8, BEAUTY + $C8, $d + object SPRITE_SWIMMER, $9, $2a, FACE, UP, $9, SWIMMER + $C8, $8 + object SPRITE_SWIMMER, $a, $2c, FACE, DOWN, $a, BEAUTY + $C8, $e ; warp-to IF DEF(_OPTION_BEACH_HOUSE) diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 5587309c..8f1f58b4 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -13,9 +13,9 @@ Route2Object: ; 0x54022 (size=72) db $41, $5, $3 ; Route2Text3 db $b, $b, $4 ; Route2Text4 - db $2 ; people - db SPRITE_BALL, $36 + 4, $d + 4, $ff, $ff, ITEM | $1, MOON_STONE - db SPRITE_BALL, $2d + 4, $d + 4, $ff, $ff, ITEM | $2, HP_UP + db $2 ; objects + object SPRITE_BALL, $d, $36, FACE, STAY, $1, MOON_STONE + object SPRITE_BALL, $d, $2d, FACE, STAY, $2, HP_UP ; warp-to EVENT_DISP ROUTE_2_WIDTH, $9, $c ; DIGLETTS_CAVE_EXIT diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 78256699..6b622467 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -9,17 +9,17 @@ Route20Object: ; 0x50113 (size=106) db $7, $33, $b ; Route20Text11 db $b, $39, $c ; Route20Text12 - db $a ; people - db SPRITE_SWIMMER, $8 + 4, $57 + 4, $ff, $d1, TRAINER | $1, SWIMMER + $C8, $9 - db SPRITE_SWIMMER, $b + 4, $44 + 4, $ff, $d1, TRAINER | $2, BEAUTY + $C8, $f - db SPRITE_SWIMMER, $a + 4, $2d + 4, $ff, $d0, TRAINER | $3, BEAUTY + $C8, $6 - db SPRITE_SWIMMER, $e + 4, $37 + 4, $ff, $d3, TRAINER | $4, JR__TRAINER_F + $C8, $18 - db SPRITE_SWIMMER, $d + 4, $26 + 4, $ff, $d0, TRAINER | $5, SWIMMER + $C8, $a - db SPRITE_SWIMMER, $d + 4, $57 + 4, $ff, $d1, TRAINER | $6, SWIMMER + $C8, $b - db SPRITE_BLACK_HAIR_BOY_1, $9 + 4, $22 + 4, $ff, $d1, TRAINER | $7, BIRD_KEEPER + $C8, $b - db SPRITE_SWIMMER, $7 + 4, $19 + 4, $ff, $d1, TRAINER | $8, BEAUTY + $C8, $7 - db SPRITE_SWIMMER, $c + 4, $18 + 4, $ff, $d0, TRAINER | $9, JR__TRAINER_F + $C8, $10 - db SPRITE_SWIMMER, $8 + 4, $f + 4, $ff, $d1, TRAINER | $a, BEAUTY + $C8, $8 + db $a ; objects + object SPRITE_SWIMMER, $57, $8, FACE, UP, $1, SWIMMER + $C8, $9 + object SPRITE_SWIMMER, $44, $b, FACE, UP, $2, BEAUTY + $C8, $f + object SPRITE_SWIMMER, $2d, $a, FACE, DOWN, $3, BEAUTY + $C8, $6 + object SPRITE_SWIMMER, $37, $e, FACE, LEFT, $4, JR__TRAINER_F + $C8, $18 + object SPRITE_SWIMMER, $26, $d, FACE, DOWN, $5, SWIMMER + $C8, $a + object SPRITE_SWIMMER, $57, $d, FACE, UP, $6, SWIMMER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_1, $22, $9, FACE, UP, $7, BIRD_KEEPER + $C8, $b + object SPRITE_SWIMMER, $19, $7, FACE, UP, $8, BEAUTY + $C8, $7 + object SPRITE_SWIMMER, $18, $c, FACE, DOWN, $9, JR__TRAINER_F + $C8, $10 + object SPRITE_SWIMMER, $f, $8, FACE, UP, $a, BEAUTY + $C8, $8 ; warp-to EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index 6e9a044e..d8d6e242 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -5,13 +5,13 @@ Route21Object: ; 0x55021 (size=76) db $0 ; signs - db $9 ; people - db SPRITE_FISHER2, $18 + 4, $4 + 4, $ff, $d2, TRAINER | $1, FISHER + $C8, $7 - db SPRITE_FISHER2, $19 + 4, $6 + 4, $ff, $d0, TRAINER | $2, FISHER + $C8, $9 - db SPRITE_SWIMMER, $1f + 4, $a + 4, $ff, $d1, TRAINER | $3, SWIMMER + $C8, $c - db SPRITE_SWIMMER, $1e + 4, $c + 4, $ff, $d3, TRAINER | $4, CUE_BALL + $C8, $9 - db SPRITE_SWIMMER, $3f + 4, $10 + 4, $ff, $d0, TRAINER | $5, SWIMMER + $C8, $d - db SPRITE_SWIMMER, $47 + 4, $5 + 4, $ff, $d3, TRAINER | $6, SWIMMER + $C8, $e - db SPRITE_SWIMMER, $47 + 4, $f + 4, $ff, $d2, TRAINER | $7, SWIMMER + $C8, $f - db SPRITE_FISHER2, $38 + 4, $e + 4, $ff, $d2, TRAINER | $8, FISHER + $C8, $8 - db SPRITE_FISHER2, $39 + 4, $11 + 4, $ff, $d3, TRAINER | $9, FISHER + $C8, $a + db $9 ; objects + object SPRITE_FISHER2, $4, $18, FACE, RIGHT, $1, FISHER + $C8, $7 + object SPRITE_FISHER2, $6, $19, FACE, DOWN, $2, FISHER + $C8, $9 + object SPRITE_SWIMMER, $a, $1f, FACE, UP, $3, SWIMMER + $C8, $c + object SPRITE_SWIMMER, $c, $1e, FACE, LEFT, $4, CUE_BALL + $C8, $9 + object SPRITE_SWIMMER, $10, $3f, FACE, DOWN, $5, SWIMMER + $C8, $d + object SPRITE_SWIMMER, $5, $47, FACE, LEFT, $6, SWIMMER + $C8, $e + object SPRITE_SWIMMER, $f, $47, FACE, RIGHT, $7, SWIMMER + $C8, $f + object SPRITE_FISHER2, $e, $38, FACE, RIGHT, $8, FISHER + $C8, $8 + object SPRITE_FISHER2, $11, $39, FACE, LEFT, $9, FISHER + $C8, $a diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index ac67ed9f..0040007e 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -7,9 +7,9 @@ Route22Object: ; 0x50022 (size=27) db $1 ; signs db $b, $7, $3 ; Route22FrontGateText - db $2 ; people - db SPRITE_BLUE, $5 + 4, $19 + 4, $ff, $ff, $1 ; person - db SPRITE_BLUE, $5 + 4, $19 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_BLUE, $19, $5, FACE, STAY, $1 ; person + object SPRITE_BLUE, $19, $5, FACE, STAY, $2 ; person ; warp-to EVENT_DISP ROUTE_22_WIDTH, $5, $8 ; ROUTE_22_GATE diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index cafc47ce..87296ce4 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -9,8 +9,8 @@ Route22GateObject: ; 0x1e720 (size=42) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $2 + 4, $6 + 4, $ff, $d2, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $6, $2, FACE, RIGHT, $1 ; person ; warp-to EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $4 diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index 15591ae1..3e8d41fd 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/route23.asm @@ -10,14 +10,14 @@ Route23Object: ; 0x50361 (size=81) db $1 ; signs db $21, $3, $8 ; Route23Text8 - db $7 ; people - db SPRITE_GUARD, $23 + 4, $4 + 4, $ff, $d0, $1 ; person - db SPRITE_GUARD, $38 + 4, $a + 4, $ff, $d0, $2 ; person - db SPRITE_SWIMMER, $55 + 4, $8 + 4, $ff, $d0, $3 ; person - db SPRITE_SWIMMER, $60 + 4, $b + 4, $ff, $d0, $4 ; person - db SPRITE_GUARD, $69 + 4, $c + 4, $ff, $d0, $5 ; person - db SPRITE_GUARD, $77 + 4, $8 + 4, $ff, $d0, $6 ; person - db SPRITE_GUARD, $88 + 4, $8 + 4, $ff, $d0, $7 ; person + db $7 ; objects + object SPRITE_GUARD, $4, $23, FACE, DOWN, $1 ; person + object SPRITE_GUARD, $a, $38, FACE, DOWN, $2 ; person + object SPRITE_SWIMMER, $8, $55, FACE, DOWN, $3 ; person + object SPRITE_SWIMMER, $b, $60, FACE, DOWN, $4 ; person + object SPRITE_GUARD, $c, $69, FACE, DOWN, $5 ; person + object SPRITE_GUARD, $8, $77, FACE, DOWN, $6 ; person + object SPRITE_GUARD, $8, $88, FACE, DOWN, $7 ; person ; warp-to EVENT_DISP ROUTE_23_WIDTH, $8b, $7 ; ROUTE_22_GATE diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index e17709ff..f7218515 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -5,12 +5,12 @@ Route24Object: ; 0x506a4 (size=67) db $0 ; signs - db $8 ; people - db SPRITE_BLACK_HAIR_BOY_1, $f + 4, $b + 4, $ff, $d2, TRAINER | $1, ROCKET + $C8, $6 - db SPRITE_BLACK_HAIR_BOY_1, $14 + 4, $5 + 4, $ff, $d1, TRAINER | $2, JR__TRAINER_M + $C8, $2 - db SPRITE_BLACK_HAIR_BOY_1, $13 + 4, $b + 4, $ff, $d2, TRAINER | $3, JR__TRAINER_M + $C8, $3 - db SPRITE_LASS, $16 + 4, $a + 4, $ff, $d3, TRAINER | $4, LASS + $C8, $7 - db SPRITE_BUG_CATCHER, $19 + 4, $b + 4, $ff, $d2, TRAINER | $5, YOUNGSTER + $C8, $4 - db SPRITE_LASS, $1c + 4, $a + 4, $ff, $d3, TRAINER | $6, LASS + $C8, $8 - db SPRITE_BUG_CATCHER, $1f + 4, $b + 4, $ff, $d2, TRAINER | $7, BUG_CATCHER + $C8, $9 - db SPRITE_BALL, $5 + 4, $a + 4, $ff, $ff, ITEM | $8, TM_45 + db $8 ; objects + object SPRITE_BLACK_HAIR_BOY_1, $b, $f, FACE, RIGHT, $1, ROCKET + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_1, $5, $14, FACE, UP, $2, JR__TRAINER_M + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_1, $b, $13, FACE, RIGHT, $3, JR__TRAINER_M + $C8, $3 + object SPRITE_LASS, $a, $16, FACE, LEFT, $4, LASS + $C8, $7 + object SPRITE_BUG_CATCHER, $b, $19, FACE, RIGHT, $5, YOUNGSTER + $C8, $4 + object SPRITE_LASS, $a, $1c, FACE, LEFT, $6, LASS + $C8, $8 + object SPRITE_BUG_CATCHER, $b, $1f, FACE, RIGHT, $7, BUG_CATCHER + $C8, $9 + object SPRITE_BALL, $a, $5, FACE, STAY, $8, TM_45 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index 6b3ef029..dc41df1e 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -7,17 +7,17 @@ Route25Object: ; 0x507b2 (size=94) db $1 ; signs db $3, $2b, $b ; Route25Text11 - db $a ; people - db SPRITE_BUG_CATCHER, $2 + 4, $e + 4, $ff, $d0, TRAINER | $1, YOUNGSTER + $C8, $5 - db SPRITE_BUG_CATCHER, $5 + 4, $12 + 4, $ff, $d1, TRAINER | $2, YOUNGSTER + $C8, $6 - db SPRITE_BLACK_HAIR_BOY_1, $4 + 4, $18 + 4, $ff, $d0, TRAINER | $3, JR__TRAINER_M + $C8, $2 - db SPRITE_LASS, $8 + 4, $12 + 4, $ff, $d3, TRAINER | $4, LASS + $C8, $9 - db SPRITE_BUG_CATCHER, $3 + 4, $20 + 4, $ff, $d2, TRAINER | $5, YOUNGSTER + $C8, $7 - db SPRITE_LASS, $4 + 4, $25 + 4, $ff, $d0, TRAINER | $6, LASS + $C8, $a - db SPRITE_HIKER, $4 + 4, $8 + 4, $ff, $d3, TRAINER | $7, HIKER + $C8, $2 - db SPRITE_HIKER, $9 + 4, $17 + 4, $ff, $d1, TRAINER | $8, HIKER + $C8, $3 - db SPRITE_HIKER, $7 + 4, $d + 4, $ff, $d3, TRAINER | $9, HIKER + $C8, $4 - db SPRITE_BALL, $2 + 4, $16 + 4, $ff, $ff, ITEM | $a, TM_19 + db $a ; objects + object SPRITE_BUG_CATCHER, $e, $2, FACE, DOWN, $1, YOUNGSTER + $C8, $5 + object SPRITE_BUG_CATCHER, $12, $5, FACE, UP, $2, YOUNGSTER + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_1, $18, $4, FACE, DOWN, $3, JR__TRAINER_M + $C8, $2 + object SPRITE_LASS, $12, $8, FACE, LEFT, $4, LASS + $C8, $9 + object SPRITE_BUG_CATCHER, $20, $3, FACE, RIGHT, $5, YOUNGSTER + $C8, $7 + object SPRITE_LASS, $25, $4, FACE, DOWN, $6, LASS + $C8, $a + object SPRITE_HIKER, $8, $4, FACE, LEFT, $7, HIKER + $C8, $2 + object SPRITE_HIKER, $17, $9, FACE, UP, $8, HIKER + $C8, $3 + object SPRITE_HIKER, $d, $7, FACE, LEFT, $9, HIKER + $C8, $4 + object SPRITE_BALL, $16, $2, FACE, STAY, $a, TM_19 ; warp-to EVENT_DISP ROUTE_25_WIDTH, $3, $2d ; BILLS_HOUSE diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index a1bcc687..34718181 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -9,9 +9,9 @@ Route2GateObject: ; 0x5d620 (size=48) db $0 ; signs - db $2 ; people - db SPRITE_OAK_AIDE, $4 + 4, $1 + 4, $ff, $d2, $1 ; person - db SPRITE_BUG_CATCHER, $4 + 4, $5 + 4, $fe, $2, $2 ; person + db $2 ; objects + object SPRITE_OAK_AIDE, $1, $4, FACE, RIGHT, $1 ; person + object SPRITE_BUG_CATCHER, $5, $4, WALK, $2, $2 ; person ; warp-to EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $4 diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index 26adfcf4..789d51cf 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -7,9 +7,9 @@ Route2HouseObject: ; 0x1df07 (size=32) db $0 ; signs - db $2 ; people - db SPRITE_OAK_AIDE, $4 + 4, $2 + 4, $ff, $d3, $1 ; person - db SPRITE_GAMEBOY_KID_COPY, $1 + 4, $4 + 4, $ff, $d0, $2 ; person + db $2 ; objects + object SPRITE_OAK_AIDE, $2, $4, FACE, LEFT, $1 ; person + object SPRITE_GAMEBOY_KID_COPY, $4, $1, FACE, DOWN, $2 ; person ; warp-to EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index 99de3d73..6b140b5f 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -6,13 +6,13 @@ Route3Object: ; 0x54208 (size=77) db $1 ; signs db $9, $3b, $a ; Route3Text10 - db $9 ; people - db SPRITE_BLACK_HAIR_BOY_2, $b + 4, $39 + 4, $ff, $ff, $1 ; person - db SPRITE_BUG_CATCHER, $6 + 4, $a + 4, $ff, $d3, TRAINER | $2, BUG_CATCHER + $C8, $4 - db SPRITE_BUG_CATCHER, $4 + 4, $e + 4, $ff, $d0, TRAINER | $3, YOUNGSTER + $C8, $1 - db SPRITE_LASS, $9 + 4, $10 + 4, $ff, $d2, TRAINER | $4, LASS + $C8, $1 - db SPRITE_BUG_CATCHER, $5 + 4, $13 + 4, $ff, $d0, TRAINER | $5, BUG_CATCHER + $C8, $5 - db SPRITE_LASS, $4 + 4, $17 + 4, $ff, $d2, TRAINER | $6, LASS + $C8, $2 - db SPRITE_BUG_CATCHER, $9 + 4, $16 + 4, $ff, $d2, TRAINER | $7, YOUNGSTER + $C8, $2 - db SPRITE_BUG_CATCHER, $6 + 4, $18 + 4, $ff, $d3, TRAINER | $8, BUG_CATCHER + $C8, $6 - db SPRITE_LASS, $a + 4, $21 + 4, $ff, $d1, TRAINER | $9, LASS + $C8, $3 + db $9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $39, $b, FACE, STAY, $1 ; person + object SPRITE_BUG_CATCHER, $a, $6, FACE, LEFT, $2, BUG_CATCHER + $C8, $4 + object SPRITE_BUG_CATCHER, $e, $4, FACE, DOWN, $3, YOUNGSTER + $C8, $1 + object SPRITE_LASS, $10, $9, FACE, RIGHT, $4, LASS + $C8, $1 + object SPRITE_BUG_CATCHER, $13, $5, FACE, DOWN, $5, BUG_CATCHER + $C8, $5 + object SPRITE_LASS, $17, $4, FACE, RIGHT, $6, LASS + $C8, $2 + object SPRITE_BUG_CATCHER, $16, $9, FACE, RIGHT, $7, YOUNGSTER + $C8, $2 + object SPRITE_BUG_CATCHER, $18, $6, FACE, LEFT, $8, BUG_CATCHER + $C8, $6 + object SPRITE_LASS, $21, $a, FACE, UP, $9, LASS + $C8, $3 diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index 57b81ee2..fe00f5d1 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -11,10 +11,10 @@ Route4Object: ; 0x543b2 (size=58) db $7, $11, $5 ; Route4Text5 db $7, $1b, $6 ; Route4Text6 - db $3 ; people - db SPRITE_LASS, $8 + 4, $9 + 4, $fe, $0, $1 ; person - db SPRITE_LASS, $3 + 4, $3f + 4, $ff, $d3, TRAINER | $2, LASS + $C8, $4 - db SPRITE_BALL, $3 + 4, $39 + 4, $ff, $ff, ITEM | $3, TM_04 + db $3 ; objects + object SPRITE_LASS, $9, $8, WALK, $0, $1 ; person + object SPRITE_LASS, $3f, $3, FACE, LEFT, $2, LASS + $C8, $4 + object SPRITE_BALL, $39, $3, FACE, STAY, $3, TM_04 ; warp-to EVENT_DISP ROUTE_4_WIDTH, $5, $b ; MT_MOON_POKECENTER diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index c7481faa..d11f8417 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -11,7 +11,7 @@ Route5Object: ; 0x545a3 (size=47) db $1 ; signs db $1d, $11, $1 ; Route5Text1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP ROUTE_5_WIDTH, $1d, $a ; ROUTE_5_GATE diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index f71e3e64..0fda3988 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/route5gate.asm @@ -9,8 +9,8 @@ Route5GateObject: ; 0x1dffb (size=42) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $3 + 4, $1 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $1, $3, FACE, LEFT, $1 ; person ; warp-to EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $3 diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index b804f0d5..119eb4ec 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -10,13 +10,13 @@ Route6Object: ; 0x58022 (size=87) db $1 ; signs db $f, $13, $7 ; Route6Text7 - db $6 ; people - db SPRITE_BLACK_HAIR_BOY_1, $15 + 4, $a + 4, $ff, $d3, TRAINER | $1, JR__TRAINER_M + $C8, $4 - db SPRITE_LASS, $15 + 4, $b + 4, $ff, $d2, TRAINER | $2, JR__TRAINER_F + $C8, $2 - db SPRITE_BUG_CATCHER, $f + 4, $0 + 4, $ff, $d3, TRAINER | $3, BUG_CATCHER + $C8, $a - db SPRITE_BLACK_HAIR_BOY_1, $1f + 4, $b + 4, $ff, $d2, TRAINER | $4, JR__TRAINER_M + $C8, $5 - db SPRITE_LASS, $1e + 4, $b + 4, $ff, $d2, TRAINER | $5, JR__TRAINER_F + $C8, $3 - db SPRITE_BUG_CATCHER, $1a + 4, $13 + 4, $ff, $d2, TRAINER | $6, BUG_CATCHER + $C8, $b + db $6 ; objects + object SPRITE_BLACK_HAIR_BOY_1, $a, $15, FACE, LEFT, $1, JR__TRAINER_M + $C8, $4 + object SPRITE_LASS, $b, $15, FACE, RIGHT, $2, JR__TRAINER_F + $C8, $2 + object SPRITE_BUG_CATCHER, $0, $f, FACE, LEFT, $3, BUG_CATCHER + $C8, $a + object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, FACE, RIGHT, $4, JR__TRAINER_M + $C8, $5 + object SPRITE_LASS, $b, $1e, FACE, RIGHT, $5, JR__TRAINER_F + $C8, $3 + object SPRITE_BUG_CATCHER, $13, $1a, FACE, RIGHT, $6, BUG_CATCHER + $C8, $b ; warp-to EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index 068b1cc3..7f57bba2 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/route6gate.asm @@ -9,8 +9,8 @@ Route6GateObject: ; 0x1e0be (size=42) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $2 + 4, $6 + 4, $ff, $d2, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $6, $2, FACE, RIGHT, $1 ; person ; warp-to EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $3 diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index 43425a11..485a8694 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -11,7 +11,7 @@ Route7Object: ; 0x48022 (size=47) db $1 ; signs db $d, $3, $1 ; Route7Text1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP ROUTE_7_WIDTH, $9, $12 ; ROUTE_7_GATE diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 752b53f9..447b76dc 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -9,8 +9,8 @@ Route7GateObject: ; 0x1e185 (size=42) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $1 + 4, $3 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $3, $1, FACE, DOWN, $1 ; person ; warp-to EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $0 diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 2662adcd..10cbe179 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -11,16 +11,16 @@ Route8Object: ; 0x5814f (size=119) db $1 ; signs db $3, $11, $a ; Route8Text10 - db $9 ; people - db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $8 + 4, $ff, $d3, TRAINER | $1, SUPER_NERD + $C8, $3 - db SPRITE_GAMBLER, $9 + 4, $d + 4, $ff, $d1, TRAINER | $2, GAMBLER + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_2, $6 + 4, $2a + 4, $ff, $d1, TRAINER | $3, SUPER_NERD + $C8, $4 - db SPRITE_LASS, $3 + 4, $1a + 4, $ff, $d2, TRAINER | $4, LASS + $C8, $d - db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $1a + 4, $ff, $d3, TRAINER | $5, SUPER_NERD + $C8, $5 - db SPRITE_LASS, $5 + 4, $1a + 4, $ff, $d2, TRAINER | $6, LASS + $C8, $e - db SPRITE_LASS, $6 + 4, $1a + 4, $ff, $d3, TRAINER | $7, LASS + $C8, $f - db SPRITE_GAMBLER, $d + 4, $2e + 4, $ff, $d0, TRAINER | $8, GAMBLER + $C8, $7 - db SPRITE_LASS, $c + 4, $33 + 4, $ff, $d2, TRAINER | $9, LASS + $C8, $10 + db $9 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $8, $5, FACE, LEFT, $1, SUPER_NERD + $C8, $3 + object SPRITE_GAMBLER, $d, $9, FACE, UP, $2, GAMBLER + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_2, $2a, $6, FACE, UP, $3, SUPER_NERD + $C8, $4 + object SPRITE_LASS, $1a, $3, FACE, RIGHT, $4, LASS + $C8, $d + object SPRITE_BLACK_HAIR_BOY_2, $1a, $4, FACE, LEFT, $5, SUPER_NERD + $C8, $5 + object SPRITE_LASS, $1a, $5, FACE, RIGHT, $6, LASS + $C8, $e + object SPRITE_LASS, $1a, $6, FACE, LEFT, $7, LASS + $C8, $f + object SPRITE_GAMBLER, $2e, $d, FACE, DOWN, $8, GAMBLER + $C8, $7 + object SPRITE_LASS, $33, $c, FACE, RIGHT, $9, LASS + $C8, $10 ; warp-to EVENT_DISP ROUTE_8_WIDTH, $9, $1 ; ROUTE_8_GATE diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index c38eed26..fb9504dd 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -9,8 +9,8 @@ Route8GateObject: ; 0x1e247 (size=42) db $0 ; signs - db $1 ; people - db SPRITE_GUARD, $1 + 4, $2 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_GUARD, $2, $1, FACE, DOWN, $1 ; person ; warp-to EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $0 diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 32b89db4..a18ee9c7 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -6,14 +6,14 @@ Route9Object: ; 0x546a8 (size=86) db $1 ; signs db $7, $19, $b ; Route9Text11 - db $a ; people - db SPRITE_LASS, $a + 4, $d + 4, $ff, $d2, TRAINER | $1, JR__TRAINER_F + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $18 + 4, $ff, $d2, TRAINER | $2, JR__TRAINER_M + $C8, $7 - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $1f + 4, $ff, $d3, TRAINER | $3, JR__TRAINER_M + $C8, $8 - db SPRITE_LASS, $8 + 4, $30 + 4, $ff, $d3, TRAINER | $4, JR__TRAINER_F + $C8, $6 - db SPRITE_HIKER, $f + 4, $10 + 4, $ff, $d2, TRAINER | $5, HIKER + $C8, $b - db SPRITE_HIKER, $3 + 4, $2b + 4, $ff, $d2, TRAINER | $6, HIKER + $C8, $6 - db SPRITE_BUG_CATCHER, $2 + 4, $16 + 4, $ff, $d0, TRAINER | $7, BUG_CATCHER + $C8, $d - db SPRITE_HIKER, $f + 4, $2d + 4, $ff, $d3, TRAINER | $8, HIKER + $C8, $5 - db SPRITE_BUG_CATCHER, $8 + 4, $28 + 4, $ff, $d3, TRAINER | $9, BUG_CATCHER + $C8, $e - db SPRITE_BALL, $f + 4, $a + 4, $ff, $ff, ITEM | $a, TM_30 + db $a ; objects + object SPRITE_LASS, $d, $a, FACE, RIGHT, $1, JR__TRAINER_F + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_1, $18, $7, FACE, RIGHT, $2, JR__TRAINER_M + $C8, $7 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, FACE, LEFT, $3, JR__TRAINER_M + $C8, $8 + object SPRITE_LASS, $30, $8, FACE, LEFT, $4, JR__TRAINER_F + $C8, $6 + object SPRITE_HIKER, $10, $f, FACE, RIGHT, $5, HIKER + $C8, $b + object SPRITE_HIKER, $2b, $3, FACE, RIGHT, $6, HIKER + $C8, $6 + object SPRITE_BUG_CATCHER, $16, $2, FACE, DOWN, $7, BUG_CATCHER + $C8, $d + object SPRITE_HIKER, $2d, $f, FACE, LEFT, $8, HIKER + $C8, $5 + object SPRITE_BUG_CATCHER, $28, $8, FACE, LEFT, $9, BUG_CATCHER + $C8, $e + object SPRITE_BALL, $a, $f, FACE, STAY, $a, TM_30 diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index 8cb07350..5af8539e 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/safarizonecenter.asm @@ -16,8 +16,8 @@ SafariZoneCenterObject: ; 0x45bc5 (size=89) db $14, $12, $2 ; SafariZoneCenterText2 db $16, $e, $3 ; SafariZoneCenterText3 - db $1 ; people - db SPRITE_BALL, $a + 4, $e + 4, $ff, $ff, ITEM | $1, NUGGET + db $1 ; objects + object SPRITE_BALL, $e, $a, FACE, STAY, $1, NUGGET ; warp-to EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $e ; SAFARI_ZONE_ENTRANCE diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index 26aa1cc1..a02aa9b1 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/safarizoneeast.asm @@ -13,11 +13,11 @@ SafariZoneEastObject: ; 0x4588b (size=81) db $4, $6, $6 ; SafariZoneEastText6 db $17, $5, $7 ; SafariZoneEastText7 - db $4 ; people - db SPRITE_BALL, $a + 4, $15 + 4, $ff, $ff, ITEM | $1, FULL_RESTORE - db SPRITE_BALL, $7 + 4, $3 + 4, $ff, $ff, ITEM | $2, MAX_POTION - db SPRITE_BALL, $d + 4, $14 + 4, $ff, $ff, ITEM | $3, CARBOS - db SPRITE_BALL, $c + 4, $f + 4, $ff, $ff, ITEM | $4, TM_37 + db $4 ; objects + object SPRITE_BALL, $15, $a, FACE, STAY, $1, FULL_RESTORE + object SPRITE_BALL, $3, $7, FACE, STAY, $2, MAX_POTION + object SPRITE_BALL, $14, $d, FACE, STAY, $3, CARBOS + object SPRITE_BALL, $f, $c, FACE, STAY, $4, TM_37 ; warp-to EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $4, $0 ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index c252109c..2c06c6f6 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/safarizoneentrance.asm @@ -9,9 +9,9 @@ SafariZoneEntranceObject: ; 0x753f5 (size=48) db $0 ; signs - db $2 ; people - db SPRITE_WHITE_PLAYER, $2 + 4, $6 + 4, $ff, $d2, $1 ; person - db SPRITE_WHITE_PLAYER, $4 + 4, $1 + 4, $ff, $d3, $2 ; person + db $2 ; objects + object SPRITE_WHITE_PLAYER, $6, $2, FACE, RIGHT, $1 ; person + object SPRITE_WHITE_PLAYER, $1, $4, FACE, LEFT, $2 ; person ; warp-to EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $3 diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index 8c7a94f5..95a8dcc4 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -19,9 +19,9 @@ SafariZoneNorthObject: ; 0x459d5 (size=105) db $21, $13, $6 ; SafariZoneNorthText6 db $1c, $1a, $7 ; SafariZoneNorthText7 - db $2 ; people - db SPRITE_BALL, $1 + 4, $19 + 4, $ff, $ff, ITEM | $1, PROTEIN - db SPRITE_BALL, $7 + 4, $13 + 4, $ff, $ff, ITEM | $2, TM_40 + db $2 ; objects + object SPRITE_BALL, $19, $1, FACE, STAY, $1, PROTEIN + object SPRITE_BALL, $13, $7, FACE, STAY, $2, TM_40 ; warp-to EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $2 ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index 492f8f38..cd4b6e4c 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/safarizoneresthouse1.asm @@ -7,9 +7,9 @@ SafariZoneRestHouse1Object: ; 0x45cfe (size=32) db $0 ; signs - db $2 ; people - db SPRITE_GIRL, $2 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_OAK_AIDE, $4 + 4, $1 + 4, $fe, $1, $2 ; person + db $2 ; objects + object SPRITE_GIRL, $3, $2, FACE, DOWN, $1 ; person + object SPRITE_OAK_AIDE, $1, $4, WALK, $1, $2 ; person ; warp-to EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $2 ; SAFARI_ZONE_CENTER diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index f6918eed..55d3ea68 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -7,10 +7,10 @@ SafariZoneRestHouse2Object: ; 0x45d43 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_OAK_AIDE, $4 + 4, $4 + 4, $fe, $0, $1 ; person - db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $0 + 4, $ff, $d3, $2 ; person - db SPRITE_ERIKA, $2 + 4, $6 + 4, $ff, $d0, $3 ; person + db $3 ; objects + object SPRITE_OAK_AIDE, $4, $4, WALK, $0, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $0, $2, FACE, LEFT, $2 ; person + object SPRITE_ERIKA, $6, $2, FACE, DOWN, $3 ; person ; warp-to EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $2 ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index 70365365..af7265d5 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/safarizoneresthouse3.asm @@ -7,10 +7,10 @@ SafariZoneRestHouse3Object: ; 0x45d8e (size=38) db $0 ; signs - db $3 ; people - db SPRITE_OAK_AIDE, $3 + 4, $1 + 4, $fe, $1, $1 ; person - db SPRITE_ROCKER, $2 + 4, $4 + 4, $ff, $ff, $2 ; person - db SPRITE_LAPRAS_GIVER, $2 + 4, $5 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_OAK_AIDE, $1, $3, WALK, $1, $1 ; person + object SPRITE_ROCKER, $4, $2, FACE, STAY, $2 ; person + object SPRITE_LAPRAS_GIVER, $5, $2, FACE, STAY, $3 ; person ; warp-to EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $2 ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 53beef42..3b792914 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/safarizoneresthouse4.asm @@ -7,10 +7,10 @@ SafariZoneRestHouse4Object: ; 0x45dd9 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_OAK_AIDE, $3 + 4, $6 + 4, $fe, $2, $1 ; person - db SPRITE_WHITE_PLAYER, $4 + 4, $3 + 4, $ff, $ff, $2 ; person - db SPRITE_GENTLEMAN, $5 + 4, $1 + 4, $fe, $1, $3 ; person + db $3 ; objects + object SPRITE_OAK_AIDE, $6, $3, WALK, $2, $1 ; person + object SPRITE_WHITE_PLAYER, $3, $4, FACE, STAY, $2 ; person + object SPRITE_GENTLEMAN, $1, $5, WALK, $1, $3 ; person ; warp-to EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $2 ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index 79032c70..f630c58a 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -7,8 +7,8 @@ SafariZoneSecretHouseObject: ; 0x4a365 (size=26) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $3 + 4, $3 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $3, $3, FACE, DOWN, $1 ; person ; warp-to EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $2 ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index 4bfc7a4d..627ae65c 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/safarizonewest.asm @@ -17,11 +17,11 @@ SafariZoneWestObject: ; 0x4a1dc (size=108) db $4, $1a, $7 ; SafariZoneWestText7 db $16, $18, $8 ; SafariZoneWestText8 - db $4 ; people - db SPRITE_BALL, $14 + 4, $8 + 4, $ff, $ff, ITEM | $1, MAX_POTION - db SPRITE_BALL, $7 + 4, $9 + 4, $ff, $ff, ITEM | $2, TM_32 - db SPRITE_BALL, $12 + 4, $12 + 4, $ff, $ff, ITEM | $3, MAX_REVIVE - db SPRITE_BALL, $7 + 4, $13 + 4, $ff, $ff, ITEM | $4, GOLD_TEETH + db $4 ; objects + object SPRITE_BALL, $8, $14, FACE, STAY, $1, MAX_POTION + object SPRITE_BALL, $9, $7, FACE, STAY, $2, TM_32 + object SPRITE_BALL, $12, $12, FACE, STAY, $3, MAX_REVIVE + object SPRITE_BALL, $13, $7, FACE, STAY, $4, GOLD_TEETH ; warp-to EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $14 ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 5ec54aff..27de2811 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -23,22 +23,22 @@ SaffronCityObject: ; 0x509dc (size=188) db $1d, $1b, $18 ; SaffronCityText24 db $13, $1, $19 ; SaffronCityText25 - db $f ; people - db SPRITE_ROCKET, $6 + 4, $7 + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $8 + 4, $14 + 4, $fe, $2, $2 ; person - db SPRITE_ROCKET, $4 + 4, $22 + 4, $ff, $ff, $3 ; person - db SPRITE_ROCKET, $c + 4, $d + 4, $ff, $ff, $4 ; person - db SPRITE_ROCKET, $19 + 4, $b + 4, $fe, $2, $5 ; person - db SPRITE_ROCKET, $d + 4, $20 + 4, $fe, $2, $6 ; person - db SPRITE_ROCKET, $1e + 4, $12 + 4, $fe, $2, $7 ; person - db SPRITE_OAK_AIDE, $e + 4, $8 + 4, $fe, $0, $8 ; person - db SPRITE_LAPRAS_GIVER, $17 + 4, $17 + 4, $ff, $ff, $9 ; person - db SPRITE_ERIKA, $1e + 4, $11 + 4, $fe, $2, $a ; person - db SPRITE_GENTLEMAN, $c + 4, $1e + 4, $ff, $d0, $b ; person - db SPRITE_BIRD, $c + 4, $1f + 4, $ff, $d0, $c ; person - db SPRITE_ROCKER, $8 + 4, $12 + 4, $ff, $d1, $d ; person - db SPRITE_ROCKET, $16 + 4, $12 + 4, $ff, $d0, $e ; person - db SPRITE_ROCKET, $16 + 4, $13 + 4, $ff, $d0, $f ; person + db $f ; objects + object SPRITE_ROCKET, $7, $6, FACE, STAY, $1 ; person + object SPRITE_ROCKET, $14, $8, WALK, $2, $2 ; person + object SPRITE_ROCKET, $22, $4, FACE, STAY, $3 ; person + object SPRITE_ROCKET, $d, $c, FACE, STAY, $4 ; person + object SPRITE_ROCKET, $b, $19, WALK, $2, $5 ; person + object SPRITE_ROCKET, $20, $d, WALK, $2, $6 ; person + object SPRITE_ROCKET, $12, $1e, WALK, $2, $7 ; person + object SPRITE_OAK_AIDE, $8, $e, WALK, $0, $8 ; person + object SPRITE_LAPRAS_GIVER, $17, $17, FACE, STAY, $9 ; person + object SPRITE_ERIKA, $11, $1e, WALK, $2, $a ; person + object SPRITE_GENTLEMAN, $1e, $c, FACE, DOWN, $b ; person + object SPRITE_BIRD, $1f, $c, FACE, DOWN, $c ; person + object SPRITE_ROCKER, $12, $8, FACE, UP, $d ; person + object SPRITE_ROCKET, $12, $16, FACE, DOWN, $e ; person + object SPRITE_ROCKET, $13, $16, FACE, DOWN, $f ; person ; warp-to EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index eb85a89f..2e0ff092 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -37,16 +37,16 @@ SaffronGymObject: ; 0x5d259 (size=330) db $0 ; signs - db $9 ; people - db SPRITE_GIRL, $8 + 4, $9 + 4, $ff, $d0, TRAINER | $1, SABRINA + $C8, $1 - db SPRITE_MEDIUM, $1 + 4, $a + 4, $ff, $d0, TRAINER | $2, CHANNELER + $C8, $16 - db SPRITE_BUG_CATCHER, $1 + 4, $11 + 4, $ff, $d0, TRAINER | $3, PSYCHIC_TR + $C8, $1 - db SPRITE_MEDIUM, $7 + 4, $3 + 4, $ff, $d0, TRAINER | $4, CHANNELER + $C8, $17 - db SPRITE_BUG_CATCHER, $7 + 4, $11 + 4, $ff, $d0, TRAINER | $5, PSYCHIC_TR + $C8, $2 - db SPRITE_MEDIUM, $d + 4, $3 + 4, $ff, $d0, TRAINER | $6, CHANNELER + $C8, $18 - db SPRITE_BUG_CATCHER, $d + 4, $11 + 4, $ff, $d0, TRAINER | $7, PSYCHIC_TR + $C8, $3 - db SPRITE_BUG_CATCHER, $1 + 4, $3 + 4, $ff, $d0, TRAINER | $8, PSYCHIC_TR + $C8, $4 - db SPRITE_GYM_HELPER, $f + 4, $a + 4, $ff, $d0, $9 ; person + db $9 ; objects + object SPRITE_GIRL, $9, $8, FACE, DOWN, $1, SABRINA + $C8, $1 + object SPRITE_MEDIUM, $a, $1, FACE, DOWN, $2, CHANNELER + $C8, $16 + object SPRITE_BUG_CATCHER, $11, $1, FACE, DOWN, $3, PSYCHIC_TR + $C8, $1 + object SPRITE_MEDIUM, $3, $7, FACE, DOWN, $4, CHANNELER + $C8, $17 + object SPRITE_BUG_CATCHER, $11, $7, FACE, DOWN, $5, PSYCHIC_TR + $C8, $2 + object SPRITE_MEDIUM, $3, $d, FACE, DOWN, $6, CHANNELER + $C8, $18 + object SPRITE_BUG_CATCHER, $11, $d, FACE, DOWN, $7, PSYCHIC_TR + $C8, $3 + object SPRITE_BUG_CATCHER, $3, $1, FACE, DOWN, $8, PSYCHIC_TR + $C8, $4 + object SPRITE_GYM_HELPER, $a, $f, FACE, DOWN, $9 ; person ; warp-to EVENT_DISP SAFFRON_GYM_WIDTH, $11, $8 diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index 991caa7d..e1dbf1a9 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -7,11 +7,11 @@ SaffronHouse1Object: ; 0x1de04 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_BRUNETTE_GIRL, $3 + 4, $2 + 4, $ff, $d3, $1 ; person - db SPRITE_BIRD, $4 + 4, $0 + 4, $fe, $1, $2 ; person - db SPRITE_BUG_CATCHER, $1 + 4, $4 + 4, $ff, $d0, $3 ; person - db SPRITE_PAPER_SHEET, $3 + 4, $3 + 4, $ff, $ff, $4 ; person + db $4 ; objects + object SPRITE_BRUNETTE_GIRL, $2, $3, FACE, LEFT, $1 ; person + object SPRITE_BIRD, $0, $4, WALK, $1, $2 ; person + object SPRITE_BUG_CATCHER, $4, $1, FACE, DOWN, $3 ; person + object SPRITE_PAPER_SHEET, $3, $3, FACE, STAY, $4 ; person ; warp-to EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index e9b68e7c..2468af22 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/saffronhouse2.asm @@ -7,8 +7,8 @@ SaffronHouse2Object: ; 0x1de8a (size=26) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $3 + 4, $5 + 4, $ff, $d2, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $5, $3, FACE, RIGHT, $1 ; person ; warp-to EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index 30951c12..7d7c531f 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -7,10 +7,10 @@ SaffronMartObject: ; 0x5d41c (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $4 + 4, $ff, $ff, $2 ; person - db SPRITE_LASS, $5 + 4, $6 + 4, $fe, $0, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $2, FACE, STAY, $2 ; person + object SPRITE_LASS, $6, $5, WALK, $0, $3 ; person ; warp-to EVENT_DISP SAFFRON_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index 251aeea5..e6cf4468 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -7,11 +7,11 @@ SaffronPokecenterObject: ; 0x5d54f (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_FOULARD_WOMAN, $5 + 4, $5 + 4, $ff, $ff, $2 ; person - db SPRITE_GENTLEMAN, $3 + 4, $8 + 4, $ff, $d0, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_FOULARD_WOMAN, $5, $5, FACE, STAY, $2 ; person + object SPRITE_GENTLEMAN, $8, $3, FACE, DOWN, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index c26844a4..8433bb95 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -7,9 +7,9 @@ SchoolObject: ; 0x1d55d (size=32) db $0 ; signs - db $2 ; people - db SPRITE_BRUNETTE_GIRL, $5 + 4, $3 + 4, $ff, $d1, $1 ; person - db SPRITE_LASS, $1 + 4, $4 + 4, $ff, $d0, $2 ; person + db $2 ; objects + object SPRITE_BRUNETTE_GIRL, $3, $5, FACE, UP, $1 ; person + object SPRITE_LASS, $4, $1, FACE, DOWN, $2 ; person ; warp-to EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2 diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 62fc8320..fd872499 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -12,9 +12,9 @@ SeafoamIslands1Object: ; 0x4484f (size=72) db $0 ; signs - db $2 ; people - db SPRITE_BOULDER, $a + 4, $12 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person - db SPRITE_BOULDER, $7 + 4, $1a + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person + db $2 ; objects + object SPRITE_BOULDER, $12, $a, FACE, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $1a, $7, FACE, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $4 diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index 821a38cd..fc07bf64 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -12,9 +12,9 @@ SeafoamIslands2Object: ; 0x46376 (size=72) db $0 ; signs - db $2 ; people - db SPRITE_BOULDER, $6 + 4, $11 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person - db SPRITE_BOULDER, $6 + 4, $16 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person + db $2 ; objects + object SPRITE_BOULDER, $11, $6, FACE, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $16, $6, FACE, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3 diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index 0370805d..23ddbbc1 100755 --- a/data/mapObjects/seafoamislands3.asm +++ b/data/mapObjects/seafoamislands3.asm @@ -12,9 +12,9 @@ SeafoamIslands3Object: ; 0x464b2 (size=72) db $0 ; signs - db $2 ; people - db SPRITE_BOULDER, $6 + 4, $12 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person - db SPRITE_BOULDER, $6 + 4, $17 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person + db $2 ; objects + object SPRITE_BOULDER, $12, $6, FACE, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $17, $6, FACE, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $5 ; SEAFOAM_ISLANDS_2 diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index 3f1baa1d..56e208d9 100755 --- a/data/mapObjects/seafoamislands4.asm +++ b/data/mapObjects/seafoamislands4.asm @@ -12,13 +12,13 @@ SeafoamIslands4Object: ; 0x466a6 (size=96) db $0 ; signs - db $6 ; people - db SPRITE_BOULDER, $e + 4, $5 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person - db SPRITE_BOULDER, $f + 4, $3 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person - db SPRITE_BOULDER, $e + 4, $8 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $3 ; person - db SPRITE_BOULDER, $e + 4, $9 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $4 ; person - db SPRITE_BOULDER, $6 + 4, $12 + 4, $ff, $ff, $5 ; person - db SPRITE_BOULDER, $6 + 4, $13 + 4, $ff, $ff, $6 ; person + db $6 ; objects + object SPRITE_BOULDER, $5, $e, FACE, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $3, $f, FACE, BOULDER_MOVEMENT_BYTE_2, $2 ; person + object SPRITE_BOULDER, $8, $e, FACE, BOULDER_MOVEMENT_BYTE_2, $3 ; person + object SPRITE_BOULDER, $9, $e, FACE, BOULDER_MOVEMENT_BYTE_2, $4 ; person + object SPRITE_BOULDER, $12, $6, FACE, STAY, $5 ; person + object SPRITE_BOULDER, $13, $6, FACE, STAY, $6 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $c, $5 ; SEAFOAM_ISLANDS_3 diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index 6c207975..65b7fac9 100755 --- a/data/mapObjects/seafoamislands5.asm +++ b/data/mapObjects/seafoamislands5.asm @@ -11,10 +11,10 @@ SeafoamIslands5Object: ; 0x468bc (size=62) db $f, $9, $4 ; SeafoamIslands5Text4 db $1, $17, $5 ; SeafoamIslands5Text5 - db $3 ; people - db SPRITE_BOULDER, $f + 4, $4 + 4, $ff, $ff, $1 ; person - db SPRITE_BOULDER, $f + 4, $5 + 4, $ff, $ff, $2 ; person - db SPRITE_BIRD, $1 + 4, $6 + 4, $ff, $d0, TRAINER | $3, ARTICUNO, 50 + db $3 ; objects + object SPRITE_BOULDER, $4, $f, FACE, STAY, $1 ; person + object SPRITE_BOULDER, $5, $f, FACE, STAY, $2 ; person + object SPRITE_BIRD, $6, $1, FACE, DOWN, $3, ARTICUNO, 50 ; warp-to EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index 0d599ca6..2e177f35 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -10,8 +10,8 @@ SilphCo1Object: ; 0x5d470 (size=50) db $0 ; signs - db $1 ; people - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $4 + 4, $ff, $d0, $1 ; person + db $1 ; objects + object SPRITE_CABLE_CLUB_WOMAN, $4, $2, FACE, DOWN, $1 ; person ; warp-to EVENT_DISP SILPH_CO_1F_WIDTH, $11, $a diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index 5d253d98..a5e1f633 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -11,13 +11,13 @@ SilphCo10Object: ; 0x5a1fb (size=95) db $0 ; signs - db $6 ; people - db SPRITE_ROCKET, $9 + 4, $1 + 4, $ff, $d3, TRAINER | $1, ROCKET + $C8, $27 - db SPRITE_OAK_AIDE, $2 + 4, $a + 4, $ff, $d2, TRAINER | $2, SCIENTIST + $C8, $b - db SPRITE_ERIKA, $f + 4, $9 + 4, $fe, $0, $3 ; person - db SPRITE_BALL, $c + 4, $2 + 4, $ff, $ff, ITEM | $4, TM_26 - db SPRITE_BALL, $e + 4, $4 + 4, $ff, $ff, ITEM | $5, RARE_CANDY - db SPRITE_BALL, $b + 4, $5 + 4, $ff, $ff, ITEM | $6, CARBOS + db $6 ; objects + object SPRITE_ROCKET, $1, $9, FACE, LEFT, $1, ROCKET + $C8, $27 + object SPRITE_OAK_AIDE, $a, $2, FACE, RIGHT, $2, SCIENTIST + $C8, $b + object SPRITE_ERIKA, $9, $f, WALK, $0, $3 ; person + object SPRITE_BALL, $2, $c, FACE, STAY, $4, TM_26 + object SPRITE_BALL, $4, $e, FACE, STAY, $5, RARE_CANDY + object SPRITE_BALL, $5, $b, FACE, STAY, $6, CARBOS ; warp-to EVENT_DISP SILPH_CO_10F_WIDTH, $0, $8 ; SILPH_CO_9F diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index 93b9e339..ddab6d12 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -9,12 +9,12 @@ SilphCo11Object: ; 0x62380 (size=72) db $0 ; signs - db $5 ; people - db SPRITE_MR_MASTERBALL, $5 + 4, $7 + 4, $ff, $d0, $1 ; person - db SPRITE_FOULARD_WOMAN, $5 + 4, $a + 4, $ff, $d0, $2 ; person - db SPRITE_GIOVANNI, $9 + 4, $6 + 4, $ff, $d0, TRAINER | $3, GIOVANNI + $C8, $2 - db SPRITE_ROCKET, $10 + 4, $3 + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $29 - db SPRITE_ROCKET, $9 + 4, $f + 4, $ff, $d1, TRAINER | $5, ROCKET + $C8, $28 + db $5 ; objects + object SPRITE_MR_MASTERBALL, $7, $5, FACE, DOWN, $1 ; person + object SPRITE_FOULARD_WOMAN, $a, $5, FACE, DOWN, $2 ; person + object SPRITE_GIOVANNI, $6, $9, FACE, DOWN, $3, GIOVANNI + $C8, $2 + object SPRITE_ROCKET, $3, $10, FACE, UP, $4, ROCKET + $C8, $29 + object SPRITE_ROCKET, $f, $9, FACE, UP, $5, ROCKET + $C8, $28 ; warp-to EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index 5da4ccc5..918df25e 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -12,12 +12,12 @@ SilphCo2Object: ; 0x59e66 (size=98) db $0 ; signs - db $5 ; people - db SPRITE_ERIKA, $1 + 4, $a + 4, $ff, $d1, $1 ; person - db SPRITE_OAK_AIDE, $c + 4, $5 + 4, $ff, $d0, TRAINER | $2, SCIENTIST + $C8, $2 - db SPRITE_OAK_AIDE, $d + 4, $18 + 4, $ff, $d2, TRAINER | $3, SCIENTIST + $C8, $3 - db SPRITE_ROCKET, $b + 4, $10 + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $17 - db SPRITE_ROCKET, $7 + 4, $18 + 4, $ff, $d1, TRAINER | $5, ROCKET + $C8, $18 + db $5 ; objects + object SPRITE_ERIKA, $a, $1, FACE, UP, $1 ; person + object SPRITE_OAK_AIDE, $5, $c, FACE, DOWN, $2, SCIENTIST + $C8, $2 + object SPRITE_OAK_AIDE, $18, $d, FACE, RIGHT, $3, SCIENTIST + $C8, $3 + object SPRITE_ROCKET, $10, $b, FACE, UP, $4, ROCKET + $C8, $17 + object SPRITE_ROCKET, $18, $7, FACE, UP, $5, ROCKET + $C8, $18 ; warp-to EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index e50bf7cb..462e58a3 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -15,11 +15,11 @@ SilphCo3Object: ; 0x5a035 (size=113) db $0 ; signs - db $4 ; people - db SPRITE_LAPRAS_GIVER, $8 + 4, $18 + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $7 + 4, $14 + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $19 - db SPRITE_OAK_AIDE, $9 + 4, $7 + 4, $ff, $d0, TRAINER | $3, SCIENTIST + $C8, $4 - db SPRITE_BALL, $5 + 4, $8 + 4, $ff, $ff, ITEM | $4, HYPER_POTION + db $4 ; objects + object SPRITE_LAPRAS_GIVER, $18, $8, FACE, STAY, $1 ; person + object SPRITE_ROCKET, $14, $7, FACE, RIGHT, $2, ROCKET + $C8, $19 + object SPRITE_OAK_AIDE, $7, $9, FACE, DOWN, $3, SCIENTIST + $C8, $4 + object SPRITE_BALL, $8, $5, FACE, STAY, $4, HYPER_POTION ; warp-to EVENT_DISP SILPH_CO_3F_WIDTH, $0, $1a ; SILPH_CO_2F diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index bbd26292..a5eae9f0 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -12,14 +12,14 @@ SilphCo4Object: ; 0x19e35 (size=111) db $0 ; signs - db $7 ; people - db SPRITE_LAPRAS_GIVER, $2 + 4, $6 + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $e + 4, $9 + 4, $ff, $d3, TRAINER | $2, ROCKET + $C8, $1a - db SPRITE_OAK_AIDE, $6 + 4, $e + 4, $ff, $d2, TRAINER | $3, SCIENTIST + $C8, $5 - db SPRITE_ROCKET, $a + 4, $1a + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $1b - db SPRITE_BALL, $9 + 4, $3 + 4, $ff, $ff, ITEM | $5, FULL_HEAL - db SPRITE_BALL, $7 + 4, $4 + 4, $ff, $ff, ITEM | $6, MAX_REVIVE - db SPRITE_BALL, $8 + 4, $5 + 4, $ff, $ff, ITEM | $7, ESCAPE_ROPE + db $7 ; objects + object SPRITE_LAPRAS_GIVER, $6, $2, FACE, STAY, $1 ; person + object SPRITE_ROCKET, $9, $e, FACE, LEFT, $2, ROCKET + $C8, $1a + object SPRITE_OAK_AIDE, $e, $6, FACE, RIGHT, $3, SCIENTIST + $C8, $5 + object SPRITE_ROCKET, $1a, $a, FACE, UP, $4, ROCKET + $C8, $1b + object SPRITE_BALL, $3, $9, FACE, STAY, $5, FULL_HEAL + object SPRITE_BALL, $4, $7, FACE, STAY, $6, MAX_REVIVE + object SPRITE_BALL, $5, $8, FACE, STAY, $7, ESCAPE_ROPE ; warp-to EVENT_DISP SILPH_CO_4F_WIDTH, $0, $18 ; SILPH_CO_3F diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index 2a1cf258..215521ec 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -12,18 +12,18 @@ SilphCo5Object: ; 0x1a08d (size=137) db $0 ; signs - db $b ; people - db SPRITE_LAPRAS_GIVER, $9 + 4, $d + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $10 + 4, $8 + 4, $ff, $d3, TRAINER | $2, ROCKET + $C8, $1c - db SPRITE_OAK_AIDE, $3 + 4, $8 + 4, $ff, $d3, TRAINER | $3, SCIENTIST + $C8, $6 - db SPRITE_ROCKER, $a + 4, $12 + 4, $ff, $d1, TRAINER | $4, JUGGLER + $C8, $1 - db SPRITE_ROCKET, $4 + 4, $1c + 4, $ff, $d1, TRAINER | $5, ROCKET + $C8, $1d - db SPRITE_BALL, $d + 4, $2 + 4, $ff, $ff, ITEM | $6, TM_09 - db SPRITE_BALL, $6 + 4, $4 + 4, $ff, $ff, ITEM | $7, PROTEIN - db SPRITE_BALL, $10 + 4, $15 + 4, $ff, $ff, ITEM | $8, CARD_KEY - db SPRITE_CLIPBOARD, $c + 4, $16 + 4, $ff, $ff, $9 ; person - db SPRITE_CLIPBOARD, $a + 4, $19 + 4, $ff, $ff, $a ; person - db SPRITE_CLIPBOARD, $6 + 4, $18 + 4, $ff, $ff, $b ; person + db $b ; objects + object SPRITE_LAPRAS_GIVER, $d, $9, FACE, STAY, $1 ; person + object SPRITE_ROCKET, $8, $10, FACE, LEFT, $2, ROCKET + $C8, $1c + object SPRITE_OAK_AIDE, $8, $3, FACE, LEFT, $3, SCIENTIST + $C8, $6 + object SPRITE_ROCKER, $12, $a, FACE, UP, $4, JUGGLER + $C8, $1 + object SPRITE_ROCKET, $1c, $4, FACE, UP, $5, ROCKET + $C8, $1d + object SPRITE_BALL, $2, $d, FACE, STAY, $6, TM_09 + object SPRITE_BALL, $4, $6, FACE, STAY, $7, PROTEIN + object SPRITE_BALL, $15, $10, FACE, STAY, $8, CARD_KEY + object SPRITE_CLIPBOARD, $16, $c, FACE, STAY, $9 ; person + object SPRITE_CLIPBOARD, $19, $a, FACE, STAY, $a ; person + object SPRITE_CLIPBOARD, $18, $6, FACE, STAY, $b ; person ; warp-to EVENT_DISP SILPH_CO_5F_WIDTH, $0, $18 ; SILPH_CO_6F diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index b3e15af1..b3637c80 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -10,17 +10,17 @@ SilphCo6Object: ; 0x1a2fb (size=112) db $0 ; signs - db $a ; people - db SPRITE_LAPRAS_GIVER, $6 + 4, $a + 4, $ff, $ff, $1 ; person - db SPRITE_LAPRAS_GIVER, $6 + 4, $14 + 4, $ff, $ff, $2 ; person - db SPRITE_ERIKA, $6 + 4, $15 + 4, $ff, $d0, $3 ; person - db SPRITE_ERIKA, $a + 4, $b + 4, $ff, $d3, $4 ; person - db SPRITE_LAPRAS_GIVER, $d + 4, $12 + 4, $ff, $d1, $5 ; person - db SPRITE_ROCKET, $3 + 4, $11 + 4, $ff, $d3, TRAINER | $6, ROCKET + $C8, $1e - db SPRITE_OAK_AIDE, $8 + 4, $7 + 4, $ff, $d0, TRAINER | $7, SCIENTIST + $C8, $7 - db SPRITE_ROCKET, $f + 4, $e + 4, $ff, $d2, TRAINER | $8, ROCKET + $C8, $1f - db SPRITE_BALL, $c + 4, $3 + 4, $ff, $ff, ITEM | $9, HP_UP - db SPRITE_BALL, $f + 4, $2 + 4, $ff, $ff, ITEM | $a, X_ACCURACY + db $a ; objects + object SPRITE_LAPRAS_GIVER, $a, $6, FACE, STAY, $1 ; person + object SPRITE_LAPRAS_GIVER, $14, $6, FACE, STAY, $2 ; person + object SPRITE_ERIKA, $15, $6, FACE, DOWN, $3 ; person + object SPRITE_ERIKA, $b, $a, FACE, LEFT, $4 ; person + object SPRITE_LAPRAS_GIVER, $12, $d, FACE, UP, $5 ; person + object SPRITE_ROCKET, $11, $3, FACE, LEFT, $6, ROCKET + $C8, $1e + object SPRITE_OAK_AIDE, $7, $8, FACE, DOWN, $7, SCIENTIST + $C8, $7 + object SPRITE_ROCKET, $e, $f, FACE, RIGHT, $8, ROCKET + $C8, $1f + object SPRITE_BALL, $3, $c, FACE, STAY, $9, HP_UP + object SPRITE_BALL, $2, $f, FACE, STAY, $a, X_ACCURACY ; warp-to EVENT_DISP SILPH_CO_6F_WIDTH, $0, $10 ; SILPH_CO_7F diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index fe435bb0..b4e387b8 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -11,18 +11,18 @@ SilphCo7Object: ; 0x51ed7 (size=128) db $0 ; signs - db $b ; people - db SPRITE_LAPRAS_GIVER, $5 + 4, $1 + 4, $ff, $ff, $1 ; person - db SPRITE_LAPRAS_GIVER, $d + 4, $d + 4, $ff, $d1, $2 ; person - db SPRITE_LAPRAS_GIVER, $a + 4, $7 + 4, $ff, $ff, $3 ; person - db SPRITE_ERIKA, $8 + 4, $a + 4, $ff, $ff, $4 ; person - db SPRITE_ROCKET, $1 + 4, $d + 4, $ff, $d0, TRAINER | $5, ROCKET + $C8, $20 - db SPRITE_OAK_AIDE, $d + 4, $2 + 4, $ff, $d0, TRAINER | $6, SCIENTIST + $C8, $8 - db SPRITE_ROCKET, $2 + 4, $14 + 4, $ff, $d2, TRAINER | $7, ROCKET + $C8, $21 - db SPRITE_ROCKET, $e + 4, $13 + 4, $ff, $d3, TRAINER | $8, ROCKET + $C8, $22 - db SPRITE_BLUE, $7 + 4, $3 + 4, $ff, $d1, $9 ; person - db SPRITE_BALL, $9 + 4, $1 + 4, $ff, $ff, ITEM | $a, CALCIUM - db SPRITE_BALL, $b + 4, $18 + 4, $ff, $ff, ITEM | $b, TM_03 + db $b ; objects + object SPRITE_LAPRAS_GIVER, $1, $5, FACE, STAY, $1 ; person + object SPRITE_LAPRAS_GIVER, $d, $d, FACE, UP, $2 ; person + object SPRITE_LAPRAS_GIVER, $7, $a, FACE, STAY, $3 ; person + object SPRITE_ERIKA, $a, $8, FACE, STAY, $4 ; person + object SPRITE_ROCKET, $d, $1, FACE, DOWN, $5, ROCKET + $C8, $20 + object SPRITE_OAK_AIDE, $2, $d, FACE, DOWN, $6, SCIENTIST + $C8, $8 + object SPRITE_ROCKET, $14, $2, FACE, RIGHT, $7, ROCKET + $C8, $21 + object SPRITE_ROCKET, $13, $e, FACE, LEFT, $8, ROCKET + $C8, $22 + object SPRITE_BLUE, $3, $7, FACE, UP, $9 ; person + object SPRITE_BALL, $1, $9, FACE, STAY, $a, CALCIUM + object SPRITE_BALL, $18, $b, FACE, STAY, $b, TM_03 ; warp-to EVENT_DISP SILPH_CO_7F_WIDTH, $0, $10 ; SILPH_CO_8F diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index be802791..7aaf3c1a 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -12,11 +12,11 @@ SilphCo8Object: ; 0x56613 (size=90) db $0 ; signs - db $4 ; people - db SPRITE_LAPRAS_GIVER, $2 + 4, $4 + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $2 + 4, $13 + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $23 - db SPRITE_OAK_AIDE, $2 + 4, $a + 4, $ff, $d0, TRAINER | $3, SCIENTIST + $C8, $9 - db SPRITE_ROCKET, $f + 4, $c + 4, $ff, $d3, TRAINER | $4, ROCKET + $C8, $24 + db $4 ; objects + object SPRITE_LAPRAS_GIVER, $4, $2, FACE, STAY, $1 ; person + object SPRITE_ROCKET, $13, $2, FACE, RIGHT, $2, ROCKET + $C8, $23 + object SPRITE_OAK_AIDE, $a, $2, FACE, DOWN, $3, SCIENTIST + $C8, $9 + object SPRITE_ROCKET, $c, $f, FACE, LEFT, $4, ROCKET + $C8, $24 ; warp-to EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index 2ebaa8df..a73b42fd 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -10,11 +10,11 @@ SilphCo9Object: ; 0x5d93f (size=74) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $e + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_ROCKET, $4 + 4, $2 + 4, $ff, $d1, TRAINER | $2, ROCKET + $C8, $25 - db SPRITE_OAK_AIDE, $d + 4, $15 + 4, $ff, $d0, TRAINER | $3, SCIENTIST + $C8, $a - db SPRITE_ROCKET, $10 + 4, $d + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $26 + db $4 ; objects + object SPRITE_NURSE, $3, $e, FACE, DOWN, $1 ; person + object SPRITE_ROCKET, $2, $4, FACE, UP, $2, ROCKET + $C8, $25 + object SPRITE_OAK_AIDE, $15, $d, FACE, DOWN, $3, SCIENTIST + $C8, $a + object SPRITE_ROCKET, $d, $10, FACE, UP, $4, ROCKET + $C8, $26 ; warp-to EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/silphcoelevator.asm index ced554eb..0e0f03c6 100755 --- a/data/mapObjects/silphcoelevator.asm +++ b/data/mapObjects/silphcoelevator.asm @@ -8,7 +8,7 @@ SilphCoElevatorObject: ; 0x45844 (size=23) db $1 ; signs db $0, $3, $1 ; SilphCoElevatorText1 - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP SILPH_CO_ELEVATOR_WIDTH, $3, $1 diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index a1688f5c..d3e10966 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -16,9 +16,9 @@ SSAnne1Object: ; 0x61277 (size=104) db $0 ; signs - db $2 ; people - db SPRITE_WAITER, $6 + 4, $c + 4, $fe, $2, $1 ; person - db SPRITE_SAILOR, $5 + 4, $1b + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_WAITER, $c, $6, WALK, $2, $1 ; person + object SPRITE_SAILOR, $1b, $5, FACE, STAY, $2 ; person ; warp-to EVENT_DISP SS_ANNE_1_WIDTH, $0, $1a ; VERMILION_DOCK diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index b98f734f..1d1f4377 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -15,18 +15,18 @@ SSAnne10Object: ; 0x61e75 (size=165) db $0 ; signs - db $b ; people - db SPRITE_SAILOR, $d + 4, $0 + 4, $ff, $d0, TRAINER | $1, SAILOR + $C8, $3 - db SPRITE_SAILOR, $b + 4, $2 + 4, $ff, $d0, TRAINER | $2, SAILOR + $C8, $4 - db SPRITE_SAILOR, $3 + 4, $c + 4, $ff, $d2, TRAINER | $3, SAILOR + $C8, $5 - db SPRITE_SAILOR, $2 + 4, $16 + 4, $ff, $d0, TRAINER | $4, SAILOR + $C8, $6 - db SPRITE_SAILOR, $2 + 4, $0 + 4, $ff, $d3, TRAINER | $5, SAILOR + $C8, $7 - db SPRITE_FISHER2, $4 + 4, $0 + 4, $ff, $d3, TRAINER | $6, FISHER + $C8, $2 - db SPRITE_BLACK_HAIR_BOY_2, $d + 4, $a + 4, $ff, $d3, $7 ; person - db SPRITE_SLOWBRO, $c + 4, $b + 4, $ff, $ff, $8 ; person - db SPRITE_BALL, $2 + 4, $14 + 4, $ff, $ff, ITEM | $9, ETHER - db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, ITEM | $a, TM_44 - db SPRITE_BALL, $b + 4, $c + 4, $ff, $ff, ITEM | $b, MAX_POTION + db $b ; objects + object SPRITE_SAILOR, $0, $d, FACE, DOWN, $1, SAILOR + $C8, $3 + object SPRITE_SAILOR, $2, $b, FACE, DOWN, $2, SAILOR + $C8, $4 + object SPRITE_SAILOR, $c, $3, FACE, RIGHT, $3, SAILOR + $C8, $5 + object SPRITE_SAILOR, $16, $2, FACE, DOWN, $4, SAILOR + $C8, $6 + object SPRITE_SAILOR, $0, $2, FACE, LEFT, $5, SAILOR + $C8, $7 + object SPRITE_FISHER2, $0, $4, FACE, LEFT, $6, FISHER + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_2, $a, $d, FACE, LEFT, $7 ; person + object SPRITE_SLOWBRO, $b, $c, FACE, STAY, $8 ; person + object SPRITE_BALL, $14, $2, FACE, STAY, $9, ETHER + object SPRITE_BALL, $a, $2, FACE, STAY, $a, TM_44 + object SPRITE_BALL, $c, $b, FACE, STAY, $b, MAX_POTION ; warp-to EVENT_DISP SS_ANNE_10_WIDTH, $5, $2 ; SS_ANNE_4 diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index 3f756c31..73397712 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -14,9 +14,9 @@ SSAnne2Object: ; 0x61514 (size=90) db $0 ; signs - db $2 ; people - db SPRITE_WAITER, $7 + 4, $3 + 4, $fe, $1, $1 ; person - db SPRITE_BLUE, $4 + 4, $24 + 4, $ff, $d0, TRAINER | $2, SONY1 + $C8, $1 + db $2 ; objects + object SPRITE_WAITER, $3, $7, WALK, $1, $1 ; person + object SPRITE_BLUE, $24, $4, FACE, DOWN, $2, SONY1 + $C8, $1 ; warp-to EVENT_DISP SS_ANNE_2_WIDTH, $b, $9 ; SS_ANNE_9 diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm index 2068304d..1037d118 100755 --- a/data/mapObjects/ssanne3.asm +++ b/data/mapObjects/ssanne3.asm @@ -7,8 +7,8 @@ SSAnne3Object: ; 0x4493c (size=26) db $0 ; signs - db $1 ; people - db SPRITE_SAILOR, $3 + 4, $9 + 4, $fe, $2, $1 ; person + db $1 ; objects + object SPRITE_SAILOR, $9, $3, WALK, $2, $1 ; person ; warp-to EVENT_DISP SS_ANNE_3_WIDTH, $3, $0 ; SS_ANNE_5 diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm index a2abc2cf..9d752480 100755 --- a/data/mapObjects/ssanne4.asm +++ b/data/mapObjects/ssanne4.asm @@ -11,7 +11,7 @@ SSAnne4Object: ; 0x61632 (size=52) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP SS_ANNE_4_WIDTH, $3, $17 ; SS_ANNE_10 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index 88b2b5b7..3787467d 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -7,12 +7,12 @@ SSAnne5Object: ; 0x6172b (size=54) db $0 ; signs - db $5 ; people - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $5 + 4, $ff, $d1, $1 ; person - db SPRITE_SAILOR, $9 + 4, $4 + 4, $ff, $ff, $2 ; person - db SPRITE_BLACK_HAIR_BOY_1, $b + 4, $7 + 4, $ff, $ff, $3 ; person - db SPRITE_SAILOR, $4 + 4, $4 + 4, $ff, $d0, TRAINER | $4, SAILOR + $C8, $1 - db SPRITE_SAILOR, $8 + 4, $a + 4, $ff, $d1, TRAINER | $5, SAILOR + $C8, $2 + db $5 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $5, $2, FACE, UP, $1 ; person + object SPRITE_SAILOR, $4, $9, FACE, STAY, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $7, $b, FACE, STAY, $3 ; person + object SPRITE_SAILOR, $4, $4, FACE, DOWN, $4, SAILOR + $C8, $1 + object SPRITE_SAILOR, $a, $8, FACE, UP, $5, SAILOR + $C8, $2 ; warp-to EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3 diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 7724ab5c..659409dd 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -6,14 +6,14 @@ SSAnne6Object: ; 0x6181b (size=54) db $0 ; signs - db $7 ; people - db SPRITE_COOK, $8 + 4, $1 + 4, $fe, $1, $1 ; person - db SPRITE_COOK, $8 + 4, $5 + 4, $fe, $1, $2 ; person - db SPRITE_COOK, $7 + 4, $9 + 4, $fe, $1, $3 ; person - db SPRITE_COOK, $6 + 4, $d + 4, $ff, $ff, $4 ; person - db SPRITE_COOK, $8 + 4, $d + 4, $ff, $ff, $5 ; person - db SPRITE_COOK, $a + 4, $d + 4, $ff, $ff, $6 ; person - db SPRITE_COOK, $d + 4, $b + 4, $ff, $d1, $7 ; person + db $7 ; objects + object SPRITE_COOK, $1, $8, WALK, $1, $1 ; person + object SPRITE_COOK, $5, $8, WALK, $1, $2 ; person + object SPRITE_COOK, $9, $7, WALK, $1, $3 ; person + object SPRITE_COOK, $d, $6, FACE, STAY, $4 ; person + object SPRITE_COOK, $d, $8, FACE, STAY, $5 ; person + object SPRITE_COOK, $d, $a, FACE, STAY, $6 ; person + object SPRITE_COOK, $b, $d, FACE, UP, $7 ; person ; warp-to EVENT_DISP SS_ANNE_6_WIDTH, $0, $6 ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index c40bcfec..ddd05959 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -8,8 +8,8 @@ SSAnne7Object: ; 0x61946 (size=24) db $1, $4, $2 ; SSAnne7Text2 db $2, $1, $3 ; SSAnne7Text3 - db $1 ; people - db SPRITE_SS_CAPTAIN, $2 + 4, $4 + 4, $ff, $d1, $1 ; person + db $1 ; objects + object SPRITE_SS_CAPTAIN, $4, $2, FACE, UP, $1 ; person ; warp-to EVENT_DISP SS_ANNE_7_WIDTH, $7, $0 ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index e2df8fa9..92d784cb 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -11,18 +11,18 @@ SSAnne8Object: ; 0x61a60 (size=127) db $0 ; signs - db $b ; people - db SPRITE_GENTLEMAN, $3 + 4, $2 + 4, $ff, $d2, TRAINER | $1, GENTLEMAN + $C8, $1 - db SPRITE_GENTLEMAN, $4 + 4, $b + 4, $ff, $d1, TRAINER | $2, GENTLEMAN + $C8, $2 - db SPRITE_BUG_CATCHER, $e + 4, $b + 4, $ff, $d1, TRAINER | $3, YOUNGSTER + $C8, $8 - db SPRITE_LASS, $b + 4, $d + 4, $ff, $d2, TRAINER | $4, LASS + $C8, $b - db SPRITE_GIRL, $3 + 4, $16 + 4, $fe, $1, $5 ; person - db SPRITE_FAT_BALD_GUY, $e + 4, $0 + 4, $ff, $ff, $6 ; person - db SPRITE_LITTLE_GIRL, $b + 4, $2 + 4, $ff, $d0, $7 ; person - db SPRITE_CLEFAIRY, $b + 4, $3 + 4, $ff, $d0, $8 ; person - db SPRITE_GIRL, $d + 4, $a + 4, $ff, $d3, $9 ; person - db SPRITE_BALL, $f + 4, $c + 4, $ff, $ff, ITEM | $a, TM_08 - db SPRITE_GENTLEMAN, $d + 4, $15 + 4, $fe, $2, $b ; person + db $b ; objects + object SPRITE_GENTLEMAN, $2, $3, FACE, RIGHT, $1, GENTLEMAN + $C8, $1 + object SPRITE_GENTLEMAN, $b, $4, FACE, UP, $2, GENTLEMAN + $C8, $2 + object SPRITE_BUG_CATCHER, $b, $e, FACE, UP, $3, YOUNGSTER + $C8, $8 + object SPRITE_LASS, $d, $b, FACE, RIGHT, $4, LASS + $C8, $b + object SPRITE_GIRL, $16, $3, WALK, $1, $5 ; person + object SPRITE_FAT_BALD_GUY, $0, $e, FACE, STAY, $6 ; person + object SPRITE_LITTLE_GIRL, $2, $b, FACE, DOWN, $7 ; person + object SPRITE_CLEFAIRY, $3, $b, FACE, DOWN, $8 ; person + object SPRITE_GIRL, $a, $d, FACE, LEFT, $9 ; person + object SPRITE_BALL, $c, $f, FACE, STAY, $a, TM_08 + object SPRITE_GENTLEMAN, $15, $d, WALK, $2, $b ; person ; warp-to EVENT_DISP SS_ANNE_8_WIDTH, $0, $0 ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index a621ad9f..cec21d1b 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -17,20 +17,20 @@ SSAnne9Object: ; 0x61c8d (size=188) db $0 ; signs - db $d ; people - db SPRITE_GENTLEMAN, $2 + 4, $a + 4, $ff, $d3, TRAINER | $1, GENTLEMAN + $C8, $3 - db SPRITE_FISHER2, $4 + 4, $d + 4, $ff, $d2, TRAINER | $2, FISHER + $C8, $1 - db SPRITE_GENTLEMAN, $e + 4, $0 + 4, $ff, $d3, TRAINER | $3, GENTLEMAN + $C8, $5 - db SPRITE_LASS, $b + 4, $2 + 4, $ff, $d0, TRAINER | $4, LASS + $C8, $c - db SPRITE_GENTLEMAN, $2 + 4, $1 + 4, $ff, $d0, $5 ; person - db SPRITE_BALL, $1 + 4, $c + 4, $ff, $ff, ITEM | $6, MAX_ETHER - db SPRITE_GENTLEMAN, $2 + 4, $15 + 4, $ff, $d0, $7 ; person - db SPRITE_OLD_PERSON, $1 + 4, $16 + 4, $ff, $d0, $8 ; person - db SPRITE_BALL, $c + 4, $0 + 4, $ff, $ff, ITEM | $9, RARE_CANDY - db SPRITE_GENTLEMAN, $c + 4, $c + 4, $ff, $d0, $a ; person - db SPRITE_YOUNG_BOY, $e + 4, $b + 4, $ff, $ff, $b ; person - db SPRITE_BRUNETTE_GIRL, $c + 4, $16 + 4, $ff, $d2, $c ; person - db SPRITE_FOULARD_WOMAN, $c + 4, $14 + 4, $ff, $d3, $d ; person + db $d ; objects + object SPRITE_GENTLEMAN, $a, $2, FACE, LEFT, $1, GENTLEMAN + $C8, $3 + object SPRITE_FISHER2, $d, $4, FACE, RIGHT, $2, FISHER + $C8, $1 + object SPRITE_GENTLEMAN, $0, $e, FACE, LEFT, $3, GENTLEMAN + $C8, $5 + object SPRITE_LASS, $2, $b, FACE, DOWN, $4, LASS + $C8, $c + object SPRITE_GENTLEMAN, $1, $2, FACE, DOWN, $5 ; person + object SPRITE_BALL, $c, $1, FACE, STAY, $6, MAX_ETHER + object SPRITE_GENTLEMAN, $15, $2, FACE, DOWN, $7 ; person + object SPRITE_OLD_PERSON, $16, $1, FACE, DOWN, $8 ; person + object SPRITE_BALL, $0, $c, FACE, STAY, $9, RARE_CANDY + object SPRITE_GENTLEMAN, $c, $c, FACE, DOWN, $a ; person + object SPRITE_YOUNG_BOY, $b, $e, FACE, STAY, $b ; person + object SPRITE_BRUNETTE_GIRL, $16, $c, FACE, RIGHT, $c ; person + object SPRITE_FOULARD_WOMAN, $14, $c, FACE, LEFT, $d ; person ; warp-to EVENT_DISP SS_ANNE_9_WIDTH, $5, $2 ; SS_ANNE_2 diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm index 3afdf48e..ff6fc5e3 100755 --- a/data/mapObjects/tradecenter.asm +++ b/data/mapObjects/tradecenter.asm @@ -5,5 +5,5 @@ TradeCenterObject: ; 0x4fd53 (size=10) db $0 ; signs - db $1 ; people - db SPRITE_RED, $2 + 4, $2 + 4, $ff, $0, $1 ; person + db $1 ; objects + object SPRITE_RED, $2, $2, $ff, $0, $1 ; person diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index f782636c..c5b81715 100755 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ b/data/mapObjects/undergroundpathentranceroute5.asm @@ -8,8 +8,8 @@ UndergroundPathEntranceRoute5Object: ; 0x5d6c1 (size=34) db $0 ; signs - db $1 ; people - db SPRITE_LITTLE_GIRL, $3 + 4, $2 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_LITTLE_GIRL, $2, $3, FACE, STAY, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index 624381a9..b64f928b 100755 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ b/data/mapObjects/undergroundpathentranceroute6.asm @@ -8,8 +8,8 @@ UndergroundPathEntranceRoute6Object: ; 0x5d6fe (size=34) db $0 ; signs - db $1 ; people - db SPRITE_GIRL, $3 + 4, $2 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GIRL, $2, $3, FACE, STAY, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index d0e51c8a..a0e4d867 100755 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ b/data/mapObjects/undergroundpathentranceroute7.asm @@ -8,8 +8,8 @@ UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34) db $0 ; signs - db $1 ; people - db SPRITE_FAT_BALD_GUY, $4 + 4, $2 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_FAT_BALD_GUY, $2, $4, FACE, STAY, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index 53972ce9..cd87acbd 100755 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ b/data/mapObjects/undergroundpathentranceroute7copy.asm @@ -8,9 +8,9 @@ UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787) db $0 ; signs - db $2 ; people - db SPRITE_GIRL, $2 + 4, $3 + 4, $ff, $ff, $1 ; person - db SPRITE_FAT_BALD_GUY, $4 + 4, $2 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_GIRL, $3, $2, FACE, STAY, $1 ; person + object SPRITE_FAT_BALD_GUY, $2, $4, FACE, STAY, $2 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index a59e017b..e3558a15 100755 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ b/data/mapObjects/undergroundpathentranceroute8.asm @@ -8,8 +8,8 @@ UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34) db $0 ; signs - db $1 ; people - db SPRITE_GIRL, $4 + 4, $3 + 4, $ff, $ff, $1 ; person + db $1 ; objects + object SPRITE_GIRL, $3, $4, FACE, STAY, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm index 7dac9b95..d9ae7499 100755 --- a/data/mapObjects/undergroundpathns.asm +++ b/data/mapObjects/undergroundpathns.asm @@ -7,7 +7,7 @@ UndergroundPathNSObject: ; 0x61f2a (size=20) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP UNDERGROUND_PATH_NS_WIDTH, $4, $5 ; PATH_ENTRANCE_ROUTE_5 diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm index ad3c51f7..303f60b9 100755 --- a/data/mapObjects/undergroundpathwe.asm +++ b/data/mapObjects/undergroundpathwe.asm @@ -7,7 +7,7 @@ UndergroundPathWEObject: ; 0x61f4e (size=20) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $5, $2 ; PATH_ENTRANCE_ROUTE_7 diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index e5dbe1c3..47d4fc49 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -14,10 +14,10 @@ UnknownDungeon1Object: ; 0x74d15 (size=97) db $0 ; signs - db $3 ; people - db SPRITE_BALL, $d + 4, $7 + 4, $ff, $ff, ITEM | $1, FULL_RESTORE - db SPRITE_BALL, $3 + 4, $13 + 4, $ff, $ff, ITEM | $2, MAX_ELIXER - db SPRITE_BALL, $0 + 4, $5 + 4, $ff, $ff, ITEM | $3, NUGGET + db $3 ; objects + object SPRITE_BALL, $7, $d, FACE, STAY, $1, FULL_RESTORE + object SPRITE_BALL, $13, $3, FACE, STAY, $2, MAX_ELIXER + object SPRITE_BALL, $5, $0, FACE, STAY, $3, NUGGET ; warp-to EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index 997198b5..9ce00fbc 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -11,10 +11,10 @@ UnknownDungeon2Object: ; 0x45e14 (size=73) db $0 ; signs - db $3 ; people - db SPRITE_BALL, $9 + 4, $1d + 4, $ff, $ff, ITEM | $1, PP_UP - db SPRITE_BALL, $f + 4, $4 + 4, $ff, $ff, ITEM | $2, ULTRA_BALL - db SPRITE_BALL, $6 + 4, $d + 4, $ff, $ff, ITEM | $3, FULL_RESTORE + db $3 ; objects + object SPRITE_BALL, $1d, $9, FACE, STAY, $1, PP_UP + object SPRITE_BALL, $4, $f, FACE, STAY, $2, ULTRA_BALL + object SPRITE_BALL, $d, $6, FACE, STAY, $3, FULL_RESTORE ; warp-to EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index a3fba264..c8dca6a8 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -6,10 +6,10 @@ UnknownDungeon3Object: ; 0x45f36 (size=34) db $0 ; signs - db $3 ; people - db SPRITE_SLOWBRO, $d + 4, $1b + 4, $ff, $d0, TRAINER | $1, MEWTWO, 70 - db SPRITE_BALL, $9 + 4, $10 + 4, $ff, $ff, ITEM | $2, ULTRA_BALL - db SPRITE_BALL, $1 + 4, $12 + 4, $ff, $ff, ITEM | $3, MAX_REVIVE + db $3 ; objects + object SPRITE_SLOWBRO, $1b, $d, FACE, DOWN, $1, MEWTWO, 70 + object SPRITE_BALL, $10, $9, FACE, STAY, $2, ULTRA_BALL + object SPRITE_BALL, $12, $1, FACE, STAY, $3, MAX_REVIVE ; warp-to EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index a7a6a6b4..b8ec91d4 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -21,13 +21,13 @@ VermilionCityObject: ; 0x189ba (size=133) db $13, $7, $c ; VermilionCityText12 db $f, $1d, $d ; VermilionCityText13 - db $6 ; people - db SPRITE_FOULARD_WOMAN, $7 + 4, $13 + 4, $fe, $2, $1 ; person - db SPRITE_GAMBLER, $6 + 4, $e + 4, $ff, $ff, $2 ; person - db SPRITE_SAILOR, $1e + 4, $13 + 4, $ff, $d1, $3 ; person - db SPRITE_GAMBLER, $7 + 4, $1e + 4, $ff, $ff, $4 ; person - db SPRITE_SLOWBRO, $9 + 4, $1d + 4, $fe, $1, $5 ; person - db SPRITE_SAILOR, $1b + 4, $19 + 4, $fe, $2, $6 ; person + db $6 ; objects + object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person + object SPRITE_GAMBLER, $e, $6, FACE, STAY, $2 ; person + object SPRITE_SAILOR, $13, $1e, FACE, UP, $3 ; person + object SPRITE_GAMBLER, $1e, $7, FACE, STAY, $4 ; person + object SPRITE_SLOWBRO, $1d, $9, WALK, $1, $5 ; person + object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person ; warp-to EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm index 4c49e966..b8aa659d 100755 --- a/data/mapObjects/vermiliondock.asm +++ b/data/mapObjects/vermiliondock.asm @@ -7,7 +7,7 @@ VermilionDockObject: ; 0x1dcc6 (size=20) db $0 ; signs - db $0 ; people + db $0 ; objects ; warp-to EVENT_DISP VERMILION_DOCK_WIDTH, $0, $e diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index 30787405..d98bc854 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -7,12 +7,12 @@ VermilionGymObject: ; 0x5cbfe (size=58) db $0 ; signs - db $5 ; people - db SPRITE_ROCKER, $1 + 4, $5 + 4, $ff, $d0, TRAINER | $1, LT__SURGE + $C8, $1 - db SPRITE_GENTLEMAN, $6 + 4, $9 + 4, $ff, $d2, TRAINER | $2, GENTLEMAN + $C8, $3 - db SPRITE_BLACK_HAIR_BOY_2, $8 + 4, $3 + 4, $ff, $d2, TRAINER | $3, ROCKER + $C8, $1 - db SPRITE_SAILOR, $a + 4, $0 + 4, $ff, $d3, TRAINER | $4, SAILOR + $C8, $8 - db SPRITE_GYM_HELPER, $e + 4, $4 + 4, $ff, $d0, $5 ; person + db $5 ; objects + object SPRITE_ROCKER, $5, $1, FACE, DOWN, $1, LT__SURGE + $C8, $1 + object SPRITE_GENTLEMAN, $9, $6, FACE, RIGHT, $2, GENTLEMAN + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_2, $3, $8, FACE, RIGHT, $3, ROCKER + $C8, $1 + object SPRITE_SAILOR, $0, $a, FACE, LEFT, $4, SAILOR + $C8, $8 + object SPRITE_GYM_HELPER, $4, $e, FACE, DOWN, $5 ; person ; warp-to EVENT_DISP VERMILION_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index e6104944..2e8ddcb4 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/vermilionhouse1.asm @@ -7,10 +7,10 @@ VermilionHouse1Object: ; 0x1db20 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_BUG_CATCHER, $3 + 4, $5 + 4, $ff, $d2, $1 ; person - db SPRITE_BIRD, $5 + 4, $3 + 4, $fe, $2, $2 ; person - db SPRITE_PAPER_SHEET, $3 + 4, $4 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_BUG_CATCHER, $5, $3, FACE, RIGHT, $1 ; person + object SPRITE_BIRD, $3, $5, WALK, $2, $2 ; person + object SPRITE_PAPER_SHEET, $4, $3, FACE, STAY, $3 ; person ; warp-to EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index aab505cb..1feac502 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/vermilionhouse2.asm @@ -7,8 +7,8 @@ VermilionHouse2Object: ; 0x560cf (size=26) db $0 ; signs - db $1 ; people - db SPRITE_FISHER, $4 + 4, $2 + 4, $ff, $d3, $1 ; person + db $1 ; objects + object SPRITE_FISHER, $2, $4, FACE, LEFT, $1 ; person ; warp-to EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index b23a741b..31433ff2 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -7,8 +7,8 @@ VermilionHouse3Object: ; 0x19c25 (size=26) db $0 ; signs - db $1 ; people - db SPRITE_LITTLE_GIRL, $5 + 4, $3 + 4, $ff, $d1, $1 ; person + db $1 ; objects + object SPRITE_LITTLE_GIRL, $3, $5, FACE, UP, $1 ; person ; warp-to EVENT_DISP VERMILION_HOUSE_3_WIDTH, $7, $2 diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index f57adde8..f0211199 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/vermilionmart.asm @@ -7,10 +7,10 @@ VermilionMartObject: ; 0x5c9f4 (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BLACK_HAIR_BOY_1, $6 + 4, $5 + 4, $ff, $ff, $2 ; person - db SPRITE_LASS, $3 + 4, $3 + 4, $fe, $2, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $5, $6, FACE, STAY, $2 ; person + object SPRITE_LASS, $3, $3, WALK, $2, $3 ; person ; warp-to EVENT_DISP VERMILION_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index 97b86520..7898fb5d 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -7,11 +7,11 @@ VermilionPokecenterObject: ; 0x5c9a9 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_FISHER, $5 + 4, $a + 4, $ff, $ff, $2 ; person - db SPRITE_SAILOR, $4 + 4, $5 + 4, $ff, $ff, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_FISHER, $a, $5, FACE, STAY, $2 ; person + object SPRITE_SAILOR, $5, $4, FACE, STAY, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index 96cb23bb..bdd6369a 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -8,14 +8,14 @@ VictoryRoad1Object: ; 0x5dab8 (size=76) db $0 ; signs - db $7 ; people - db SPRITE_LASS, $5 + 4, $7 + 4, $ff, $d3, TRAINER | $1, COOLTRAINER_F + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $3 + 4, $ff, $d0, TRAINER | $2, COOLTRAINER_M + $C8, $5 - db SPRITE_BALL, $0 + 4, $b + 4, $ff, $ff, ITEM | $3, TM_43 - db SPRITE_BALL, $2 + 4, $9 + 4, $ff, $ff, ITEM | $4, RARE_CANDY - db SPRITE_BOULDER, $f + 4, $5 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $5 ; person - db SPRITE_BOULDER, $2 + 4, $e + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $6 ; person - db SPRITE_BOULDER, $a + 4, $2 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $7 ; person + db $7 ; objects + object SPRITE_LASS, $7, $5, FACE, LEFT, $1, COOLTRAINER_F + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_1, $3, $2, FACE, DOWN, $2, COOLTRAINER_M + $C8, $5 + object SPRITE_BALL, $b, $0, FACE, STAY, $3, TM_43 + object SPRITE_BALL, $9, $2, FACE, STAY, $4, RARE_CANDY + object SPRITE_BOULDER, $5, $f, FACE, BOULDER_MOVEMENT_BYTE_2, $5 ; person + object SPRITE_BOULDER, $e, $2, FACE, BOULDER_MOVEMENT_BYTE_2, $6 ; person + object SPRITE_BOULDER, $2, $a, FACE, BOULDER_MOVEMENT_BYTE_2, $7 ; person ; warp-to EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8 diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 39ec23c5..0a17e2e8 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -12,20 +12,20 @@ VictoryRoad2Object: ; 0x51915 (size=154) db $0 ; signs - db $d ; people - db SPRITE_HIKER, $9 + 4, $c + 4, $ff, $d2, TRAINER | $1, BLACKBELT + $C8, $9 - db SPRITE_BLACK_HAIR_BOY_2, $d + 4, $15 + 4, $ff, $d2, TRAINER | $2, JUGGLER + $C8, $2 - db SPRITE_BLACK_HAIR_BOY_1, $8 + 4, $13 + 4, $ff, $d0, TRAINER | $3, TAMER + $C8, $5 - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $4 + 4, $ff, $d0, TRAINER | $4, POKEMANIAC + $C8, $6 - db SPRITE_BLACK_HAIR_BOY_2, $3 + 4, $1a + 4, $ff, $d2, TRAINER | $5, JUGGLER + $C8, $5 - db SPRITE_BIRD, $5 + 4, $b + 4, $ff, $d1, TRAINER | $6, MOLTRES, 50 - db SPRITE_BALL, $5 + 4, $1b + 4, $ff, $ff, ITEM | $7, TM_17 - db SPRITE_BALL, $9 + 4, $12 + 4, $ff, $ff, ITEM | $8, FULL_HEAL - db SPRITE_BALL, $b + 4, $9 + 4, $ff, $ff, ITEM | $9, TM_05 - db SPRITE_BALL, $0 + 4, $b + 4, $ff, $ff, ITEM | $a, GUARD_SPEC_ - db SPRITE_BOULDER, $e + 4, $4 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $b ; person - db SPRITE_BOULDER, $5 + 4, $5 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $c ; person - db SPRITE_BOULDER, $10 + 4, $17 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $d ; person + db $d ; objects + object SPRITE_HIKER, $c, $9, FACE, RIGHT, $1, BLACKBELT + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $15, $d, FACE, RIGHT, $2, JUGGLER + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_1, $13, $8, FACE, DOWN, $3, TAMER + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_2, $4, $2, FACE, DOWN, $4, POKEMANIAC + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, FACE, RIGHT, $5, JUGGLER + $C8, $5 + object SPRITE_BIRD, $b, $5, FACE, UP, $6, MOLTRES, 50 + object SPRITE_BALL, $1b, $5, FACE, STAY, $7, TM_17 + object SPRITE_BALL, $12, $9, FACE, STAY, $8, FULL_HEAL + object SPRITE_BALL, $9, $b, FACE, STAY, $9, TM_05 + object SPRITE_BALL, $b, $0, FACE, STAY, $a, GUARD_SPEC_ + object SPRITE_BOULDER, $4, $e, FACE, BOULDER_MOVEMENT_BYTE_2, $b ; person + object SPRITE_BOULDER, $5, $5, FACE, BOULDER_MOVEMENT_BYTE_2, $c ; person + object SPRITE_BOULDER, $17, $10, FACE, BOULDER_MOVEMENT_BYTE_2, $d ; person ; warp-to EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $0 ; VICTORY_ROAD_1 diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 998a189d..60cafafb 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -9,17 +9,17 @@ VictoryRoad3Object: ; 0x44acd (size=106) db $0 ; signs - db $a ; people - db SPRITE_BLACK_HAIR_BOY_1, $5 + 4, $1c + 4, $ff, $d2, TRAINER | $1, COOLTRAINER_M + $C8, $2 - db SPRITE_LASS, $d + 4, $7 + 4, $ff, $d3, TRAINER | $2, COOLTRAINER_F + $C8, $2 - db SPRITE_BLACK_HAIR_BOY_1, $e + 4, $6 + 4, $ff, $d2, TRAINER | $3, COOLTRAINER_M + $C8, $3 - db SPRITE_LASS, $3 + 4, $d + 4, $ff, $d3, TRAINER | $4, COOLTRAINER_F + $C8, $3 - db SPRITE_BALL, $5 + 4, $1a + 4, $ff, $ff, ITEM | $5, MAX_REVIVE - db SPRITE_BALL, $7 + 4, $7 + 4, $ff, $ff, ITEM | $6, TM_47 - db SPRITE_BOULDER, $3 + 4, $16 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $7 ; person - db SPRITE_BOULDER, $c + 4, $d + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $8 ; person - db SPRITE_BOULDER, $a + 4, $18 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $9 ; person - db SPRITE_BOULDER, $f + 4, $16 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $a ; person + db $a ; objects + object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, FACE, RIGHT, $1, COOLTRAINER_M + $C8, $2 + object SPRITE_LASS, $7, $d, FACE, LEFT, $2, COOLTRAINER_F + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_1, $6, $e, FACE, RIGHT, $3, COOLTRAINER_M + $C8, $3 + object SPRITE_LASS, $d, $3, FACE, LEFT, $4, COOLTRAINER_F + $C8, $3 + object SPRITE_BALL, $1a, $5, FACE, STAY, $5, MAX_REVIVE + object SPRITE_BALL, $7, $7, FACE, STAY, $6, TM_47 + object SPRITE_BOULDER, $16, $3, FACE, BOULDER_MOVEMENT_BYTE_2, $7 ; person + object SPRITE_BOULDER, $d, $c, FACE, BOULDER_MOVEMENT_BYTE_2, $8 ; person + object SPRITE_BOULDER, $18, $a, FACE, BOULDER_MOVEMENT_BYTE_2, $9 ; person + object SPRITE_BOULDER, $16, $f, FACE, BOULDER_MOVEMENT_BYTE_2, $a ; person ; warp-to EVENT_DISP VICTORY_ROAD_3_WIDTH, $7, $17 ; VICTORY_ROAD_2 diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index 37cb42e2..dcc075c1 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -16,14 +16,14 @@ ViridianCityObject: ; 0x18384 (size=104) db $19, $18, $c ; PokeCenterSignText db $7, $1b, $d ; ViridianCityText13 - db $7 ; people - db SPRITE_BUG_CATCHER, $14 + 4, $d + 4, $fe, $0, $1 ; person - db SPRITE_GAMBLER, $8 + 4, $1e + 4, $ff, $ff, $2 ; person - db SPRITE_BUG_CATCHER, $19 + 4, $1e + 4, $fe, $0, $3 ; person - db SPRITE_GIRL, $9 + 4, $11 + 4, $ff, $d3, $4 ; person - db SPRITE_LYING_OLD_MAN, $9 + 4, $12 + 4, $ff, $ff, $5 ; person - db SPRITE_FISHER2, $17 + 4, $6 + 4, $ff, $d0, $6 ; person - db SPRITE_GAMBLER, $5 + 4, $11 + 4, $fe, $2, $7 ; person + db $7 ; objects + object SPRITE_BUG_CATCHER, $d, $14, WALK, $0, $1 ; person + object SPRITE_GAMBLER, $1e, $8, FACE, STAY, $2 ; person + object SPRITE_BUG_CATCHER, $1e, $19, WALK, $0, $3 ; person + object SPRITE_GIRL, $11, $9, FACE, LEFT, $4 ; person + object SPRITE_LYING_OLD_MAN, $12, $9, FACE, STAY, $5 ; person + object SPRITE_FISHER2, $6, $17, FACE, DOWN, $6 ; person + object SPRITE_GAMBLER, $11, $5, WALK, $2, $7 ; person ; warp-to EVENT_DISP VIRIDIAN_CITY_WIDTH, $19, $17 ; VIRIDIAN_POKECENTER diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 74f64dd5..55daa691 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -17,15 +17,15 @@ ViridianForestObject: ; 0x611da (size=127) db $2d, $12, $d ; ViridianForestText13 db $1, $2, $e ; ViridianForestText14 - db $8 ; people - db SPRITE_BUG_CATCHER, $2b + 4, $10 + 4, $ff, $ff, $1 ; person - db SPRITE_BUG_CATCHER, $21 + 4, $1e + 4, $ff, $d2, TRAINER | $2, BUG_CATCHER + $C8, $1 - db SPRITE_BUG_CATCHER, $13 + 4, $1e + 4, $ff, $d2, TRAINER | $3, BUG_CATCHER + $C8, $2 - db SPRITE_BUG_CATCHER, $12 + 4, $2 + 4, $ff, $d2, TRAINER | $4, BUG_CATCHER + $C8, $3 - db SPRITE_BALL, $b + 4, $19 + 4, $ff, $ff, ITEM | $5, ANTIDOTE - db SPRITE_BALL, $1d + 4, $c + 4, $ff, $ff, ITEM | $6, POTION - db SPRITE_BALL, $1f + 4, $1 + 4, $ff, $ff, ITEM | $7, POKE_BALL - db SPRITE_BUG_CATCHER, $28 + 4, $1b + 4, $ff, $ff, $8 ; person + db $8 ; objects + object SPRITE_BUG_CATCHER, $10, $2b, FACE, STAY, $1 ; person + object SPRITE_BUG_CATCHER, $1e, $21, FACE, RIGHT, $2, BUG_CATCHER + $C8, $1 + object SPRITE_BUG_CATCHER, $1e, $13, FACE, RIGHT, $3, BUG_CATCHER + $C8, $2 + object SPRITE_BUG_CATCHER, $2, $12, FACE, RIGHT, $4, BUG_CATCHER + $C8, $3 + object SPRITE_BALL, $19, $b, FACE, STAY, $5, ANTIDOTE + object SPRITE_BALL, $c, $1d, FACE, STAY, $6, POTION + object SPRITE_BALL, $1, $1f, FACE, STAY, $7, POKE_BALL + object SPRITE_BUG_CATCHER, $1b, $28, FACE, STAY, $8 ; person ; warp-to EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index ce0aaae5..5a6bebf7 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -9,9 +9,9 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48) db $0 ; signs - db $2 ; people - db SPRITE_GIRL, $4 + 4, $8 + 4, $ff, $d2, $1 ; person - db SPRITE_LITTLE_GIRL, $4 + 4, $2 + 4, $fe, $1, $2 ; person + db $2 ; objects + object SPRITE_GIRL, $8, $4, FACE, RIGHT, $1 ; person + object SPRITE_LITTLE_GIRL, $2, $4, WALK, $1, $2 ; person ; warp-to EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $4 ; VIRIDIAN_FOREST diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index a96d5270..9ac6fc96 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -9,9 +9,9 @@ ViridianForestExitObject: ; 0x5d598 (size=48) db $0 ; signs - db $2 ; people - db SPRITE_BLACK_HAIR_BOY_2, $2 + 4, $3 + 4, $ff, $ff, $1 ; person - db SPRITE_OLD_PERSON, $5 + 4, $2 + 4, $ff, $ff, $2 ; person + db $2 ; objects + object SPRITE_BLACK_HAIR_BOY_2, $3, $2, FACE, STAY, $1 ; person + object SPRITE_OLD_PERSON, $2, $5, FACE, STAY, $2 ; person ; warp-to EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $4 diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index 5cc1c086..63fe3eee 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -7,18 +7,18 @@ ViridianGymObject: ; 0x74bde (size=105) db $0 ; signs - db $b ; people - db SPRITE_GIOVANNI, $1 + 4, $2 + 4, $ff, $d0, TRAINER | $1, GIOVANNI + $C8, $3 - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $c + 4, $ff, $d0, TRAINER | $2, COOLTRAINER_M + $C8, $9 - db SPRITE_HIKER, $b + 4, $b + 4, $ff, $d1, TRAINER | $3, BLACKBELT + $C8, $6 - db SPRITE_ROCKER, $7 + 4, $a + 4, $ff, $d0, TRAINER | $4, TAMER + $C8, $3 - db SPRITE_HIKER, $7 + 4, $3 + 4, $ff, $d2, TRAINER | $5, BLACKBELT + $C8, $7 - db SPRITE_BLACK_HAIR_BOY_1, $5 + 4, $d + 4, $ff, $d3, TRAINER | $6, COOLTRAINER_M + $C8, $a - db SPRITE_HIKER, $1 + 4, $a + 4, $ff, $d0, TRAINER | $7, BLACKBELT + $C8, $8 - db SPRITE_ROCKER, $10 + 4, $2 + 4, $ff, $d3, TRAINER | $8, TAMER + $C8, $4 - db SPRITE_BLACK_HAIR_BOY_1, $5 + 4, $6 + 4, $ff, $d0, TRAINER | $9, COOLTRAINER_M + $C8, $1 - db SPRITE_GYM_HELPER, $f + 4, $10 + 4, $ff, $d0, $a ; person - db SPRITE_BALL, $9 + 4, $10 + 4, $ff, $ff, ITEM | $b, REVIVE + db $b ; objects + object SPRITE_GIOVANNI, $2, $1, FACE, DOWN, $1, GIOVANNI + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_1, $c, $7, FACE, DOWN, $2, COOLTRAINER_M + $C8, $9 + object SPRITE_HIKER, $b, $b, FACE, UP, $3, BLACKBELT + $C8, $6 + object SPRITE_ROCKER, $a, $7, FACE, DOWN, $4, TAMER + $C8, $3 + object SPRITE_HIKER, $3, $7, FACE, RIGHT, $5, BLACKBELT + $C8, $7 + object SPRITE_BLACK_HAIR_BOY_1, $d, $5, FACE, LEFT, $6, COOLTRAINER_M + $C8, $a + object SPRITE_HIKER, $a, $1, FACE, DOWN, $7, BLACKBELT + $C8, $8 + object SPRITE_ROCKER, $2, $10, FACE, LEFT, $8, TAMER + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $5, FACE, DOWN, $9, COOLTRAINER_M + $C8, $1 + object SPRITE_GYM_HELPER, $10, $f, FACE, DOWN, $a ; person + object SPRITE_BALL, $10, $9, FACE, STAY, $b, REVIVE ; warp-to EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $10 diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index dd2d6069..30dd6356 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/viridianhouse.asm @@ -7,11 +7,11 @@ ViridianHouseObject: ; 0x1d5bb (size=44) db $0 ; signs - db $4 ; people - db SPRITE_BALDING_GUY, $3 + 4, $5 + 4, $ff, $ff, $1 ; person - db SPRITE_LITTLE_GIRL, $4 + 4, $1 + 4, $fe, $1, $2 ; person - db SPRITE_BIRD, $5 + 4, $5 + 4, $fe, $2, $3 ; person - db SPRITE_CLIPBOARD, $0 + 4, $4 + 4, $ff, $ff, $4 ; person + db $4 ; objects + object SPRITE_BALDING_GUY, $5, $3, FACE, STAY, $1 ; person + object SPRITE_LITTLE_GIRL, $1, $4, WALK, $1, $2 ; person + object SPRITE_BIRD, $5, $5, WALK, $2, $3 ; person + object SPRITE_CLIPBOARD, $4, $0, FACE, STAY, $4 ; person ; warp-to EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index b1b367c7..d85d089b 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -7,10 +7,10 @@ ViridianMartObject: ; 0x1d50a (size=38) db $0 ; signs - db $3 ; people - db SPRITE_MART_GUY, $5 + 4, $0 + 4, $ff, $d3, $1 ; person - db SPRITE_BUG_CATCHER, $5 + 4, $5 + 4, $fe, $1, $2 ; person - db SPRITE_BLACK_HAIR_BOY_1, $3 + 4, $3 + 4, $ff, $ff, $3 ; person + db $3 ; objects + object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_BUG_CATCHER, $5, $5, WALK, $1, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $3, $3, FACE, STAY, $3 ; person ; warp-to EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 6631a814..8423ea1a 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -7,11 +7,11 @@ ViridianPokecenterObject: ; 0x44277 (size=44) db $0 ; signs - db $4 ; people - db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person - db SPRITE_GENTLEMAN, $5 + 4, $a + 4, $fe, $1, $2 ; person - db SPRITE_BLACK_HAIR_BOY_1, $3 + 4, $4 + 4, $ff, $ff, $3 ; person - db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person + db $4 ; objects + object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $a, $5, WALK, $1, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $4, $3, FACE, STAY, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person ; warp-to EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3 diff --git a/macros.asm b/macros.asm index 10317246..5fc6c348 100644 --- a/macros.asm +++ b/macros.asm @@ -232,6 +232,44 @@ tx_pre_jump: MACRO jp PrintPredefTextID ENDM +WALK EQU $FE +FACE EQU $FF + +DOWN EQU $D0 +UP EQU $D1 +RIGHT EQU $D2 +LEFT EQU $D3 +STAY EQU $FF + +;\1 sprite id +;\2 x position +;\3 y position +;\4 movement (WALK/FACE) +;\5 range or direction +;\6 text id +;\7 items only: item id +;\7 trainers only: trainer class/pokemon id +;\8 trainers only: trainer number/pokemon level +object: MACRO + db \1 + db \3 + 4 + db \2 + 4 + db \4 + db \5 + IF (_NARG > 7) + db TRAINER | \6 + db \7 + db \8 + ELSE + IF (_NARG > 6) + db ITEM | \6 + db \7 + ELSE + db \6 + ENDC + ENDC +ENDM + ;1_channel EQU $00 ;2_channels EQU $40 -- cgit v1.3.1-sl0p From 4452acb021873affd95c92f096d0b1b9e8b50e7a Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 18 Jul 2015 22:36:22 -0500 Subject: Fix object constant names swap LEFT and RIGHT FACE is better named STAY because sprites that have no range do not necessarily face any direction STAY has been renamed to NONE because sprites that use this will spin randomly, except for the item/voltorb/electrode sprite I never should have listened to https://github.com/iimarckus/pokered/issues/89 --- data/mapObjects/agatha.asm | 2 +- data/mapObjects/beach_house.asm | 2 +- data/mapObjects/bikeshop.asm | 4 ++-- data/mapObjects/billshouse.asm | 6 ++--- data/mapObjects/blueshouse.asm | 4 ++-- data/mapObjects/bruno.asm | 2 +- data/mapObjects/celadoncity.asm | 10 ++++---- data/mapObjects/celadondiner.asm | 8 +++---- data/mapObjects/celadongamecorner.asm | 22 ++++++++--------- data/mapObjects/celadongym.asm | 16 ++++++------- data/mapObjects/celadonhotel.asm | 4 ++-- data/mapObjects/celadonhouse.asm | 4 ++-- data/mapObjects/celadonmansion1.asm | 4 ++-- data/mapObjects/celadonmansion3.asm | 8 +++---- data/mapObjects/celadonmansion5.asm | 4 ++-- data/mapObjects/celadonmart1.asm | 2 +- data/mapObjects/celadonmart2.asm | 6 ++--- data/mapObjects/celadonmart3.asm | 10 ++++---- data/mapObjects/celadonmart4.asm | 2 +- data/mapObjects/celadonmart5.asm | 6 ++--- data/mapObjects/celadonmartroof.asm | 2 +- data/mapObjects/celadonpokecenter.asm | 4 ++-- data/mapObjects/celadonprizeroom.asm | 2 +- data/mapObjects/ceruleancity.asm | 16 ++++++------- data/mapObjects/ceruleangym.asm | 8 +++---- data/mapObjects/ceruleanhouse1.asm | 4 ++-- data/mapObjects/ceruleanhouse2.asm | 2 +- data/mapObjects/ceruleanhousetrashed.asm | 2 +- data/mapObjects/ceruleanmart.asm | 2 +- data/mapObjects/ceruleanpokecenter.asm | 6 ++--- data/mapObjects/cinnabargym.asm | 18 +++++++------- data/mapObjects/cinnabarisland.asm | 2 +- data/mapObjects/cinnabarmart.asm | 6 ++--- data/mapObjects/cinnabarpokecenter.asm | 6 ++--- data/mapObjects/copycatshouse1f.asm | 4 ++-- data/mapObjects/copycatshouse2f.asm | 6 ++--- data/mapObjects/daycarem.asm | 2 +- data/mapObjects/diglettscaveroute11.asm | 2 +- data/mapObjects/diglettscaveroute2.asm | 2 +- data/mapObjects/fanclub.asm | 12 +++++----- data/mapObjects/fightingdojo.asm | 14 +++++------ data/mapObjects/fuchsiacity.asm | 8 +++---- data/mapObjects/fuchsiagym.asm | 16 ++++++------- data/mapObjects/fuchsiahouse1.asm | 6 ++--- data/mapObjects/fuchsiahouse2.asm | 6 ++--- data/mapObjects/fuchsiahouse3.asm | 2 +- data/mapObjects/fuchsiamart.asm | 4 ++-- data/mapObjects/fuchsiameetingroom.asm | 6 ++--- data/mapObjects/fuchsiapokecenter.asm | 6 ++--- data/mapObjects/gary.asm | 4 ++-- data/mapObjects/halloffameroom.asm | 2 +- data/mapObjects/indigoplateaulobby.asm | 10 ++++---- data/mapObjects/lab1.asm | 2 +- data/mapObjects/lab2.asm | 6 ++--- data/mapObjects/lab3.asm | 2 +- data/mapObjects/lab4.asm | 2 +- data/mapObjects/lance.asm | 2 +- data/mapObjects/lavenderhouse1.asm | 12 +++++----- data/mapObjects/lavenderhouse2.asm | 4 ++-- data/mapObjects/lavendermart.asm | 6 ++--- data/mapObjects/lavenderpokecenter.asm | 6 ++--- data/mapObjects/lavendertown.asm | 2 +- data/mapObjects/lorelei.asm | 2 +- data/mapObjects/mansion1.asm | 6 ++--- data/mapObjects/mansion2.asm | 6 ++--- data/mapObjects/mansion3.asm | 8 +++---- data/mapObjects/mansion4.asm | 16 ++++++------- data/mapObjects/mtmoon1.asm | 26 ++++++++++---------- data/mapObjects/mtmoon3.asm | 18 +++++++------- data/mapObjects/mtmoonpokecenter.asm | 10 ++++---- data/mapObjects/museum1f.asm | 10 ++++---- data/mapObjects/museum2f.asm | 8 +++---- data/mapObjects/namerater.asm | 2 +- data/mapObjects/oakslab.asm | 20 ++++++++-------- data/mapObjects/pallettown.asm | 2 +- data/mapObjects/pewtercity.asm | 8 +++---- data/mapObjects/pewtergym.asm | 6 ++--- data/mapObjects/pewterhouse1.asm | 6 ++--- data/mapObjects/pewterhouse2.asm | 4 ++-- data/mapObjects/pewtermart.asm | 4 ++-- data/mapObjects/pewterpokecenter.asm | 8 +++---- data/mapObjects/pokemontower1.asm | 10 ++++---- data/mapObjects/pokemontower2.asm | 4 ++-- data/mapObjects/pokemontower3.asm | 8 +++---- data/mapObjects/pokemontower4.asm | 12 +++++----- data/mapObjects/pokemontower5.asm | 12 +++++----- data/mapObjects/pokemontower6.asm | 10 ++++---- data/mapObjects/pokemontower7.asm | 14 +++++------ data/mapObjects/powerplant.asm | 28 +++++++++++----------- data/mapObjects/redshouse1f.asm | 2 +- data/mapObjects/rockethideout1.asm | 14 +++++------ data/mapObjects/rockethideout2.asm | 10 ++++---- data/mapObjects/rockethideout3.asm | 8 +++---- data/mapObjects/rockethideout4.asm | 18 +++++++------- data/mapObjects/rocktunnel1.asm | 14 +++++------ data/mapObjects/rocktunnel2.asm | 16 ++++++------- data/mapObjects/rocktunnelpokecenter.asm | 6 ++--- data/mapObjects/route10.asm | 12 +++++----- data/mapObjects/route11.asm | 20 ++++++++-------- data/mapObjects/route11gate.asm | 2 +- data/mapObjects/route11gateupstairs.asm | 2 +- data/mapObjects/route12.asm | 20 ++++++++-------- data/mapObjects/route12gate.asm | 2 +- data/mapObjects/route12house.asm | 2 +- data/mapObjects/route13.asm | 20 ++++++++-------- data/mapObjects/route14.asm | 20 ++++++++-------- data/mapObjects/route15.asm | 22 ++++++++--------- data/mapObjects/route15gate.asm | 2 +- data/mapObjects/route15gateupstairs.asm | 2 +- data/mapObjects/route16.asm | 14 +++++------ data/mapObjects/route16gate.asm | 4 ++-- data/mapObjects/route16gateupstairs.asm | 2 +- data/mapObjects/route16house.asm | 2 +- data/mapObjects/route17.asm | 20 ++++++++-------- data/mapObjects/route18.asm | 6 ++--- data/mapObjects/route18gate.asm | 2 +- data/mapObjects/route19.asm | 26 ++++++++++---------- data/mapObjects/route2.asm | 4 ++-- data/mapObjects/route20.asm | 20 ++++++++-------- data/mapObjects/route21.asm | 18 +++++++------- data/mapObjects/route22.asm | 4 ++-- data/mapObjects/route22gate.asm | 2 +- data/mapObjects/route23.asm | 14 +++++------ data/mapObjects/route24.asm | 16 ++++++------- data/mapObjects/route25.asm | 20 ++++++++-------- data/mapObjects/route2gate.asm | 2 +- data/mapObjects/route2house.asm | 4 ++-- data/mapObjects/route3.asm | 18 +++++++------- data/mapObjects/route4.asm | 4 ++-- data/mapObjects/route5gate.asm | 2 +- data/mapObjects/route6.asm | 12 +++++----- data/mapObjects/route6gate.asm | 2 +- data/mapObjects/route7gate.asm | 2 +- data/mapObjects/route8.asm | 18 +++++++------- data/mapObjects/route8gate.asm | 2 +- data/mapObjects/route9.asm | 20 ++++++++-------- data/mapObjects/safarizonecenter.asm | 2 +- data/mapObjects/safarizoneeast.asm | 8 +++---- data/mapObjects/safarizoneentrance.asm | 4 ++-- data/mapObjects/safarizonenorth.asm | 4 ++-- data/mapObjects/safarizoneresthouse1.asm | 2 +- data/mapObjects/safarizoneresthouse2.asm | 4 ++-- data/mapObjects/safarizoneresthouse3.asm | 4 ++-- data/mapObjects/safarizoneresthouse4.asm | 2 +- data/mapObjects/safarizonesecrethouse.asm | 2 +- data/mapObjects/safarizonewest.asm | 8 +++---- data/mapObjects/saffroncity.asm | 18 +++++++------- data/mapObjects/saffrongym.asm | 18 +++++++------- data/mapObjects/saffronhouse1.asm | 6 ++--- data/mapObjects/saffronhouse2.asm | 2 +- data/mapObjects/saffronmart.asm | 4 ++-- data/mapObjects/saffronpokecenter.asm | 8 +++---- data/mapObjects/school.asm | 4 ++-- data/mapObjects/seafoamislands1.asm | 4 ++-- data/mapObjects/seafoamislands2.asm | 4 ++-- data/mapObjects/seafoamislands3.asm | 4 ++-- data/mapObjects/seafoamislands4.asm | 12 +++++----- data/mapObjects/seafoamislands5.asm | 6 ++--- data/mapObjects/silphco1.asm | 2 +- data/mapObjects/silphco10.asm | 10 ++++---- data/mapObjects/silphco11.asm | 10 ++++---- data/mapObjects/silphco2.asm | 10 ++++---- data/mapObjects/silphco3.asm | 8 +++---- data/mapObjects/silphco4.asm | 14 +++++------ data/mapObjects/silphco5.asm | 22 ++++++++--------- data/mapObjects/silphco6.asm | 20 ++++++++-------- data/mapObjects/silphco7.asm | 22 ++++++++--------- data/mapObjects/silphco8.asm | 8 +++---- data/mapObjects/silphco9.asm | 8 +++---- data/mapObjects/ssanne1.asm | 2 +- data/mapObjects/ssanne10.asm | 22 ++++++++--------- data/mapObjects/ssanne2.asm | 2 +- data/mapObjects/ssanne5.asm | 10 ++++---- data/mapObjects/ssanne6.asm | 8 +++---- data/mapObjects/ssanne7.asm | 2 +- data/mapObjects/ssanne8.asm | 18 +++++++------- data/mapObjects/ssanne9.asm | 26 ++++++++++---------- data/mapObjects/undergroundpathentranceroute5.asm | 2 +- data/mapObjects/undergroundpathentranceroute6.asm | 2 +- data/mapObjects/undergroundpathentranceroute7.asm | 2 +- .../undergroundpathentranceroute7copy.asm | 4 ++-- data/mapObjects/undergroundpathentranceroute8.asm | 2 +- data/mapObjects/unknowndungeon1.asm | 6 ++--- data/mapObjects/unknowndungeon2.asm | 6 ++--- data/mapObjects/unknowndungeon3.asm | 6 ++--- data/mapObjects/vermilioncity.asm | 6 ++--- data/mapObjects/vermiliongym.asm | 10 ++++---- data/mapObjects/vermilionhouse1.asm | 4 ++-- data/mapObjects/vermilionhouse2.asm | 2 +- data/mapObjects/vermilionhouse3.asm | 2 +- data/mapObjects/vermilionmart.asm | 4 ++-- data/mapObjects/vermilionpokecenter.asm | 8 +++---- data/mapObjects/victoryroad1.asm | 14 +++++------ data/mapObjects/victoryroad2.asm | 26 ++++++++++---------- data/mapObjects/victoryroad3.asm | 20 ++++++++-------- data/mapObjects/viridiancity.asm | 8 +++---- data/mapObjects/viridianforest.asm | 16 ++++++------- data/mapObjects/viridianforestentrance.asm | 2 +- data/mapObjects/viridianforestexit.asm | 4 ++-- data/mapObjects/viridiangym.asm | 22 ++++++++--------- data/mapObjects/viridianhouse.asm | 4 ++-- data/mapObjects/viridianmart.asm | 4 ++-- data/mapObjects/viridianpokecenter.asm | 6 ++--- macros.asm | 10 ++++---- 204 files changed, 830 insertions(+), 830 deletions(-) (limited to 'macros.asm') diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/agatha.asm index 3ed1f344..f755df83 100755 --- a/data/mapObjects/agatha.asm +++ b/data/mapObjects/agatha.asm @@ -10,7 +10,7 @@ AgathaObject: ; 0x76534 (size=44) db $0 ; signs db $1 ; objects - object SPRITE_AGATHA, $5, $2, FACE, DOWN, $1, AGATHA + $C8, $1 + object SPRITE_AGATHA, $5, $2, STAY, DOWN, $1, AGATHA + $C8, $1 ; warp-to EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm index 0f660357..847883d1 100644 --- a/data/mapObjects/beach_house.asm +++ b/data/mapObjects/beach_house.asm @@ -12,7 +12,7 @@ BeachHouseObjects: ; 0xf23a4 db 1,$d,6 db 2 ; objects - object SPRITE_FISHER, 2, 3, FACE, DOWN, 1 ; surfin' dude + object SPRITE_FISHER, 2, 3, STAY, DOWN, 1 ; surfin' dude object $3d, 5, 3, WALK, $01, 2 ; pikachu ; warp-to diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/bikeshop.asm index fb966c17..ab763bc3 100755 --- a/data/mapObjects/bikeshop.asm +++ b/data/mapObjects/bikeshop.asm @@ -8,9 +8,9 @@ BikeShopObject: ; 0x1d866 (size=38) db $0 ; signs db $3 ; objects - object SPRITE_BIKE_SHOP_GUY, $6, $2, FACE, STAY, $1 ; person + object SPRITE_BIKE_SHOP_GUY, $6, $2, STAY, NONE, $1 ; person object SPRITE_MOM_GEISHA, $5, $6, WALK, $1, $2 ; person - object SPRITE_BUG_CATCHER, $1, $3, FACE, UP, $3 ; person + object SPRITE_BUG_CATCHER, $1, $3, STAY, UP, $3 ; person ; warp-to EVENT_DISP BIKE_SHOP_WIDTH, $7, $2 diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/billshouse.asm index d43379d7..9da1efd1 100755 --- a/data/mapObjects/billshouse.asm +++ b/data/mapObjects/billshouse.asm @@ -8,9 +8,9 @@ BillsHouseObject: ; 0x1e8df (size=38) db $0 ; signs db $3 ; objects - object SPRITE_SLOWBRO, $6, $5, FACE, STAY, $1 ; person - object SPRITE_BLACK_HAIR_BOY_2, $4, $4, FACE, STAY, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $6, $5, FACE, STAY, $3 ; person + object SPRITE_SLOWBRO, $6, $5, STAY, NONE, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $4, STAY, NONE, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $6, $5, STAY, NONE, $3 ; person ; warp-to EVENT_DISP BILLS_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 08b0b2fe..43ba02e4 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -8,9 +8,9 @@ BluesHouseObject: ; 19bce (6:5bce) db $0 ; signs db $3 ; objects - object SPRITE_DAISY, $2, $3, FACE, LEFT, $1 ; Daisy, sitting by map + object SPRITE_DAISY, $2, $3, STAY, RIGHT, $1 ; Daisy, sitting by map object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around - object SPRITE_BOOK_MAP_DEX, $3, $3, FACE, STAY, $3, $0 ; map on table + object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table ; warp-to EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index 9c164118..805f3302 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -10,7 +10,7 @@ BrunoObject: ; 0x763d7 (size=44) db $0 ; signs db $1 ; objects - object SPRITE_BRUNO, $5, $2, FACE, DOWN, $1, BRUNO + $C8, $1 + object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, BRUNO + $C8, $1 ; warp-to EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index 68c88808..0e420221 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -29,12 +29,12 @@ CeladonCityObject: ; 0x18022 (size=189) db $9 ; objects object SPRITE_LITTLE_GIRL, $8, $11, WALK, $0, $1 ; person - object SPRITE_OLD_PERSON, $b, $1c, FACE, UP, $2 ; person + object SPRITE_OLD_PERSON, $b, $1c, STAY, UP, $2 ; person object SPRITE_GIRL, $e, $13, WALK, $1, $3 ; person - object SPRITE_OLD_PERSON, $19, $16, FACE, DOWN, $4 ; person - object SPRITE_OLD_PERSON, $16, $10, FACE, DOWN, $5 ; person - object SPRITE_FISHER2, $20, $c, FACE, RIGHT, $6 ; person - object SPRITE_SLOWBRO, $1e, $c, FACE, LEFT, $7 ; person + object SPRITE_OLD_PERSON, $19, $16, STAY, DOWN, $4 ; person + object SPRITE_OLD_PERSON, $16, $10, STAY, DOWN, $5 ; person + object SPRITE_FISHER2, $20, $c, STAY, LEFT, $6 ; person + object SPRITE_SLOWBRO, $1e, $c, STAY, RIGHT, $7 ; person object SPRITE_ROCKET, $20, $1d, WALK, $2, $8 ; person object SPRITE_ROCKET, $2a, $e, WALK, $2, $9 ; person diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index c06de73c..74141df9 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -9,10 +9,10 @@ CeladonDinerObject: ; 0x491bc (size=50) db $5 ; objects object SPRITE_COOK, $8, $5, WALK, $2, $1 ; person - object SPRITE_MOM_GEISHA, $7, $2, FACE, STAY, $2 ; person - object SPRITE_FAT_BALD_GUY, $1, $4, FACE, DOWN, $3 ; person - object SPRITE_FISHER2, $5, $3, FACE, LEFT, $4 ; person - object SPRITE_GYM_HELPER, $0, $1, FACE, DOWN, $5 ; person + object SPRITE_MOM_GEISHA, $7, $2, STAY, NONE, $2 ; person + object SPRITE_FAT_BALD_GUY, $1, $4, STAY, DOWN, $3 ; person + object SPRITE_FISHER2, $5, $3, STAY, RIGHT, $4 ; person + object SPRITE_GYM_HELPER, $0, $1, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP CELADON_DINER_WIDTH, $7, $3 diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index 7cd4e147..c0af5920 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -10,17 +10,17 @@ CeladonGameCornerObject: ; 0x48fa0 (size=99) db $4, $9, $c ; CeladonGameCornerText12 db $b ; objects - object SPRITE_FOULARD_WOMAN, $2, $6, FACE, DOWN, $1 ; person - object SPRITE_MART_GUY, $5, $6, FACE, DOWN, $2 ; person - object SPRITE_FAT_BALD_GUY, $2, $a, FACE, RIGHT, $3 ; person - object SPRITE_FOULARD_WOMAN, $2, $d, FACE, RIGHT, $4 ; person - object SPRITE_FISHER, $5, $b, FACE, LEFT, $5 ; person - object SPRITE_MOM_GEISHA, $8, $b, FACE, RIGHT, $6 ; person - object SPRITE_GYM_HELPER, $8, $e, FACE, RIGHT, $7 ; person - object SPRITE_GAMBLER, $b, $f, FACE, LEFT, $8 ; person - object SPRITE_MART_GUY, $e, $b, FACE, RIGHT, $9 ; person - object SPRITE_GENTLEMAN, $11, $d, FACE, LEFT, $a ; person - object SPRITE_ROCKET, $9, $5, FACE, UP, $b, ROCKET + $C8, $7 + object SPRITE_FOULARD_WOMAN, $2, $6, STAY, DOWN, $1 ; person + object SPRITE_MART_GUY, $5, $6, STAY, DOWN, $2 ; person + object SPRITE_FAT_BALD_GUY, $2, $a, STAY, LEFT, $3 ; person + object SPRITE_FOULARD_WOMAN, $2, $d, STAY, LEFT, $4 ; person + object SPRITE_FISHER, $5, $b, STAY, RIGHT, $5 ; person + object SPRITE_MOM_GEISHA, $8, $b, STAY, LEFT, $6 ; person + object SPRITE_GYM_HELPER, $8, $e, STAY, LEFT, $7 ; person + object SPRITE_GAMBLER, $b, $f, STAY, RIGHT, $8 ; person + object SPRITE_MART_GUY, $e, $b, STAY, LEFT, $9 ; person + object SPRITE_GENTLEMAN, $11, $d, STAY, RIGHT, $a ; person + object SPRITE_ROCKET, $9, $5, STAY, UP, $b, ROCKET + $C8, $7 ; warp-to EVENT_DISP GAME_CORNER_WIDTH, $11, $f diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm index f3de0cf1..795f7efa 100755 --- a/data/mapObjects/celadongym.asm +++ b/data/mapObjects/celadongym.asm @@ -8,14 +8,14 @@ CeladonGymObject: ; 0x48b30 (size=84) db $0 ; signs db $8 ; objects - object SPRITE_ERIKA, $4, $3, FACE, DOWN, $1, ERIKA + $C8, $1 - object SPRITE_LASS, $2, $b, FACE, LEFT, $2, LASS + $C8, $11 - object SPRITE_FOULARD_WOMAN, $7, $a, FACE, RIGHT, $3, BEAUTY + $C8, $1 - object SPRITE_LASS, $9, $5, FACE, DOWN, $4, JR__TRAINER_F + $C8, $b - object SPRITE_FOULARD_WOMAN, $1, $5, FACE, DOWN, $5, BEAUTY + $C8, $2 - object SPRITE_LASS, $6, $3, FACE, DOWN, $6, LASS + $C8, $12 - object SPRITE_FOULARD_WOMAN, $3, $3, FACE, DOWN, $7, BEAUTY + $C8, $3 - object SPRITE_LASS, $5, $3, FACE, DOWN, $8, COOLTRAINER_F + $C8, $1 + object SPRITE_ERIKA, $4, $3, STAY, DOWN, $1, ERIKA + $C8, $1 + object SPRITE_LASS, $2, $b, STAY, RIGHT, $2, LASS + $C8, $11 + object SPRITE_FOULARD_WOMAN, $7, $a, STAY, LEFT, $3, BEAUTY + $C8, $1 + object SPRITE_LASS, $9, $5, STAY, DOWN, $4, JR__TRAINER_F + $C8, $b + object SPRITE_FOULARD_WOMAN, $1, $5, STAY, DOWN, $5, BEAUTY + $C8, $2 + object SPRITE_LASS, $6, $3, STAY, DOWN, $6, LASS + $C8, $12 + object SPRITE_FOULARD_WOMAN, $3, $3, STAY, DOWN, $7, BEAUTY + $C8, $3 + object SPRITE_LASS, $5, $3, STAY, DOWN, $8, COOLTRAINER_F + $C8, $1 ; warp-to EVENT_DISP CELADON_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/celadonhotel.asm index 74499869..33c442c2 100755 --- a/data/mapObjects/celadonhotel.asm +++ b/data/mapObjects/celadonhotel.asm @@ -8,8 +8,8 @@ CeladonHotelObject: ; 0x49281 (size=38) db $0 ; signs db $3 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, $3, $1, FACE, DOWN, $1 ; person - object SPRITE_FOULARD_WOMAN, $2, $4, FACE, STAY, $2 ; person + object SPRITE_OLD_MEDIUM_WOMAN, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_FOULARD_WOMAN, $2, $4, STAY, NONE, $2 ; person object SPRITE_BLACK_HAIR_BOY_2, $8, $4, WALK, $2, $3 ; person ; warp-to diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/celadonhouse.asm index 0919e99a..0fcb08f5 100755 --- a/data/mapObjects/celadonhouse.asm +++ b/data/mapObjects/celadonhouse.asm @@ -8,9 +8,9 @@ CeladonHouseObject: ; 0x49227 (size=38) db $0 ; signs db $3 ; objects - object SPRITE_OLD_PERSON, $4, $2, FACE, DOWN, $1 ; person + object SPRITE_OLD_PERSON, $4, $2, STAY, DOWN, $1 ; person object SPRITE_ROCKET, $1, $4, WALK, $0, $2 ; person - object SPRITE_SAILOR, $5, $6, FACE, RIGHT, $3 ; person + object SPRITE_SAILOR, $5, $6, STAY, LEFT, $3 ; person ; warp-to EVENT_DISP CELADON_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/celadonmansion1.asm index 3ff485ea..a308e8bc 100755 --- a/data/mapObjects/celadonmansion1.asm +++ b/data/mapObjects/celadonmansion1.asm @@ -12,8 +12,8 @@ CeladonMansion1Object: ; 0x486cf (size=71) db $9, $4, $5 ; CeladonMansion1Text5 db $4 ; objects - object SPRITE_SLOWBRO, $0, $5, FACE, LEFT, $1 ; person - object SPRITE_OLD_MEDIUM_WOMAN, $1, $5, FACE, DOWN, $2 ; person + object SPRITE_SLOWBRO, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_OLD_MEDIUM_WOMAN, $1, $5, STAY, DOWN, $2 ; person object SPRITE_CLEFAIRY, $1, $8, WALK, $2, $3 ; person object SPRITE_SLOWBRO, $4, $4, WALK, $1, $4 ; person diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/celadonmansion3.asm index bf61ec8c..36bf36d5 100755 --- a/data/mapObjects/celadonmansion3.asm +++ b/data/mapObjects/celadonmansion3.asm @@ -14,10 +14,10 @@ CeladonMansion3Object: ; 0x487ff (size=72) db $9, $4, $8 ; CeladonMansion3Text8 db $4 ; objects - object SPRITE_BIKE_SHOP_GUY, $0, $4, FACE, UP, $1 ; person - object SPRITE_MART_GUY, $3, $4, FACE, UP, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $0, $7, FACE, UP, $3 ; person - object SPRITE_LAPRAS_GIVER, $2, $3, FACE, STAY, $4 ; person + object SPRITE_BIKE_SHOP_GUY, $0, $4, STAY, UP, $1 ; person + object SPRITE_MART_GUY, $3, $4, STAY, UP, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $0, $7, STAY, UP, $3 ; person + object SPRITE_LAPRAS_GIVER, $2, $3, STAY, NONE, $4 ; person ; warp-to EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $6 ; CELADON_MANSION_2 diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm index c65a23b5..2f20323d 100755 --- a/data/mapObjects/celadonmansion5.asm +++ b/data/mapObjects/celadonmansion5.asm @@ -8,8 +8,8 @@ CeladonMansion5Object: ; 0x1dd5c (size=32) db $0 ; signs db $2 ; objects - object SPRITE_HIKER, $2, $2, FACE, DOWN, $1 ; person - object SPRITE_BALL, $4, $3, FACE, STAY, $2 ; person + object SPRITE_HIKER, $2, $2, STAY, DOWN, $1 ; person + object SPRITE_BALL, $4, $3, STAY, NONE, $2 ; person ; warp-to EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $2 ; CELADON_MANSION_4 diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/celadonmart1.asm index 842de216..dbbc0a36 100755 --- a/data/mapObjects/celadonmart1.asm +++ b/data/mapObjects/celadonmart1.asm @@ -14,7 +14,7 @@ CeladonMart1Object: ; 0x60f9e (size=64) db $1, $e, $3 ; CeladonMart1Text3 db $1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, $8, $3, FACE, DOWN, $1 ; person + object SPRITE_CABLE_CLUB_WOMAN, $8, $3, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP CELADON_MART_1_WIDTH, $7, $2 diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/celadonmart2.asm index 55c4d741..061ac6e0 100755 --- a/data/mapObjects/celadonmart2.asm +++ b/data/mapObjects/celadonmart2.asm @@ -10,9 +10,9 @@ CeladonMart2Object: ; 0x56111 (size=55) db $1, $e, $5 ; CeladonMart2Text5 db $4 ; objects - object SPRITE_MART_GUY, $5, $3, FACE, DOWN, $1 ; person - object SPRITE_MART_GUY, $6, $3, FACE, DOWN, $2 ; person - object SPRITE_FAT_BALD_GUY, $13, $5, FACE, STAY, $3 ; person + object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $1 ; person + object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $2 ; person + object SPRITE_FAT_BALD_GUY, $13, $5, STAY, NONE, $3 ; person object SPRITE_GIRL, $e, $4, WALK, $1, $4 ; person ; warp-to diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/celadonmart3.asm index 2f17cbb5..5e11a62c 100755 --- a/data/mapObjects/celadonmart3.asm +++ b/data/mapObjects/celadonmart3.asm @@ -21,11 +21,11 @@ CeladonMart3Object: ; 0x482c4 (size=94) db $1, $a, $11 ; CeladonMart3Text17 db $5 ; objects - object SPRITE_MART_GUY, $10, $5, FACE, STAY, $1 ; person - object SPRITE_GAMEBOY_KID_COPY, $b, $6, FACE, LEFT, $2 ; person - object SPRITE_GAMEBOY_KID_COPY, $7, $2, FACE, DOWN, $3 ; person - object SPRITE_GAMEBOY_KID_COPY, $8, $2, FACE, DOWN, $4 ; person - object SPRITE_YOUNG_BOY, $2, $5, FACE, UP, $5 ; person + object SPRITE_MART_GUY, $10, $5, STAY, NONE, $1 ; person + object SPRITE_GAMEBOY_KID_COPY, $b, $6, STAY, RIGHT, $2 ; person + object SPRITE_GAMEBOY_KID_COPY, $7, $2, STAY, DOWN, $3 ; person + object SPRITE_GAMEBOY_KID_COPY, $8, $2, STAY, DOWN, $4 ; person + object SPRITE_YOUNG_BOY, $2, $5, STAY, UP, $5 ; person ; warp-to EVENT_DISP CELADON_MART_3_WIDTH, $1, $c ; CELADON_MART_4 diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/celadonmart4.asm index 4773644a..7dce43dc 100755 --- a/data/mapObjects/celadonmart4.asm +++ b/data/mapObjects/celadonmart4.asm @@ -10,7 +10,7 @@ CeladonMart4Object: ; 0x48370 (size=49) db $1, $e, $4 ; CeladonMart4Text4 db $3 ; objects - object SPRITE_MART_GUY, $5, $7, FACE, STAY, $1 ; person + object SPRITE_MART_GUY, $5, $7, STAY, NONE, $1 ; person object SPRITE_BLACK_HAIR_BOY_2, $f, $5, WALK, $2, $2 ; person object SPRITE_BUG_CATCHER, $5, $2, WALK, $2, $3 ; person diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/celadonmart5.asm index 1834bb80..23b7cf4f 100755 --- a/data/mapObjects/celadonmart5.asm +++ b/data/mapObjects/celadonmart5.asm @@ -11,9 +11,9 @@ CeladonMart5Object: ; 0x49085 (size=55) db $4 ; objects object SPRITE_GENTLEMAN, $e, $5, WALK, $1, $1 ; person - object SPRITE_SAILOR, $2, $6, FACE, STAY, $2 ; person - object SPRITE_MART_GUY, $5, $3, FACE, DOWN, $3 ; person - object SPRITE_MART_GUY, $6, $3, FACE, DOWN, $4 ; person + object SPRITE_SAILOR, $2, $6, STAY, NONE, $2 ; person + object SPRITE_MART_GUY, $5, $3, STAY, DOWN, $3 ; person + object SPRITE_MART_GUY, $6, $3, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP CELADON_MART_5_WIDTH, $1, $c ; CELADON_MART_ROOF diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/celadonmartroof.asm index f4bcf8e2..82830cf2 100755 --- a/data/mapObjects/celadonmartroof.asm +++ b/data/mapObjects/celadonmartroof.asm @@ -11,7 +11,7 @@ CeladonMartRoofObject: ; 0x485a8 (size=36) db $2, $d, $6 ; CeladonMartRoofText6 db $2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $a, $4, FACE, RIGHT, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $a, $4, STAY, LEFT, $1 ; person object SPRITE_LITTLE_GIRL, $5, $5, WALK, $0, $2 ; person ; warp-to diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/celadonpokecenter.asm index 1bdf7ad4..ccc30ce7 100755 --- a/data/mapObjects/celadonpokecenter.asm +++ b/data/mapObjects/celadonpokecenter.asm @@ -8,10 +8,10 @@ CeladonPokecenterObject: ; 0x488d2 (size=44) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person object SPRITE_FOULARD_WOMAN, $a, $5, WALK, $0, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/celadonprizeroom.asm index d5ccac9c..73ca7598 100755 --- a/data/mapObjects/celadonprizeroom.asm +++ b/data/mapObjects/celadonprizeroom.asm @@ -11,7 +11,7 @@ CeladonPrizeRoomObject: ; 0x49108 (size=41) db $2, $6, $5 ; CeladonPrizeRoomText5 db $2 ; objects - object SPRITE_BALDING_GUY, $1, $4, FACE, STAY, $1 ; person + object SPRITE_BALDING_GUY, $1, $4, STAY, NONE, $1 ; person object SPRITE_GAMBLER, $7, $3, WALK, $2, $2 ; person ; warp-to diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 5dc51512..0be79c17 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -22,17 +22,17 @@ CeruleanCityObject: ; 0x18786 (size=170) db $15, $1b, $11 ; CeruleanCityText17 db $b ; objects - object SPRITE_BLUE, $14, $2, FACE, DOWN, $1 ; person - object SPRITE_ROCKET, $1e, $8, FACE, STAY, $2, ROCKET + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, FACE, DOWN, $3 ; person + object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person + object SPRITE_ROCKET, $1e, $8, STAY, NONE, $2, ROCKET + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person - object SPRITE_GUARD, $1c, $c, FACE, DOWN, $6 ; person - object SPRITE_LASS, $1d, $1a, FACE, RIGHT, $7 ; person - object SPRITE_SLOWBRO, $1c, $1a, FACE, DOWN, $8 ; person + object SPRITE_GUARD, $1c, $c, STAY, DOWN, $6 ; person + object SPRITE_LASS, $1d, $1a, STAY, LEFT, $7 ; person + object SPRITE_SLOWBRO, $1c, $1a, STAY, DOWN, $8 ; person object SPRITE_LASS, $9, $1b, WALK, $2, $9 ; person - object SPRITE_BLACK_HAIR_BOY_2, $4, $c, FACE, DOWN, $a ; person - object SPRITE_GUARD, $1b, $c, FACE, DOWN, $b ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $c, STAY, DOWN, $a ; person + object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person ; warp-to EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm index 239e27fb..23d06d53 100755 --- a/data/mapObjects/ceruleangym.asm +++ b/data/mapObjects/ceruleangym.asm @@ -8,10 +8,10 @@ CeruleanGymObject: ; 0x5c834 (size=50) db $0 ; signs db $4 ; objects - object SPRITE_BRUNETTE_GIRL, $4, $2, FACE, DOWN, $1, MISTY + $C8, $1 - object SPRITE_LASS, $2, $3, FACE, LEFT, $2, JR__TRAINER_F + $C8, $1 - object SPRITE_SWIMMER, $8, $7, FACE, RIGHT, $3, SWIMMER + $C8, $1 - object SPRITE_GYM_HELPER, $7, $a, FACE, DOWN, $4 ; person + object SPRITE_BRUNETTE_GIRL, $4, $2, STAY, DOWN, $1, MISTY + $C8, $1 + object SPRITE_LASS, $2, $3, STAY, RIGHT, $2, JR__TRAINER_F + $C8, $1 + object SPRITE_SWIMMER, $8, $7, STAY, LEFT, $3, SWIMMER + $C8, $1 + object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP CERULEAN_GYM_WIDTH, $d, $4 diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index 6d1e7154..db0be014 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -8,8 +8,8 @@ CeruleanHouse1Object: ; 0x1d710 (size=32) db $0 ; signs db $2 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, FACE, RIGHT, $1 ; person - object SPRITE_GAMBLER, $1, $2, FACE, STAY, $2 ; person + object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, STAY, LEFT, $1 ; person + object SPRITE_GAMBLER, $1, $2, STAY, NONE, $2 ; person ; warp-to EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/ceruleanhouse2.asm index f74d2b02..24fe3a5e 100755 --- a/data/mapObjects/ceruleanhouse2.asm +++ b/data/mapObjects/ceruleanhouse2.asm @@ -9,7 +9,7 @@ CeruleanHouse2Object: ; 0x74ebe (size=34) db $0 ; signs db $1 ; objects - object SPRITE_FAT_BALD_GUY, $5, $3, FACE, LEFT, $1 ; person + object SPRITE_FAT_BALD_GUY, $5, $3, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $0, $2 diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/ceruleanhousetrashed.asm index 57210482..0c896120 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/ceruleanhousetrashed.asm @@ -10,7 +10,7 @@ CeruleanHouseTrashedObject: ; 0x1d6bf (size=43) db $0, $3, $3 ; CeruleanHouseTrashedText3 db $2 ; objects - object SPRITE_FISHER, $2, $1, FACE, DOWN, $1 ; person + object SPRITE_FISHER, $2, $1, STAY, DOWN, $1 ; person object SPRITE_GIRL, $5, $6, WALK, $2, $2 ; person ; warp-to diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/ceruleanmart.asm index ba540723..fc400e73 100755 --- a/data/mapObjects/ceruleanmart.asm +++ b/data/mapObjects/ceruleanmart.asm @@ -8,7 +8,7 @@ CeruleanMartObject: ; 0x5c8a8 (size=38) db $0 ; signs db $3 ; objects - object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person object SPRITE_BLACK_HAIR_BOY_1, $3, $4, WALK, $1, $2 ; person object SPRITE_LASS, $6, $2, WALK, $2, $3 ; person diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 5ee65625..930995dd 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -8,10 +8,10 @@ CeruleanPokecenterObject: ; 0x5c65f (size=44) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_BLACK_HAIR_BOY_2, $a, $5, WALK, $0, $2 ; person - object SPRITE_GENTLEMAN, $4, $3, FACE, DOWN, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person + object SPRITE_GENTLEMAN, $4, $3, STAY, DOWN, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/cinnabargym.asm index 26783c95..21afcbdf 100755 --- a/data/mapObjects/cinnabargym.asm +++ b/data/mapObjects/cinnabargym.asm @@ -8,15 +8,15 @@ CinnabarGymObject: ; 0x75acc (size=90) db $0 ; signs db $9 ; objects - object SPRITE_FAT_BALD_GUY, $3, $3, FACE, DOWN, $1, BLAINE + $C8, $1 - object SPRITE_BLACK_HAIR_BOY_2, $11, $2, FACE, DOWN, $2, SUPER_NERD + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $11, $8, FACE, DOWN, $3, BURGLAR + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_2, $b, $4, FACE, DOWN, $4, SUPER_NERD + $C8, $a - object SPRITE_BLACK_HAIR_BOY_2, $b, $8, FACE, DOWN, $5, BURGLAR + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $b, $e, FACE, DOWN, $6, SUPER_NERD + $C8, $b - object SPRITE_BLACK_HAIR_BOY_2, $3, $e, FACE, DOWN, $7, BURGLAR + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_2, $3, $8, FACE, DOWN, $8, SUPER_NERD + $C8, $c - object SPRITE_GYM_HELPER, $10, $d, FACE, DOWN, $9 ; person + object SPRITE_FAT_BALD_GUY, $3, $3, STAY, DOWN, $1, BLAINE + $C8, $1 + object SPRITE_BLACK_HAIR_BOY_2, $11, $2, STAY, DOWN, $2, SUPER_NERD + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $11, $8, STAY, DOWN, $3, BURGLAR + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_2, $b, $4, STAY, DOWN, $4, SUPER_NERD + $C8, $a + object SPRITE_BLACK_HAIR_BOY_2, $b, $8, STAY, DOWN, $5, BURGLAR + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_2, $b, $e, STAY, DOWN, $6, SUPER_NERD + $C8, $b + object SPRITE_BLACK_HAIR_BOY_2, $3, $e, STAY, DOWN, $7, BURGLAR + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, DOWN, $8, SUPER_NERD + $C8, $c + object SPRITE_GYM_HELPER, $10, $d, STAY, DOWN, $9 ; person ; warp-to EVENT_DISP CINNABAR_GYM_WIDTH, $11, $10 diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/cinnabarisland.asm index 1dcaa6e2..7c8e80fb 100755 --- a/data/mapObjects/cinnabarisland.asm +++ b/data/mapObjects/cinnabarisland.asm @@ -17,7 +17,7 @@ CinnabarIslandObject: ; 0x1c022 (size=71) db $2 ; objects object SPRITE_GIRL, $c, $5, WALK, $2, $1 ; person - object SPRITE_GAMBLER, $e, $6, FACE, STAY, $2 ; person + object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person ; warp-to EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $6 ; MANSION_1 diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/cinnabarmart.asm index 15fb0d80..057ce048 100755 --- a/data/mapObjects/cinnabarmart.asm +++ b/data/mapObjects/cinnabarmart.asm @@ -8,9 +8,9 @@ CinnabarMartObject: ; 0x75e91 (size=38) db $0 ; signs db $3 ; objects - object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person - object SPRITE_ERIKA, $6, $2, FACE, STAY, $2 ; person - object SPRITE_OAK_AIDE, $3, $4, FACE, STAY, $3 ; person + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_ERIKA, $6, $2, STAY, NONE, $2 ; person + object SPRITE_OAK_AIDE, $3, $4, STAY, NONE, $3 ; person ; warp-to EVENT_DISP CINNABAR_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/cinnabarpokecenter.asm index ec2b25e4..f144db96 100755 --- a/data/mapObjects/cinnabarpokecenter.asm +++ b/data/mapObjects/cinnabarpokecenter.asm @@ -8,10 +8,10 @@ CinnabarPokecenterObject: ; 0x75e46 (size=44) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_LASS, $9, $4, WALK, $0, $2 ; person - object SPRITE_GENTLEMAN, $2, $6, FACE, STAY, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person + object SPRITE_GENTLEMAN, $2, $6, STAY, NONE, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/copycatshouse1f.asm index 56ca06b5..96787714 100755 --- a/data/mapObjects/copycatshouse1f.asm +++ b/data/mapObjects/copycatshouse1f.asm @@ -9,8 +9,8 @@ CopycatsHouse1FObject: ; 0x75ee3 (size=46) db $0 ; signs db $3 ; objects - object SPRITE_MOM_GEISHA, $2, $2, FACE, DOWN, $1 ; person - object SPRITE_FAT_BALD_GUY, $5, $4, FACE, RIGHT, $2 ; person + object SPRITE_MOM_GEISHA, $2, $2, STAY, DOWN, $1 ; person + object SPRITE_FAT_BALD_GUY, $5, $4, STAY, LEFT, $2 ; person object SPRITE_CLEFAIRY, $1, $4, WALK, $1, $3 ; person ; warp-to diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/copycatshouse2f.asm index f97befd4..204c429f 100755 --- a/data/mapObjects/copycatshouse2f.asm +++ b/data/mapObjects/copycatshouse2f.asm @@ -11,9 +11,9 @@ CopycatsHouse2FObject: ; 0x5cd21 (size=48) db $5 ; objects object SPRITE_BRUNETTE_GIRL, $4, $3, WALK, $0, $1 ; person object SPRITE_BIRD, $4, $6, WALK, $2, $2 ; person - object SPRITE_SLOWBRO, $5, $1, FACE, DOWN, $3 ; person - object SPRITE_BIRD, $2, $0, FACE, DOWN, $4 ; person - object SPRITE_CLEFAIRY, $1, $6, FACE, LEFT, $5 ; person + object SPRITE_SLOWBRO, $5, $1, STAY, DOWN, $3 ; person + object SPRITE_BIRD, $2, $0, STAY, DOWN, $4 ; person + object SPRITE_CLEFAIRY, $1, $6, STAY, RIGHT, $5 ; person ; warp-to EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/daycarem.asm index 7f47bbd3..7fbbf13b 100755 --- a/data/mapObjects/daycarem.asm +++ b/data/mapObjects/daycarem.asm @@ -8,7 +8,7 @@ DayCareMObject: ; 0x56459 (size=26) db $0 ; signs db $1 ; objects - object SPRITE_GENTLEMAN, $2, $3, FACE, LEFT, $1 ; person + object SPRITE_GENTLEMAN, $2, $3, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP DAYCAREM_WIDTH, $7, $2 diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/diglettscaveroute11.asm index b20e2b78..d77e649d 100755 --- a/data/mapObjects/diglettscaveroute11.asm +++ b/data/mapObjects/diglettscaveroute11.asm @@ -9,7 +9,7 @@ DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34) db $0 ; signs db $1 ; objects - object SPRITE_GAMBLER, $2, $3, FACE, STAY, $1 ; person + object SPRITE_GAMBLER, $2, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $2 diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/diglettscaveroute2.asm index c51a84e1..a905305b 100755 --- a/data/mapObjects/diglettscaveroute2.asm +++ b/data/mapObjects/diglettscaveroute2.asm @@ -9,7 +9,7 @@ DiglettsCaveRoute2Object: ; 0x1debf (size=34) db $0 ; signs db $1 ; objects - object SPRITE_FISHER, $3, $3, FACE, STAY, $1 ; person + object SPRITE_FISHER, $3, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $2 diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm index 4113343e..6f65b287 100755 --- a/data/mapObjects/fanclub.asm +++ b/data/mapObjects/fanclub.asm @@ -10,12 +10,12 @@ FanClubObject: ; 0x59c97 (size=62) db $0, $6, $8 ; FanClubText8 db $6 ; objects - object SPRITE_FISHER2, $6, $3, FACE, RIGHT, $1 ; person - object SPRITE_GIRL, $1, $3, FACE, LEFT, $2 ; person - object SPRITE_CLEFAIRY, $6, $4, FACE, RIGHT, $3 ; person - object SPRITE_SEEL, $1, $4, FACE, LEFT, $4 ; person - object SPRITE_GENTLEMAN, $3, $1, FACE, DOWN, $5 ; person - object SPRITE_CABLE_CLUB_WOMAN, $5, $1, FACE, DOWN, $6 ; person + object SPRITE_FISHER2, $6, $3, STAY, LEFT, $1 ; person + object SPRITE_GIRL, $1, $3, STAY, RIGHT, $2 ; person + object SPRITE_CLEFAIRY, $6, $4, STAY, LEFT, $3 ; person + object SPRITE_SEEL, $1, $4, STAY, RIGHT, $4 ; person + object SPRITE_GENTLEMAN, $3, $1, STAY, DOWN, $5 ; person + object SPRITE_CABLE_CLUB_WOMAN, $5, $1, STAY, DOWN, $6 ; person ; warp-to EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $2 diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/fightingdojo.asm index ae8b89dc..042791e1 100755 --- a/data/mapObjects/fightingdojo.asm +++ b/data/mapObjects/fightingdojo.asm @@ -8,13 +8,13 @@ FightingDojoObject: ; 0x5cf9b (size=72) db $0 ; signs db $7 ; objects - object SPRITE_HIKER, $5, $3, FACE, DOWN, $1, BLACKBELT + $C8, $1 - object SPRITE_HIKER, $3, $4, FACE, LEFT, $2, BLACKBELT + $C8, $2 - object SPRITE_HIKER, $3, $6, FACE, LEFT, $3, BLACKBELT + $C8, $3 - object SPRITE_HIKER, $5, $5, FACE, RIGHT, $4, BLACKBELT + $C8, $4 - object SPRITE_HIKER, $5, $7, FACE, RIGHT, $5, BLACKBELT + $C8, $5 - object SPRITE_BALL, $4, $1, FACE, STAY, $6 ; person - object SPRITE_BALL, $5, $1, FACE, STAY, $7 ; person + object SPRITE_HIKER, $5, $3, STAY, DOWN, $1, BLACKBELT + $C8, $1 + object SPRITE_HIKER, $3, $4, STAY, RIGHT, $2, BLACKBELT + $C8, $2 + object SPRITE_HIKER, $3, $6, STAY, RIGHT, $3, BLACKBELT + $C8, $3 + object SPRITE_HIKER, $5, $5, STAY, LEFT, $4, BLACKBELT + $C8, $4 + object SPRITE_HIKER, $5, $7, STAY, LEFT, $5, BLACKBELT + $C8, $5 + object SPRITE_BALL, $4, $1, STAY, NONE, $6 ; person + object SPRITE_BALL, $5, $1, STAY, NONE, $7 ; person ; warp-to EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $4 diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index 8fa30ef0..85f801d9 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -31,14 +31,14 @@ FuchsiaCityObject: ; 0x18bd4 (size=178) db $a ; objects object SPRITE_BUG_CATCHER, $a, $c, WALK, $2, $1 ; person object SPRITE_GAMBLER, $1c, $11, WALK, $2, $2 ; person - object SPRITE_FISHER2, $1e, $e, FACE, DOWN, $3 ; person - object SPRITE_BUG_CATCHER, $18, $8, FACE, UP, $4 ; person + object SPRITE_FISHER2, $1e, $e, STAY, DOWN, $3 ; person + object SPRITE_BUG_CATCHER, $18, $8, STAY, UP, $4 ; person object SPRITE_CLEFAIRY, $1f, $5, WALK, $0, $5 ; person - object SPRITE_BALL, $19, $6, FACE, STAY, $6 ; person + object SPRITE_BALL, $19, $6, STAY, NONE, $6 ; person object SPRITE_SLOWBRO, $c, $6, WALK, $2, $7 ; person object SPRITE_SLOWBRO, $1e, $c, WALK, $2, $8 ; person object SPRITE_SEEL, $8, $11, WALK, $0, $9 ; person - object SPRITE_OMANYTE, $6, $5, FACE, STAY, $a ; person + object SPRITE_OMANYTE, $6, $5, STAY, NONE, $a ; person ; warp-to EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $5 ; FUCHSIA_MART diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index 12834fe4..1d082f62 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -8,14 +8,14 @@ FuchsiaGymObject: ; 0x75658 (size=82) db $0 ; signs db $8 ; objects - object SPRITE_BLACKBELT, $4, $a, FACE, DOWN, $1, KOGA + $C8, $1 - object SPRITE_ROCKER, $8, $d, FACE, DOWN, $2, JUGGLER + $C8, $7 - object SPRITE_ROCKER, $7, $8, FACE, LEFT, $3, JUGGLER + $C8, $3 - object SPRITE_ROCKER, $1, $c, FACE, DOWN, $4, JUGGLER + $C8, $8 - object SPRITE_ROCKER, $3, $5, FACE, UP, $5, TAMER + $C8, $1 - object SPRITE_ROCKER, $8, $2, FACE, DOWN, $6, TAMER + $C8, $2 - object SPRITE_ROCKER, $2, $7, FACE, RIGHT, $7, JUGGLER + $C8, $4 - object SPRITE_GYM_HELPER, $7, $f, FACE, DOWN, $8 ; person + object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, KOGA + $C8, $1 + object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, JUGGLER + $C8, $7 + object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, JUGGLER + $C8, $3 + object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, JUGGLER + $C8, $8 + object SPRITE_ROCKER, $3, $5, STAY, UP, $5, TAMER + $C8, $1 + object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, TAMER + $C8, $2 + object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, JUGGLER + $C8, $4 + object SPRITE_GYM_HELPER, $7, $f, STAY, DOWN, $8 ; person ; warp-to EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/fuchsiahouse1.asm index da44e7d3..0789ea2c 100755 --- a/data/mapObjects/fuchsiahouse1.asm +++ b/data/mapObjects/fuchsiahouse1.asm @@ -8,9 +8,9 @@ FuchsiaHouse1Object: ; 0x75031 (size=38) db $0 ; signs db $3 ; objects - object SPRITE_MOM_GEISHA, $2, $3, FACE, LEFT, $1 ; person - object SPRITE_GAMBLER, $7, $2, FACE, UP, $2 ; person - object SPRITE_BUG_CATCHER, $5, $5, FACE, STAY, $3 ; person + object SPRITE_MOM_GEISHA, $2, $3, STAY, RIGHT, $1 ; person + object SPRITE_GAMBLER, $7, $2, STAY, UP, $2 ; person + object SPRITE_BUG_CATCHER, $5, $5, STAY, NONE, $3 ; person ; warp-to EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/fuchsiahouse2.asm index 8fb8fd34..f3aa5e7c 100755 --- a/data/mapObjects/fuchsiahouse2.asm +++ b/data/mapObjects/fuchsiahouse2.asm @@ -10,9 +10,9 @@ FuchsiaHouse2Object: ; 0x75180 (size=45) db $3, $5, $5 ; FuchsiaHouse2Text5 db $3 ; objects - object SPRITE_WARDEN, $2, $3, FACE, STAY, $1 ; person - object SPRITE_BALL, $8, $3, FACE, STAY, $2, RARE_CANDY - object SPRITE_BOULDER, $8, $4, FACE, BOULDER_MOVEMENT_BYTE_2, $3 ; person + object SPRITE_WARDEN, $2, $3, STAY, NONE, $1 ; person + object SPRITE_BALL, $8, $3, STAY, NONE, $2, RARE_CANDY + object SPRITE_BOULDER, $8, $4, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person ; warp-to EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4 diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/fuchsiahouse3.asm index 4c0962ac..3fd056e9 100755 --- a/data/mapObjects/fuchsiahouse3.asm +++ b/data/mapObjects/fuchsiahouse3.asm @@ -9,7 +9,7 @@ FuchsiaHouse3Object: ; 0x56221 (size=34) db $0 ; signs db $1 ; objects - object SPRITE_FISHER, $5, $3, FACE, LEFT, $1 ; person + object SPRITE_FISHER, $5, $3, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $0, $2 diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/fuchsiamart.asm index 52c51910..eb85d110 100755 --- a/data/mapObjects/fuchsiamart.asm +++ b/data/mapObjects/fuchsiamart.asm @@ -8,8 +8,8 @@ FuchsiaMartObject: ; 0x1dd9b (size=38) db $0 ; signs db $3 ; objects - object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person - object SPRITE_FAT_BALD_GUY, $4, $2, FACE, STAY, $2 ; person + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_FAT_BALD_GUY, $4, $2, STAY, NONE, $2 ; person object SPRITE_LASS, $6, $5, WALK, $1, $3 ; person ; warp-to diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/fuchsiameetingroom.asm index 5e0541e5..36afcfd8 100755 --- a/data/mapObjects/fuchsiameetingroom.asm +++ b/data/mapObjects/fuchsiameetingroom.asm @@ -8,9 +8,9 @@ FuchsiaMeetingRoomObject: ; 0x756fc (size=38) db $0 ; signs db $3 ; objects - object SPRITE_WHITE_PLAYER, $4, $1, FACE, DOWN, $1 ; person - object SPRITE_WHITE_PLAYER, $0, $2, FACE, UP, $2 ; person - object SPRITE_WHITE_PLAYER, $a, $1, FACE, DOWN, $3 ; person + object SPRITE_WHITE_PLAYER, $4, $1, STAY, DOWN, $1 ; person + object SPRITE_WHITE_PLAYER, $0, $2, STAY, UP, $2 ; person + object SPRITE_WHITE_PLAYER, $a, $1, STAY, DOWN, $3 ; person ; warp-to EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $4 diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/fuchsiapokecenter.asm index c5d37611..19b2c950 100755 --- a/data/mapObjects/fuchsiapokecenter.asm +++ b/data/mapObjects/fuchsiapokecenter.asm @@ -8,10 +8,10 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person - object SPRITE_ROCKER, $2, $3, FACE, STAY, $2 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_ROCKER, $2, $3, STAY, NONE, $2 ; person object SPRITE_LASS, $6, $5, WALK, $2, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index 3f3eb89a..c14efcf0 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -10,8 +10,8 @@ GaryObject: ; 0x7612f (size=48) db $0 ; signs db $2 ; objects - object SPRITE_BLUE, $4, $2, FACE, DOWN, $1 ; person - object SPRITE_OAK, $3, $7, FACE, UP, $2 ; person + object SPRITE_BLUE, $4, $2, STAY, DOWN, $1 ; person + object SPRITE_OAK, $3, $7, STAY, UP, $2 ; person ; warp-to EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $3 ; LANCES_ROOM diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm index 3b77a05c..b21b1f4e 100755 --- a/data/mapObjects/halloffameroom.asm +++ b/data/mapObjects/halloffameroom.asm @@ -8,7 +8,7 @@ HallofFameRoomObject: ; 0x5a571 (size=26) db $0 ; signs db $1 ; objects - object SPRITE_OAK, $5, $2, FACE, DOWN, $1 ; person + object SPRITE_OAK, $5, $2, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP HALL_OF_FAME_WIDTH, $7, $4 ; CHAMPIONS_ROOM diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/indigoplateaulobby.asm index 15e6720d..dfcd97b7 100755 --- a/data/mapObjects/indigoplateaulobby.asm +++ b/data/mapObjects/indigoplateaulobby.asm @@ -9,11 +9,11 @@ IndigoPlateauLobbyObject: ; 0x19c95 (size=58) db $0 ; signs db $5 ; objects - object SPRITE_NURSE, $7, $5, FACE, DOWN, $1 ; person - object SPRITE_GYM_HELPER, $4, $9, FACE, LEFT, $2 ; person - object SPRITE_LASS, $5, $1, FACE, DOWN, $3 ; person - object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $4 ; person - object SPRITE_CABLE_CLUB_WOMAN, $d, $6, FACE, DOWN, $5 ; person + object SPRITE_NURSE, $7, $5, STAY, DOWN, $1 ; person + object SPRITE_GYM_HELPER, $4, $9, STAY, RIGHT, $2 ; person + object SPRITE_LASS, $5, $1, STAY, DOWN, $3 ; person + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $4 ; person + object SPRITE_CABLE_CLUB_WOMAN, $d, $6, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7 diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm index cc4f17a5..a2e05e14 100755 --- a/data/mapObjects/lab1.asm +++ b/data/mapObjects/lab1.asm @@ -15,7 +15,7 @@ Lab1Object: ; 0x75bb3 (size=62) db $4, $11, $5 ; Lab1Text5 db $1 ; objects - object SPRITE_FISHER, $1, $3, FACE, STAY, $1 ; person + object SPRITE_FISHER, $1, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $2 diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 53801f67..89ed5f2c 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -8,9 +8,9 @@ Lab2Object: ; 0x75c45 (size=38) db $0 ; signs db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $2, FACE, DOWN, $1 ; person - object SPRITE_OLD_PERSON, $1, $4, FACE, STAY, $2 ; person - object SPRITE_FOULARD_WOMAN, $5, $5, FACE, UP, $3 ; person + object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, DOWN, $1 ; person + object SPRITE_OLD_PERSON, $1, $4, STAY, NONE, $2 ; person + object SPRITE_FOULARD_WOMAN, $5, $5, STAY, UP, $3 ; person ; warp-to EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $2 ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/lab3.asm index e6de877c..8aca194b 100755 --- a/data/mapObjects/lab3.asm +++ b/data/mapObjects/lab3.asm @@ -11,7 +11,7 @@ Lab3Object: ; 0x75cec (size=41) db $1, $2, $5 ; Lab3Text5 db $2 ; objects - object SPRITE_OAK_AIDE, $7, $2, FACE, DOWN, $1 ; person + object SPRITE_OAK_AIDE, $7, $2, STAY, DOWN, $1 ; person object SPRITE_OAK_AIDE, $2, $3, WALK, $2, $2 ; person ; warp-to diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm index 7f7be1fd..47f301c9 100755 --- a/data/mapObjects/lab4.asm +++ b/data/mapObjects/lab4.asm @@ -9,7 +9,7 @@ Lab4Object: ; 0x75df0 (size=32) db $2 ; objects object SPRITE_OAK_AIDE, $5, $2, WALK, $2, $1 ; person - object SPRITE_OAK_AIDE, $7, $6, FACE, UP, $2 ; person + object SPRITE_OAK_AIDE, $7, $6, STAY, UP, $2 ; person ; warp-to EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $2 ; CINNABAR_LAB_1 diff --git a/data/mapObjects/lance.asm b/data/mapObjects/lance.asm index 316720ed..42a3e83b 100755 --- a/data/mapObjects/lance.asm +++ b/data/mapObjects/lance.asm @@ -9,7 +9,7 @@ LanceObject: ; 0x5a3c5 (size=36) db $0 ; signs db $1 ; objects - object SPRITE_LANCE, $6, $1, FACE, DOWN, $1, LANCE + $C8, $1 + object SPRITE_LANCE, $6, $1, STAY, DOWN, $1, LANCE + $C8, $1 ; warp-to EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/lavenderhouse1.asm index 0b198199..45707121 100755 --- a/data/mapObjects/lavenderhouse1.asm +++ b/data/mapObjects/lavenderhouse1.asm @@ -8,12 +8,12 @@ LavenderHouse1Object: ; 0x1d96a (size=56) db $0 ; signs db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $5, FACE, STAY, $1 ; person - object SPRITE_LITTLE_GIRL, $6, $3, FACE, DOWN, $2 ; person - object SPRITE_SLOWBRO, $6, $4, FACE, UP, $3 ; person - object SPRITE_SLOWBRO, $1, $3, FACE, STAY, $4 ; person - object SPRITE_MR_FUJI, $3, $1, FACE, STAY, $5 ; person - object SPRITE_BOOK_MAP_DEX, $3, $3, FACE, STAY, $6 ; person + object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, NONE, $1 ; person + object SPRITE_LITTLE_GIRL, $6, $3, STAY, DOWN, $2 ; person + object SPRITE_SLOWBRO, $6, $4, STAY, UP, $3 ; person + object SPRITE_SLOWBRO, $1, $3, STAY, NONE, $4 ; person + object SPRITE_MR_FUJI, $3, $1, STAY, NONE, $5 ; person + object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $6 ; person ; warp-to EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/lavenderhouse2.asm index 5eb427ca..a8641204 100755 --- a/data/mapObjects/lavenderhouse2.asm +++ b/data/mapObjects/lavenderhouse2.asm @@ -8,8 +8,8 @@ LavenderHouse2Object: ; 0x1d9e6 (size=32) db $0 ; signs db $2 ; objects - object SPRITE_SLOWBRO, $3, $5, FACE, UP, $1 ; person - object SPRITE_BRUNETTE_GIRL, $2, $4, FACE, LEFT, $2 ; person + object SPRITE_SLOWBRO, $3, $5, STAY, UP, $1 ; person + object SPRITE_BRUNETTE_GIRL, $2, $4, STAY, RIGHT, $2 ; person ; warp-to EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/lavendermart.asm index 9825311b..d23f21ae 100755 --- a/data/mapObjects/lavendermart.asm +++ b/data/mapObjects/lavendermart.asm @@ -8,9 +8,9 @@ LavenderMartObject: ; 0x5c95d (size=38) db $0 ; signs db $3 ; objects - object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person - object SPRITE_BALDING_GUY, $3, $4, FACE, STAY, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $7, $2, FACE, STAY, $3 ; person + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_BALDING_GUY, $3, $4, STAY, NONE, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $7, $2, STAY, NONE, $3 ; person ; warp-to EVENT_DISP LAVENDER_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/lavenderpokecenter.asm index dd52d07b..b421c3a4 100755 --- a/data/mapObjects/lavenderpokecenter.asm +++ b/data/mapObjects/lavenderpokecenter.asm @@ -8,10 +8,10 @@ LavenderPokecenterObject: ; 0x5c8f4 (size=44) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person - object SPRITE_GENTLEMAN, $5, $3, FACE, STAY, $2 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $5, $3, STAY, NONE, $2 ; person object SPRITE_LITTLE_GIRL, $2, $6, WALK, $1, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/lavendertown.asm index 46781595..fb78f139 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/lavendertown.asm @@ -19,7 +19,7 @@ LavenderTownObject: ; 0x4402d (size=88) db $3 ; objects object SPRITE_LITTLE_GIRL, $f, $9, WALK, $0, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $9, $a, FACE, STAY, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $9, $a, STAY, NONE, $2 ; person object SPRITE_BLACK_HAIR_BOY_2, $8, $7, WALK, $2, $3 ; person ; warp-to diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/lorelei.asm index 4cffb012..dc318326 100755 --- a/data/mapObjects/lorelei.asm +++ b/data/mapObjects/lorelei.asm @@ -10,7 +10,7 @@ LoreleiObject: ; 0x76280 (size=44) db $0 ; signs db $1 ; objects - object SPRITE_LORELEI, $5, $2, FACE, DOWN, $1, LORELEI + $C8, $1 + object SPRITE_LORELEI, $5, $2, STAY, DOWN, $1, LORELEI + $C8, $1 ; warp-to EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm index 0e890098..30b79433 100755 --- a/data/mapObjects/mansion1.asm +++ b/data/mapObjects/mansion1.asm @@ -14,9 +14,9 @@ Mansion1Object: ; 0x443a4 (size=90) db $0 ; signs db $3 ; objects - object SPRITE_OAK_AIDE, $11, $11, FACE, RIGHT, $1, SCIENTIST + $C8, $4 - object SPRITE_BALL, $e, $3, FACE, STAY, $2, ESCAPE_ROPE - object SPRITE_BALL, $12, $15, FACE, STAY, $3, CARBOS + object SPRITE_OAK_AIDE, $11, $11, STAY, LEFT, $1, SCIENTIST + $C8, $4 + object SPRITE_BALL, $e, $3, STAY, NONE, $2, ESCAPE_ROPE + object SPRITE_BALL, $12, $15, STAY, NONE, $3, CARBOS ; warp-to EVENT_DISP MANSION_1_WIDTH, $1b, $4 diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm index d3fdf9fd..b9a7b551 100755 --- a/data/mapObjects/mansion2.asm +++ b/data/mapObjects/mansion2.asm @@ -11,9 +11,9 @@ Mansion2Object: ; 0x520d1 (size=63) db $4 ; objects object SPRITE_BLACK_HAIR_BOY_2, $3, $11, WALK, $2, $1, BURGLAR + $C8, $7 - object SPRITE_BALL, $1c, $7, FACE, STAY, $2, CALCIUM - object SPRITE_BOOK_MAP_DEX, $12, $2, FACE, STAY, $3 ; person - object SPRITE_BOOK_MAP_DEX, $3, $16, FACE, STAY, $4 ; person + object SPRITE_BALL, $1c, $7, STAY, NONE, $2, CALCIUM + object SPRITE_BOOK_MAP_DEX, $12, $2, STAY, NONE, $3 ; person + object SPRITE_BOOK_MAP_DEX, $3, $16, STAY, NONE, $4 ; person ; warp-to EVENT_DISP MANSION_2_WIDTH, $a, $5 ; MANSION_1 diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/mansion3.asm index f956f122..52b46327 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/mansion3.asm @@ -10,10 +10,10 @@ Mansion3Object: ; 0x522e6 (size=64) db $5 ; objects object SPRITE_BLACK_HAIR_BOY_2, $5, $b, WALK, $2, $1, BURGLAR + $C8, $8 - object SPRITE_OAK_AIDE, $14, $b, FACE, RIGHT, $2, SCIENTIST + $C8, $c - object SPRITE_BALL, $1, $10, FACE, STAY, $3, MAX_POTION - object SPRITE_BALL, $19, $5, FACE, STAY, $4, IRON - object SPRITE_BOOK_MAP_DEX, $6, $c, FACE, STAY, $5 ; person + object SPRITE_OAK_AIDE, $14, $b, STAY, LEFT, $2, SCIENTIST + $C8, $c + object SPRITE_BALL, $1, $10, STAY, NONE, $3, MAX_POTION + object SPRITE_BALL, $19, $5, STAY, NONE, $4, IRON + object SPRITE_BOOK_MAP_DEX, $6, $c, STAY, NONE, $5 ; person ; warp-to EVENT_DISP MANSION_3_WIDTH, $a, $7 ; MANSION_2 diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm index 67e81064..6d5cac47 100755 --- a/data/mapObjects/mansion4.asm +++ b/data/mapObjects/mansion4.asm @@ -7,14 +7,14 @@ Mansion4Object: ; 0x52498 (size=69) db $0 ; signs db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $10, $17, FACE, STAY, $1, BURGLAR + $C8, $9 - object SPRITE_OAK_AIDE, $1b, $b, FACE, DOWN, $2, SCIENTIST + $C8, $d - object SPRITE_BALL, $a, $2, FACE, STAY, $3, RARE_CANDY - object SPRITE_BALL, $1, $16, FACE, STAY, $4, FULL_RESTORE - object SPRITE_BALL, $13, $19, FACE, STAY, $5, TM_14 - object SPRITE_BALL, $5, $4, FACE, STAY, $6, TM_22 - object SPRITE_BOOK_MAP_DEX, $10, $14, FACE, STAY, $7 ; person - object SPRITE_BALL, $5, $d, FACE, STAY, $8, SECRET_KEY + object SPRITE_BLACK_HAIR_BOY_2, $10, $17, STAY, NONE, $1, BURGLAR + $C8, $9 + object SPRITE_OAK_AIDE, $1b, $b, STAY, DOWN, $2, SCIENTIST + $C8, $d + object SPRITE_BALL, $a, $2, STAY, NONE, $3, RARE_CANDY + object SPRITE_BALL, $1, $16, STAY, NONE, $4, FULL_RESTORE + object SPRITE_BALL, $13, $19, STAY, NONE, $5, TM_14 + object SPRITE_BALL, $5, $4, STAY, NONE, $6, TM_22 + object SPRITE_BOOK_MAP_DEX, $10, $14, STAY, NONE, $7 ; person + object SPRITE_BALL, $5, $d, STAY, NONE, $8, SECRET_KEY ; warp-to EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1 diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index 6444ca10..3c9bcc80 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -12,19 +12,19 @@ MtMoon1Object: ; 0x49b06 (size=145) db $17, $f, $e ; MtMoon1Text14 db $d ; objects - object SPRITE_HIKER, $5, $6, FACE, DOWN, $1, HIKER + $C8, $1 - object SPRITE_BUG_CATCHER, $c, $10, FACE, LEFT, $2, YOUNGSTER + $C8, $3 - object SPRITE_LASS, $1e, $4, FACE, DOWN, $3, LASS + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, FACE, UP, $4, SUPER_NERD + $C8, $1 - object SPRITE_LASS, $10, $17, FACE, DOWN, $5, LASS + $C8, $6 - object SPRITE_BUG_CATCHER, $7, $16, FACE, DOWN, $6, BUG_CATCHER + $C8, $7 - object SPRITE_BUG_CATCHER, $1e, $1b, FACE, LEFT, $7, BUG_CATCHER + $C8, $8 - object SPRITE_BALL, $2, $14, FACE, STAY, $8, POTION - object SPRITE_BALL, $2, $2, FACE, STAY, $9, MOON_STONE - object SPRITE_BALL, $23, $1f, FACE, STAY, $a, RARE_CANDY - object SPRITE_BALL, $24, $17, FACE, STAY, $b, ESCAPE_ROPE - object SPRITE_BALL, $14, $21, FACE, STAY, $c, POTION - object SPRITE_BALL, $5, $20, FACE, STAY, $d, TM_12 + object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, HIKER + $C8, $1 + object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, YOUNGSTER + $C8, $3 + object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, LASS + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, SUPER_NERD + $C8, $1 + object SPRITE_LASS, $10, $17, STAY, DOWN, $5, LASS + $C8, $6 + object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, BUG_CATCHER + $C8, $7 + object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, BUG_CATCHER + $C8, $8 + object SPRITE_BALL, $2, $14, STAY, NONE, $8, POTION + object SPRITE_BALL, $2, $2, STAY, NONE, $9, MOON_STONE + object SPRITE_BALL, $23, $1f, STAY, NONE, $a, RARE_CANDY + object SPRITE_BALL, $24, $17, STAY, NONE, $b, ESCAPE_ROPE + object SPRITE_BALL, $14, $21, STAY, NONE, $c, POTION + object SPRITE_BALL, $5, $20, STAY, NONE, $d, TM_12 ; warp-to EVENT_DISP MT_MOON_1_WIDTH, $23, $e diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 41e925c6..3bcfe40f 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -10,15 +10,15 @@ MtMoon3Object: ; 0x49fdb (size=102) db $0 ; signs db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $c, $8, FACE, LEFT, $1, SUPER_NERD + $C8, $2 - object SPRITE_ROCKET, $b, $10, FACE, DOWN, $2, ROCKET + $C8, $1 - object SPRITE_ROCKET, $f, $16, FACE, DOWN, $3, ROCKET + $C8, $2 - object SPRITE_ROCKET, $1d, $b, FACE, UP, $4, ROCKET + $C8, $3 - object SPRITE_ROCKET, $1d, $11, FACE, RIGHT, $5, ROCKET + $C8, $4 - object SPRITE_OMANYTE, $c, $6, FACE, STAY, $6 ; person - object SPRITE_OMANYTE, $d, $6, FACE, STAY, $7 ; person - object SPRITE_BALL, $19, $15, FACE, STAY, $8, HP_UP - object SPRITE_BALL, $1d, $5, FACE, STAY, $9, TM_01 + object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, SUPER_NERD + $C8, $2 + object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, ROCKET + $C8, $1 + object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, ROCKET + $C8, $2 + object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, ROCKET + $C8, $3 + object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, ROCKET + $C8, $4 + object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person + object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person + object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP + object SPRITE_BALL, $1d, $5, STAY, NONE, $9, TM_01 ; warp-to EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2 diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index b15813fc..d6cd35ba 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -8,12 +8,12 @@ MtMoonPokecenterObject: ; 0x49376 (size=56) db $0 ; signs db $6 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person - object SPRITE_BUG_CATCHER, $4, $3, FACE, UP, $2 ; person - object SPRITE_GENTLEMAN, $7, $3, FACE, UP, $3 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_BUG_CATCHER, $4, $3, STAY, UP, $2 ; person + object SPRITE_GENTLEMAN, $7, $3, STAY, UP, $3 ; person object SPRITE_FAT_BALD_GUY, $a, $6, WALK, $2, $4 ; person - object SPRITE_CLIPBOARD, $7, $2, FACE, STAY, $5 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $6 ; person + object SPRITE_CLIPBOARD, $7, $2, STAY, NONE, $5 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $6 ; person ; warp-to EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm index 84cb1da4..208a19c8 100755 --- a/data/mapObjects/museum1f.asm +++ b/data/mapObjects/museum1f.asm @@ -11,11 +11,11 @@ Museum1FObject: ; 0x5c2c1 (size=74) db $0 ; signs db $5 ; objects - object SPRITE_OAK_AIDE, $c, $4, FACE, RIGHT, $1 ; person - object SPRITE_GAMBLER, $1, $4, FACE, STAY, $2 ; person - object SPRITE_OAK_AIDE, $f, $2, FACE, DOWN, $3 ; person - object SPRITE_OAK_AIDE, $11, $4, FACE, STAY, $4 ; person - object SPRITE_OLD_AMBER, $10, $2, FACE, STAY, $5 ; person + object SPRITE_OAK_AIDE, $c, $4, STAY, LEFT, $1 ; person + object SPRITE_GAMBLER, $1, $4, STAY, NONE, $2 ; person + object SPRITE_OAK_AIDE, $f, $2, STAY, DOWN, $3 ; person + object SPRITE_OAK_AIDE, $11, $4, STAY, NONE, $4 ; person + object SPRITE_OLD_AMBER, $10, $2, STAY, NONE, $5 ; person ; warp-to EVENT_DISP MUSEUM_1F_WIDTH, $7, $a diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/museum2f.asm index 80b2ce56..77ea061b 100755 --- a/data/mapObjects/museum2f.asm +++ b/data/mapObjects/museum2f.asm @@ -10,10 +10,10 @@ Museum2FObject: ; 0x5c34b (size=48) db $5 ; objects object SPRITE_BUG_CATCHER, $1, $7, WALK, $2, $1 ; person - object SPRITE_OLD_PERSON, $0, $5, FACE, DOWN, $2 ; person - object SPRITE_OAK_AIDE, $7, $5, FACE, DOWN, $3 ; person - object SPRITE_BRUNETTE_GIRL, $b, $5, FACE, STAY, $4 ; person - object SPRITE_HIKER, $c, $5, FACE, DOWN, $5 ; person + object SPRITE_OLD_PERSON, $0, $5, STAY, DOWN, $2 ; person + object SPRITE_OAK_AIDE, $7, $5, STAY, DOWN, $3 ; person + object SPRITE_BRUNETTE_GIRL, $b, $5, STAY, NONE, $4 ; person + object SPRITE_HIKER, $c, $5, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/namerater.asm index be2dab30..28dcf48f 100755 --- a/data/mapObjects/namerater.asm +++ b/data/mapObjects/namerater.asm @@ -8,7 +8,7 @@ NameRaterObject: ; 0x1dad6 (size=26) db $0 ; signs db $1 ; objects - object SPRITE_MR_MASTERBALL, $5, $3, FACE, RIGHT, $1 ; person + object SPRITE_MR_MASTERBALL, $5, $3, STAY, LEFT, $1 ; person ; warp-to EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/oakslab.asm index 77c3b8d1..0cfe9328 100755 --- a/data/mapObjects/oakslab.asm +++ b/data/mapObjects/oakslab.asm @@ -8,17 +8,17 @@ OaksLabObject: ; 0x1d40a (size=88) db $0 ; signs db $b ; objects - object SPRITE_BLUE, $4, $3, FACE, STAY, $1, SONY1 + $C8, $1 - object SPRITE_BALL, $6, $3, FACE, STAY, $2 ; person - object SPRITE_BALL, $7, $3, FACE, STAY, $3 ; person - object SPRITE_BALL, $8, $3, FACE, STAY, $4 ; person - object SPRITE_OAK, $5, $2, FACE, DOWN, $5 ; person - object SPRITE_BOOK_MAP_DEX, $2, $1, FACE, STAY, $6 ; person - object SPRITE_BOOK_MAP_DEX, $3, $1, FACE, STAY, $7 ; person - object SPRITE_OAK, $5, $a, FACE, UP, $8 ; person + object SPRITE_BLUE, $4, $3, STAY, NONE, $1, SONY1 + $C8, $1 + object SPRITE_BALL, $6, $3, STAY, NONE, $2 ; person + object SPRITE_BALL, $7, $3, STAY, NONE, $3 ; person + object SPRITE_BALL, $8, $3, STAY, NONE, $4 ; person + object SPRITE_OAK, $5, $2, STAY, DOWN, $5 ; person + object SPRITE_BOOK_MAP_DEX, $2, $1, STAY, NONE, $6 ; person + object SPRITE_BOOK_MAP_DEX, $3, $1, STAY, NONE, $7 ; person + object SPRITE_OAK, $5, $a, STAY, UP, $8 ; person object SPRITE_GIRL, $1, $9, WALK, $1, $9 ; person - object SPRITE_OAK_AIDE, $2, $a, FACE, STAY, $a ; person - object SPRITE_OAK_AIDE, $8, $a, FACE, STAY, $b ; person + object SPRITE_OAK_AIDE, $2, $a, STAY, NONE, $a ; person + object SPRITE_OAK_AIDE, $8, $a, STAY, NONE, $b ; person ; warp-to EVENT_DISP OAKS_LAB_WIDTH, $b, $4 diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/pallettown.asm index f0a1c8eb..4832246f 100755 --- a/data/mapObjects/pallettown.asm +++ b/data/mapObjects/pallettown.asm @@ -13,7 +13,7 @@ PalletTownObject: ; 0x182c3 (size=58) db $5, $b, $7 ; PalletTownText7 db $3 ; objects - object SPRITE_OAK, $8, $5, FACE, STAY, $1 ; person + object SPRITE_OAK, $8, $5, STAY, NONE, $1 ; person object SPRITE_GIRL, $3, $8, WALK, $0, $2 ; person object SPRITE_FISHER2, $b, $e, WALK, $0, $3 ; person diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/pewtercity.asm index fcaa97b9..27a559fc 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/pewtercity.asm @@ -20,11 +20,11 @@ PewterCityObject: ; 0x18577 (size=111) db $17, $19, $c ; PewterCityText12 db $5 ; objects - object SPRITE_LASS, $8, $f, FACE, STAY, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $11, $19, FACE, STAY, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $1b, $11, FACE, STAY, $3 ; person + object SPRITE_LASS, $8, $f, STAY, NONE, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $11, $19, STAY, NONE, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $1b, $11, STAY, NONE, $3 ; person object SPRITE_BLACK_HAIR_BOY_2, $1a, $19, WALK, $2, $4 ; person - object SPRITE_BUG_CATCHER, $23, $10, FACE, DOWN, $5 ; person + object SPRITE_BUG_CATCHER, $23, $10, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP PEWTER_CITY_WIDTH, $7, $e ; MUSEUM_1F diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm index 0381db07..13909781 100755 --- a/data/mapObjects/pewtergym.asm +++ b/data/mapObjects/pewtergym.asm @@ -8,9 +8,9 @@ PewterGymObject: ; 0x5c52e (size=42) db $0 ; signs db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $4, $1, FACE, DOWN, $1, BROCK + $C8, $1 - object SPRITE_BLACK_HAIR_BOY_1, $3, $6, FACE, LEFT, $2, JR__TRAINER_M + $C8, $1 - object SPRITE_GYM_HELPER, $7, $a, FACE, DOWN, $3 ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $1, STAY, DOWN, $1, BROCK + $C8, $1 + object SPRITE_BLACK_HAIR_BOY_1, $3, $6, STAY, RIGHT, $2, JR__TRAINER_M + $C8, $1 + object SPRITE_GYM_HELPER, $7, $a, STAY, DOWN, $3 ; person ; warp-to EVENT_DISP PEWTER_GYM_WIDTH, $d, $4 diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/pewterhouse1.asm index 2600a370..8dcac05c 100755 --- a/data/mapObjects/pewterhouse1.asm +++ b/data/mapObjects/pewterhouse1.asm @@ -8,9 +8,9 @@ PewterHouse1Object: ; 0x1d616 (size=38) db $0 ; signs db $3 ; objects - object SPRITE_SLOWBRO, $4, $5, FACE, RIGHT, $1 ; person - object SPRITE_YOUNG_BOY, $3, $5, FACE, LEFT, $2 ; person - object SPRITE_FAT_BALD_GUY, $1, $2, FACE, STAY, $3 ; person + object SPRITE_SLOWBRO, $4, $5, STAY, LEFT, $1 ; person + object SPRITE_YOUNG_BOY, $3, $5, STAY, RIGHT, $2 ; person + object SPRITE_FAT_BALD_GUY, $1, $2, STAY, NONE, $3 ; person ; warp-to EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/pewterhouse2.asm index ac0d8ad0..b4b8f2e7 100755 --- a/data/mapObjects/pewterhouse2.asm +++ b/data/mapObjects/pewterhouse2.asm @@ -8,8 +8,8 @@ PewterHouse2Object: ; 0x1d659 (size=32) db $0 ; signs db $2 ; objects - object SPRITE_GAMBLER, $2, $3, FACE, LEFT, $1 ; person - object SPRITE_BUG_CATCHER, $4, $5, FACE, STAY, $2 ; person + object SPRITE_GAMBLER, $2, $3, STAY, RIGHT, $1 ; person + object SPRITE_BUG_CATCHER, $4, $5, STAY, NONE, $2 ; person ; warp-to EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/pewtermart.asm index a6ff161b..2ef08e29 100755 --- a/data/mapObjects/pewtermart.asm +++ b/data/mapObjects/pewtermart.asm @@ -8,9 +8,9 @@ PewterMartObject: ; 0x74cda (size=38) db $0 ; signs db $3 ; objects - object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person object SPRITE_BUG_CATCHER, $3, $3, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_2, $5, $5, FACE, STAY, $3 ; person + object SPRITE_BLACK_HAIR_BOY_2, $5, $5, STAY, NONE, $3 ; person ; warp-to EVENT_DISP PEWTER_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index 21b22b0a..86757244 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -8,10 +8,10 @@ PewterPokecenterObject: ; 0x5c60d (size=44) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person - object SPRITE_GENTLEMAN, $b, $7, FACE, RIGHT, $2 ; person - object SPRITE_CLEFAIRY, $1, $3, FACE, DOWN, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_GENTLEMAN, $b, $7, STAY, LEFT, $2 ; person + object SPRITE_CLEFAIRY, $1, $3, STAY, DOWN, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/pokemontower1.asm index b3aea3f8..eb71be9e 100755 --- a/data/mapObjects/pokemontower1.asm +++ b/data/mapObjects/pokemontower1.asm @@ -9,11 +9,11 @@ PokemonTower1Object: ; 0x60452 (size=58) db $0 ; signs db $5 ; objects - object SPRITE_CABLE_CLUB_WOMAN, $f, $d, FACE, UP, $1 ; person - object SPRITE_MOM_GEISHA, $6, $8, FACE, STAY, $2 ; person - object SPRITE_BALDING_GUY, $8, $c, FACE, STAY, $3 ; person - object SPRITE_GIRL, $d, $7, FACE, STAY, $4 ; person - object SPRITE_MEDIUM, $11, $7, FACE, RIGHT, $5 ; person + object SPRITE_CABLE_CLUB_WOMAN, $f, $d, STAY, UP, $1 ; person + object SPRITE_MOM_GEISHA, $6, $8, STAY, NONE, $2 ; person + object SPRITE_BALDING_GUY, $8, $c, STAY, NONE, $3 ; person + object SPRITE_GIRL, $d, $7, STAY, NONE, $4 ; person + object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $5 ; person ; warp-to EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm index 21e23a79..57ba7363 100755 --- a/data/mapObjects/pokemontower2.asm +++ b/data/mapObjects/pokemontower2.asm @@ -8,8 +8,8 @@ PokemonTower2Object: ; 0x60646 (size=32) db $0 ; signs db $2 ; objects - object SPRITE_BLUE, $e, $5, FACE, STAY, $1 ; person - object SPRITE_MEDIUM, $3, $7, FACE, LEFT, $2 ; person + object SPRITE_BLUE, $e, $5, STAY, NONE, $1 ; person + object SPRITE_MEDIUM, $3, $7, STAY, RIGHT, $2 ; person ; warp-to EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $3 ; POKEMONTOWER_3 diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm index c083c267..a3580e23 100755 --- a/data/mapObjects/pokemontower3.asm +++ b/data/mapObjects/pokemontower3.asm @@ -8,10 +8,10 @@ PokemonTower3Object: ; 0x6075d (size=51) db $0 ; signs db $4 ; objects - object SPRITE_MEDIUM, $c, $3, FACE, RIGHT, $1, CHANNELER + $C8, $5 - object SPRITE_MEDIUM, $9, $8, FACE, DOWN, $2, CHANNELER + $C8, $6 - object SPRITE_MEDIUM, $a, $d, FACE, DOWN, $3, CHANNELER + $C8, $8 - object SPRITE_BALL, $c, $1, FACE, STAY, $4, ESCAPE_ROPE + object SPRITE_MEDIUM, $c, $3, STAY, LEFT, $1, CHANNELER + $C8, $5 + object SPRITE_MEDIUM, $9, $8, STAY, DOWN, $2, CHANNELER + $C8, $6 + object SPRITE_MEDIUM, $a, $d, STAY, DOWN, $3, CHANNELER + $C8, $8 + object SPRITE_BALL, $c, $1, STAY, NONE, $4, ESCAPE_ROPE ; warp-to EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2 diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm index b3e9f4d7..de95d1b0 100755 --- a/data/mapObjects/pokemontower4.asm +++ b/data/mapObjects/pokemontower4.asm @@ -8,12 +8,12 @@ PokemonTower4Object: ; 0x6088b (size=65) db $0 ; signs db $6 ; objects - object SPRITE_MEDIUM, $5, $a, FACE, LEFT, $1, CHANNELER + $C8, $9 - object SPRITE_MEDIUM, $f, $7, FACE, DOWN, $2, CHANNELER + $C8, $a - object SPRITE_MEDIUM, $e, $c, FACE, RIGHT, $3, CHANNELER + $C8, $c - object SPRITE_BALL, $c, $a, FACE, STAY, $4, ELIXER - object SPRITE_BALL, $9, $a, FACE, STAY, $5, AWAKENING - object SPRITE_BALL, $c, $10, FACE, STAY, $6, HP_UP + object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, CHANNELER + $C8, $9 + object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, CHANNELER + $C8, $a + object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, CHANNELER + $C8, $c + object SPRITE_BALL, $c, $a, STAY, NONE, $4, ELIXER + object SPRITE_BALL, $9, $a, STAY, NONE, $5, AWAKENING + object SPRITE_BALL, $c, $10, STAY, NONE, $6, HP_UP ; warp-to EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $3 ; POKEMONTOWER_5 diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm index a48847f5..bb3f1882 100755 --- a/data/mapObjects/pokemontower5.asm +++ b/data/mapObjects/pokemontower5.asm @@ -8,12 +8,12 @@ PokemonTower5Object: ; 0x60a48 (size=65) db $0 ; signs db $6 ; objects - object SPRITE_MEDIUM, $c, $8, FACE, STAY, $1 ; person - object SPRITE_MEDIUM, $11, $7, FACE, RIGHT, $2, CHANNELER + $C8, $e - object SPRITE_MEDIUM, $e, $3, FACE, RIGHT, $3, CHANNELER + $C8, $10 - object SPRITE_MEDIUM, $6, $a, FACE, LEFT, $4, CHANNELER + $C8, $11 - object SPRITE_MEDIUM, $9, $10, FACE, LEFT, $5, CHANNELER + $C8, $12 - object SPRITE_BALL, $6, $e, FACE, STAY, $6, NUGGET + object SPRITE_MEDIUM, $c, $8, STAY, NONE, $1 ; person + object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $2, CHANNELER + $C8, $e + object SPRITE_MEDIUM, $e, $3, STAY, LEFT, $3, CHANNELER + $C8, $10 + object SPRITE_MEDIUM, $6, $a, STAY, RIGHT, $4, CHANNELER + $C8, $11 + object SPRITE_MEDIUM, $9, $10, STAY, RIGHT, $5, CHANNELER + $C8, $12 + object SPRITE_BALL, $6, $e, STAY, NONE, $6, NUGGET ; warp-to EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $3 ; POKEMONTOWER_4 diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm index 4119d12b..56dcc404 100755 --- a/data/mapObjects/pokemontower6.asm +++ b/data/mapObjects/pokemontower6.asm @@ -8,11 +8,11 @@ PokemonTower6Object: ; 0x60c5b (size=58) db $0 ; signs db $5 ; objects - object SPRITE_MEDIUM, $c, $a, FACE, LEFT, $1, CHANNELER + $C8, $13 - object SPRITE_MEDIUM, $9, $5, FACE, DOWN, $2, CHANNELER + $C8, $14 - object SPRITE_MEDIUM, $10, $5, FACE, RIGHT, $3, CHANNELER + $C8, $15 - object SPRITE_BALL, $6, $8, FACE, STAY, $4, RARE_CANDY - object SPRITE_BALL, $e, $e, FACE, STAY, $5, X_ACCURACY + object SPRITE_MEDIUM, $c, $a, STAY, RIGHT, $1, CHANNELER + $C8, $13 + object SPRITE_MEDIUM, $9, $5, STAY, DOWN, $2, CHANNELER + $C8, $14 + object SPRITE_MEDIUM, $10, $5, STAY, LEFT, $3, CHANNELER + $C8, $15 + object SPRITE_BALL, $6, $8, STAY, NONE, $4, RARE_CANDY + object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY ; warp-to EVENT_DISP POKEMONTOWER_6_WIDTH, $9, $12 ; POKEMONTOWER_5 diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/pokemontower7.asm index 1ad73bb8..270f3aa7 100755 --- a/data/mapObjects/pokemontower7.asm +++ b/data/mapObjects/pokemontower7.asm @@ -8,15 +8,15 @@ PokemonTower7Object: ; 0x60ef6 (size=42) IF DEF(_YELLOW) db 3 ; objects - object SPRITE_JESSIE, $a 8, 8, FACE, DOWN, 1 - object SPRITE_JAMES, $b, 8, FACE, DOWN, 2 - object SPRITE_MR_FUJI, $a, 3, FACE, DOWN, 3 + object SPRITE_JESSIE, $a 8, 8, STAY, DOWN, 1 + object SPRITE_JAMES, $b, 8, STAY, DOWN, 2 + object SPRITE_MR_FUJI, $a, 3, STAY, DOWN, 3 ELSE db $4 ; objects - object SPRITE_ROCKET, $9, $b, FACE, LEFT, $1, ROCKET + $C8, $13 - object SPRITE_ROCKET, $c, $9, FACE, RIGHT, $2, ROCKET + $C8, $14 - object SPRITE_ROCKET, $9, $7, FACE, LEFT, $3, ROCKET + $C8, $15 - object SPRITE_MR_FUJI, $a, $3, FACE, DOWN, $4 ; person + object SPRITE_ROCKET, $9, $b, STAY, RIGHT, $1, ROCKET + $C8, $13 + object SPRITE_ROCKET, $c, $9, STAY, LEFT, $2, ROCKET + $C8, $14 + object SPRITE_ROCKET, $9, $7, STAY, RIGHT, $3, ROCKET + $C8, $15 + object SPRITE_MR_FUJI, $a, $3, STAY, DOWN, $4 ; person ENDC ; warp-to diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/powerplant.asm index 822192b6..a4c5d8ea 100755 --- a/data/mapObjects/powerplant.asm +++ b/data/mapObjects/powerplant.asm @@ -9,20 +9,20 @@ PowerPlantObject: ; 0x1e3bf (size=135) db $0 ; signs db $e ; objects - object SPRITE_BALL, $9, $14, FACE, STAY, $1, VOLTORB, 40 - object SPRITE_BALL, $20, $12, FACE, STAY, $2, VOLTORB, 40 - object SPRITE_BALL, $15, $19, FACE, STAY, $3, VOLTORB, 40 - object SPRITE_BALL, $19, $12, FACE, STAY, $4, ELECTRODE, 43 - object SPRITE_BALL, $17, $22, FACE, STAY, $5, VOLTORB, 40 - object SPRITE_BALL, $1a, $1c, FACE, STAY, $6, VOLTORB, 40 - object SPRITE_BALL, $15, $e, FACE, STAY, $7, ELECTRODE, 43 - object SPRITE_BALL, $25, $20, FACE, STAY, $8, VOLTORB, 40 - object SPRITE_BIRD, $4, $9, FACE, UP, $9, ZAPDOS, 50 - object SPRITE_BALL, $7, $19, FACE, STAY, $a, CARBOS - object SPRITE_BALL, $1c, $3, FACE, STAY, $b, HP_UP - object SPRITE_BALL, $22, $3, FACE, STAY, $c, RARE_CANDY - object SPRITE_BALL, $1a, $20, FACE, STAY, $d, TM_25 - object SPRITE_BALL, $14, $20, FACE, STAY, $e, TM_33 + object SPRITE_BALL, $9, $14, STAY, NONE, $1, VOLTORB, 40 + object SPRITE_BALL, $20, $12, STAY, NONE, $2, VOLTORB, 40 + object SPRITE_BALL, $15, $19, STAY, NONE, $3, VOLTORB, 40 + object SPRITE_BALL, $19, $12, STAY, NONE, $4, ELECTRODE, 43 + object SPRITE_BALL, $17, $22, STAY, NONE, $5, VOLTORB, 40 + object SPRITE_BALL, $1a, $1c, STAY, NONE, $6, VOLTORB, 40 + object SPRITE_BALL, $15, $e, STAY, NONE, $7, ELECTRODE, 43 + object SPRITE_BALL, $25, $20, STAY, NONE, $8, VOLTORB, 40 + object SPRITE_BIRD, $4, $9, STAY, UP, $9, ZAPDOS, 50 + object SPRITE_BALL, $7, $19, STAY, NONE, $a, CARBOS + object SPRITE_BALL, $1c, $3, STAY, NONE, $b, HP_UP + object SPRITE_BALL, $22, $3, STAY, NONE, $c, RARE_CANDY + object SPRITE_BALL, $1a, $20, STAY, NONE, $d, TM_25 + object SPRITE_BALL, $14, $20, STAY, NONE, $e, TM_33 ; warp-to EVENT_DISP POWER_PLANT_WIDTH, $23, $4 diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/redshouse1f.asm index 8cae7a4e..4f977b2c 100755 --- a/data/mapObjects/redshouse1f.asm +++ b/data/mapObjects/redshouse1f.asm @@ -10,7 +10,7 @@ RedsHouse1FObject: ; 481e4 (12:41e4) db $1, $3, $2 ; TV db $1 ; objects - object SPRITE_MOM, $5, $4, FACE, RIGHT, $1 ; Mom + object SPRITE_MOM, $5, $4, STAY, LEFT, $1 ; Mom ; warp-to EVENT_DISP REDS_HOUSE_1F_WIDTH, $7, $2 diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/rockethideout1.asm index 7216872e..a1a87350 100755 --- a/data/mapObjects/rockethideout1.asm +++ b/data/mapObjects/rockethideout1.asm @@ -11,13 +11,13 @@ RocketHideout1Object: ; 0x44ce7 (size=98) db $0 ; signs db $7 ; objects - object SPRITE_ROCKET, $1a, $8, FACE, RIGHT, $1, ROCKET + $C8, $8 - object SPRITE_ROCKET, $c, $6, FACE, LEFT, $2, ROCKET + $C8, $9 - object SPRITE_ROCKET, $12, $11, FACE, DOWN, $3, ROCKET + $C8, $a - object SPRITE_ROCKET, $f, $19, FACE, LEFT, $4, ROCKET + $C8, $b - object SPRITE_ROCKET, $1c, $12, FACE, RIGHT, $5, ROCKET + $C8, $c - object SPRITE_BALL, $b, $e, FACE, STAY, $6, ESCAPE_ROPE - object SPRITE_BALL, $9, $11, FACE, STAY, $7, HYPER_POTION + object SPRITE_ROCKET, $1a, $8, STAY, LEFT, $1, ROCKET + $C8, $8 + object SPRITE_ROCKET, $c, $6, STAY, RIGHT, $2, ROCKET + $C8, $9 + object SPRITE_ROCKET, $12, $11, STAY, DOWN, $3, ROCKET + $C8, $a + object SPRITE_ROCKET, $f, $19, STAY, RIGHT, $4, ROCKET + $C8, $b + object SPRITE_ROCKET, $1c, $12, STAY, LEFT, $5, ROCKET + $C8, $c + object SPRITE_BALL, $b, $e, STAY, NONE, $6, ESCAPE_ROPE + object SPRITE_BALL, $9, $11, STAY, NONE, $7, HYPER_POTION ; warp-to EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $17 ; ROCKET_HIDEOUT_2 diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm index f80fb22d..40e19895 100755 --- a/data/mapObjects/rockethideout2.asm +++ b/data/mapObjects/rockethideout2.asm @@ -11,11 +11,11 @@ RocketHideout2Object: ; 0x450f7 (size=80) db $0 ; signs db $5 ; objects - object SPRITE_ROCKET, $14, $c, FACE, DOWN, $1, ROCKET + $C8, $d - object SPRITE_BALL, $1, $b, FACE, STAY, $2, MOON_STONE - object SPRITE_BALL, $10, $8, FACE, STAY, $3, NUGGET - object SPRITE_BALL, $6, $c, FACE, STAY, $4, TM_07 - object SPRITE_BALL, $3, $15, FACE, STAY, $5, SUPER_POTION + object SPRITE_ROCKET, $14, $c, STAY, DOWN, $1, ROCKET + $C8, $d + object SPRITE_BALL, $1, $b, STAY, NONE, $2, MOON_STONE + object SPRITE_BALL, $10, $8, STAY, NONE, $3, NUGGET + object SPRITE_BALL, $6, $c, STAY, NONE, $4, TM_07 + object SPRITE_BALL, $3, $15, STAY, NONE, $5, SUPER_POTION ; warp-to EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1 diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 8ffdcdda..3001be76 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -8,10 +8,10 @@ RocketHideout3Object: ; 0x4534d (size=50) db $0 ; signs db $4 ; objects - object SPRITE_ROCKET, $a, $16, FACE, LEFT, $1, ROCKET + $C8, $e - object SPRITE_ROCKET, $1a, $c, FACE, UP, $2, ROCKET + $C8, $f - object SPRITE_BALL, $1a, $11, FACE, STAY, $3, TM_10 - object SPRITE_BALL, $14, $e, FACE, STAY, $4, RARE_CANDY + object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, ROCKET + $C8, $e + object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, ROCKET + $C8, $f + object SPRITE_BALL, $1a, $11, STAY, NONE, $3, TM_10 + object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY ; warp-to EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2 diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index 380408cc..e11133fd 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -9,15 +9,15 @@ RocketHideout4Object: ; 0x455f1 (size=95) db $0 ; signs db $9 ; objects - object SPRITE_GIOVANNI, $19, $3, FACE, DOWN, $1, GIOVANNI + $C8, $1 - object SPRITE_ROCKET, $17, $c, FACE, DOWN, $2, ROCKET + $C8, $10 - object SPRITE_ROCKET, $1a, $c, FACE, DOWN, $3, ROCKET + $C8, $11 - object SPRITE_ROCKET, $b, $2, FACE, DOWN, $4, ROCKET + $C8, $12 - object SPRITE_BALL, $a, $c, FACE, STAY, $5, HP_UP - object SPRITE_BALL, $9, $4, FACE, STAY, $6, TM_02 - object SPRITE_BALL, $c, $14, FACE, STAY, $7, IRON - object SPRITE_BALL, $19, $2, FACE, STAY, $8, SILPH_SCOPE - object SPRITE_BALL, $a, $2, FACE, STAY, $9, LIFT_KEY + object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, GIOVANNI + $C8, $1 + object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, ROCKET + $C8, $10 + object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, ROCKET + $C8, $11 + object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, ROCKET + $C8, $12 + object SPRITE_BALL, $a, $c, STAY, NONE, $5, HP_UP + object SPRITE_BALL, $9, $4, STAY, NONE, $6, TM_02 + object SPRITE_BALL, $c, $14, STAY, NONE, $7, IRON + object SPRITE_BALL, $19, $2, STAY, NONE, $8, SILPH_SCOPE + object SPRITE_BALL, $a, $2, STAY, NONE, $9, LIFT_KEY ; warp-to EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $a, $13 ; ROCKET_HIDEOUT_3 diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm index 6da0264d..348e9e50 100755 --- a/data/mapObjects/rocktunnel1.asm +++ b/data/mapObjects/rocktunnel1.asm @@ -15,13 +15,13 @@ RockTunnel1Object: ; 0x445f6 (size=127) db $1d, $b, $8 ; RockTunnel1Text8 db $7 ; objects - object SPRITE_HIKER, $7, $5, FACE, DOWN, $1, HIKER + $C8, $c - object SPRITE_HIKER, $5, $10, FACE, DOWN, $2, HIKER + $C8, $d - object SPRITE_HIKER, $11, $f, FACE, RIGHT, $3, HIKER + $C8, $e - object SPRITE_BLACK_HAIR_BOY_2, $17, $8, FACE, RIGHT, $4, POKEMANIAC + $C8, $7 - object SPRITE_LASS, $25, $15, FACE, RIGHT, $5, JR__TRAINER_F + $C8, $11 - object SPRITE_LASS, $16, $18, FACE, DOWN, $6, JR__TRAINER_F + $C8, $12 - object SPRITE_LASS, $20, $18, FACE, LEFT, $7, JR__TRAINER_F + $C8, $13 + object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, HIKER + $C8, $c + object SPRITE_HIKER, $5, $10, STAY, DOWN, $2, HIKER + $C8, $d + object SPRITE_HIKER, $11, $f, STAY, LEFT, $3, HIKER + $C8, $e + object SPRITE_BLACK_HAIR_BOY_2, $17, $8, STAY, LEFT, $4, POKEMANIAC + $C8, $7 + object SPRITE_LASS, $25, $15, STAY, LEFT, $5, JR__TRAINER_F + $C8, $11 + object SPRITE_LASS, $16, $18, STAY, DOWN, $6, JR__TRAINER_F + $C8, $12 + object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, JR__TRAINER_F + $C8, $13 ; warp-to EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index 61014d31..7da2c3d1 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -10,14 +10,14 @@ RockTunnel2Object: ; 0x4613d (size=100) db $0 ; signs db $8 ; objects - object SPRITE_LASS, $b, $d, FACE, DOWN, $1, JR__TRAINER_F + $C8, $9 - object SPRITE_HIKER, $6, $a, FACE, DOWN, $2, HIKER + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $3, $5, FACE, DOWN, $3, POKEMANIAC + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_2, $14, $15, FACE, LEFT, $4, POKEMANIAC + $C8, $4 - object SPRITE_HIKER, $1e, $a, FACE, DOWN, $5, HIKER + $C8, $a - object SPRITE_LASS, $e, $1c, FACE, LEFT, $6, JR__TRAINER_F + $C8, $a - object SPRITE_HIKER, $21, $5, FACE, LEFT, $7, HIKER + $C8, $b - object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, FACE, DOWN, $8, POKEMANIAC + $C8, $5 + object SPRITE_LASS, $b, $d, STAY, DOWN, $1, JR__TRAINER_F + $C8, $9 + object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, HIKER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, POKEMANIAC + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, POKEMANIAC + $C8, $4 + object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, HIKER + $C8, $a + object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, JR__TRAINER_F + $C8, $a + object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, HIKER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, POKEMANIAC + $C8, $5 ; warp-to EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1 diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index 9cbe6ada..d2645165 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -8,10 +8,10 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person - object SPRITE_FISHER2, $2, $5, FACE, STAY, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person + object SPRITE_FISHER2, $2, $5, STAY, NONE, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/route10.asm b/data/mapObjects/route10.asm index 7e3ac450..b9b0cd25 100755 --- a/data/mapObjects/route10.asm +++ b/data/mapObjects/route10.asm @@ -14,12 +14,12 @@ Route10Object: ; 0x582f6 (size=96) db $29, $5, $a ; Route10Text10 db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, FACE, RIGHT, $1, POKEMANIAC + $C8, $1 - object SPRITE_HIKER, $3, $39, FACE, UP, $2, HIKER + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_2, $e, $40, FACE, RIGHT, $3, POKEMANIAC + $C8, $2 - object SPRITE_LASS, $7, $19, FACE, RIGHT, $4, JR__TRAINER_F + $C8, $7 - object SPRITE_HIKER, $3, $3d, FACE, DOWN, $5, HIKER + $C8, $8 - object SPRITE_LASS, $7, $36, FACE, DOWN, $6, JR__TRAINER_F + $C8, $8 + object SPRITE_BLACK_HAIR_BOY_2, $a, $2c, STAY, LEFT, $1, POKEMANIAC + $C8, $1 + object SPRITE_HIKER, $3, $39, STAY, UP, $2, HIKER + $C8, $7 + object SPRITE_BLACK_HAIR_BOY_2, $e, $40, STAY, LEFT, $3, POKEMANIAC + $C8, $2 + object SPRITE_LASS, $7, $19, STAY, LEFT, $4, JR__TRAINER_F + $C8, $7 + object SPRITE_HIKER, $3, $3d, STAY, DOWN, $5, HIKER + $C8, $8 + object SPRITE_LASS, $7, $36, STAY, DOWN, $6, JR__TRAINER_F + $C8, $8 ; warp-to EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index cb8f9c35..ccbd1af2 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -12,16 +12,16 @@ Route11Object: ; 0x584e0 (size=127) db $5, $1, $b ; Route11Text11 db $a ; objects - object SPRITE_GAMBLER, $a, $e, FACE, DOWN, $1, GAMBLER + $C8, $1 - object SPRITE_GAMBLER, $1a, $9, FACE, DOWN, $2, GAMBLER + $C8, $2 - object SPRITE_BUG_CATCHER, $d, $5, FACE, RIGHT, $3, YOUNGSTER + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $24, $b, FACE, DOWN, $4, ENGINEER + $C8, $2 - object SPRITE_BUG_CATCHER, $16, $4, FACE, UP, $5, YOUNGSTER + $C8, $a - object SPRITE_GAMBLER, $2d, $7, FACE, DOWN, $6, GAMBLER + $C8, $3 - object SPRITE_GAMBLER, $21, $3, FACE, UP, $7, GAMBLER + $C8, $4 - object SPRITE_BUG_CATCHER, $2b, $5, FACE, LEFT, $8, YOUNGSTER + $C8, $b - object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, FACE, RIGHT, $9, ENGINEER + $C8, $3 - object SPRITE_BUG_CATCHER, $16, $c, FACE, UP, $a, YOUNGSTER + $C8, $c + object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, GAMBLER + $C8, $1 + object SPRITE_GAMBLER, $1a, $9, STAY, DOWN, $2, GAMBLER + $C8, $2 + object SPRITE_BUG_CATCHER, $d, $5, STAY, LEFT, $3, YOUNGSTER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $24, $b, STAY, DOWN, $4, ENGINEER + $C8, $2 + object SPRITE_BUG_CATCHER, $16, $4, STAY, UP, $5, YOUNGSTER + $C8, $a + object SPRITE_GAMBLER, $2d, $7, STAY, DOWN, $6, GAMBLER + $C8, $3 + object SPRITE_GAMBLER, $21, $3, STAY, UP, $7, GAMBLER + $C8, $4 + object SPRITE_BUG_CATCHER, $2b, $5, STAY, RIGHT, $8, YOUNGSTER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, STAY, LEFT, $9, ENGINEER + $C8, $3 + object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, YOUNGSTER + $C8, $c ; warp-to EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index 3e5dd6ed..351b922c 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -11,7 +11,7 @@ Route11GateObject: ; 0x49416 (size=50) db $0 ; signs db $1 ; objects - object SPRITE_GUARD, $4, $1, FACE, STAY, $1 ; person + object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person ; warp-to EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $0 diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/route11gateupstairs.asm index b5564f63..421de945 100755 --- a/data/mapObjects/route11gateupstairs.asm +++ b/data/mapObjects/route11gateupstairs.asm @@ -10,7 +10,7 @@ Route11GateUpstairsObject: ; 0x494da (size=30) db $2 ; objects object SPRITE_BUG_CATCHER, $4, $2, WALK, $2, $1 ; person - object SPRITE_OAK_AIDE, $2, $6, FACE, STAY, $2 ; person + object SPRITE_OAK_AIDE, $2, $6, STAY, NONE, $2 ; person ; warp-to EVENT_DISP ROUTE_11_GATE_2F_WIDTH, $7, $7 ; ROUTE_11_GATE_1F diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 5a971490..82c36313 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -12,16 +12,16 @@ Route12Object: ; 0x5869a (size=118) db $3f, $b, $c ; Route12Text12 db $a ; objects - object SPRITE_SNORLAX, $a, $3e, FACE, DOWN, $1 ; person - object SPRITE_FISHER2, $e, $1f, FACE, RIGHT, $2, FISHER + $C8, $3 - object SPRITE_FISHER2, $5, $27, FACE, UP, $3, FISHER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, FACE, RIGHT, $4, JR__TRAINER_M + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, FACE, UP, $5, ROCKER + $C8, $2 - object SPRITE_FISHER2, $c, $28, FACE, RIGHT, $6, FISHER + $C8, $5 - object SPRITE_FISHER2, $9, $34, FACE, LEFT, $7, FISHER + $C8, $6 - object SPRITE_FISHER2, $6, $57, FACE, DOWN, $8, FISHER + $C8, $b - object SPRITE_BALL, $e, $23, FACE, STAY, $9, TM_16 - object SPRITE_BALL, $5, $59, FACE, STAY, $a, IRON + object SPRITE_SNORLAX, $a, $3e, STAY, DOWN, $1 ; person + object SPRITE_FISHER2, $e, $1f, STAY, LEFT, $2, FISHER + $C8, $3 + object SPRITE_FISHER2, $5, $27, STAY, UP, $3, FISHER + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_1, $b, $5c, STAY, LEFT, $4, JR__TRAINER_M + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $e, $4c, STAY, UP, $5, ROCKER + $C8, $2 + object SPRITE_FISHER2, $c, $28, STAY, LEFT, $6, FISHER + $C8, $5 + object SPRITE_FISHER2, $9, $34, STAY, RIGHT, $7, FISHER + $C8, $6 + object SPRITE_FISHER2, $6, $57, STAY, DOWN, $8, FISHER + $C8, $b + object SPRITE_BALL, $e, $23, STAY, NONE, $9, TM_16 + object SPRITE_BALL, $5, $59, STAY, NONE, $a, IRON ; warp-to EVENT_DISP ROUTE_12_WIDTH, $f, $a ; ROUTE_12_GATE_1F diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/route12gate.asm index 5b371bc2..1e2fe3f9 100755 --- a/data/mapObjects/route12gate.asm +++ b/data/mapObjects/route12gate.asm @@ -11,7 +11,7 @@ Route12GateObject: ; 0x4950e (size=50) db $0 ; signs db $1 ; objects - object SPRITE_GUARD, $1, $3, FACE, STAY, $1 ; person + object SPRITE_GUARD, $1, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $4 diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/route12house.asm index b4fdb268..fad89578 100755 --- a/data/mapObjects/route12house.asm +++ b/data/mapObjects/route12house.asm @@ -8,7 +8,7 @@ Route12HouseObject: ; 0x564de (size=26) db $0 ; signs db $1 ; objects - object SPRITE_FISHER, $2, $4, FACE, LEFT, $1 ; person + object SPRITE_FISHER, $2, $4, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/route13.asm b/data/mapObjects/route13.asm index 6705a2a2..3b2c6b87 100755 --- a/data/mapObjects/route13.asm +++ b/data/mapObjects/route13.asm @@ -9,13 +9,13 @@ Route13Object: ; 0x5482e (size=93) db $b, $1f, $d ; Route13Text13 db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $31, $a, FACE, LEFT, $1, BIRD_KEEPER + $C8, $1 - object SPRITE_LASS, $30, $a, FACE, DOWN, $2, JR__TRAINER_F + $C8, $c - object SPRITE_LASS, $1b, $9, FACE, DOWN, $3, JR__TRAINER_F + $C8, $d - object SPRITE_LASS, $17, $a, FACE, RIGHT, $4, JR__TRAINER_F + $C8, $e - object SPRITE_LASS, $32, $5, FACE, DOWN, $5, JR__TRAINER_F + $C8, $f - object SPRITE_BLACK_HAIR_BOY_1, $c, $4, FACE, LEFT, $6, BIRD_KEEPER + $C8, $2 - object SPRITE_FOULARD_WOMAN, $21, $6, FACE, DOWN, $7, BEAUTY + $C8, $4 - object SPRITE_FOULARD_WOMAN, $20, $6, FACE, DOWN, $8, BEAUTY + $C8, $5 - object SPRITE_BIKER, $a, $7, FACE, UP, $9, BIKER + $C8, $1 - object SPRITE_BLACK_HAIR_BOY_1, $7, $d, FACE, UP, $a, BIRD_KEEPER + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_1, $31, $a, STAY, RIGHT, $1, BIRD_KEEPER + $C8, $1 + object SPRITE_LASS, $30, $a, STAY, DOWN, $2, JR__TRAINER_F + $C8, $c + object SPRITE_LASS, $1b, $9, STAY, DOWN, $3, JR__TRAINER_F + $C8, $d + object SPRITE_LASS, $17, $a, STAY, LEFT, $4, JR__TRAINER_F + $C8, $e + object SPRITE_LASS, $32, $5, STAY, DOWN, $5, JR__TRAINER_F + $C8, $f + object SPRITE_BLACK_HAIR_BOY_1, $c, $4, STAY, RIGHT, $6, BIRD_KEEPER + $C8, $2 + object SPRITE_FOULARD_WOMAN, $21, $6, STAY, DOWN, $7, BEAUTY + $C8, $4 + object SPRITE_FOULARD_WOMAN, $20, $6, STAY, DOWN, $8, BEAUTY + $C8, $5 + object SPRITE_BIKER, $a, $7, STAY, UP, $9, BIKER + $C8, $1 + object SPRITE_BLACK_HAIR_BOY_1, $7, $d, STAY, UP, $a, BIRD_KEEPER + $C8, $3 diff --git a/data/mapObjects/route14.asm b/data/mapObjects/route14.asm index b7c6c421..6b8dcd40 100755 --- a/data/mapObjects/route14.asm +++ b/data/mapObjects/route14.asm @@ -7,13 +7,13 @@ Route14Object: ; 0x549bb (size=87) db $d, $11, $b ; Route14Text11 db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $4, $4, FACE, DOWN, $1, BIRD_KEEPER + $C8, $e - object SPRITE_BLACK_HAIR_BOY_1, $f, $6, FACE, DOWN, $2, BIRD_KEEPER + $C8, $f - object SPRITE_BLACK_HAIR_BOY_1, $c, $b, FACE, DOWN, $3, BIRD_KEEPER + $C8, $10 - object SPRITE_BLACK_HAIR_BOY_1, $e, $f, FACE, UP, $4, BIRD_KEEPER + $C8, $11 - object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, FACE, RIGHT, $5, BIRD_KEEPER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $6, $31, FACE, UP, $6, BIRD_KEEPER + $C8, $5 - object SPRITE_BIKER, $5, $27, FACE, DOWN, $7, BIKER + $C8, $d - object SPRITE_BIKER, $4, $1e, FACE, LEFT, $8, BIKER + $C8, $e - object SPRITE_BIKER, $f, $1e, FACE, RIGHT, $9, BIKER + $C8, $f - object SPRITE_BIKER, $4, $1f, FACE, LEFT, $a, BIKER + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_1, $4, $4, STAY, DOWN, $1, BIRD_KEEPER + $C8, $e + object SPRITE_BLACK_HAIR_BOY_1, $f, $6, STAY, DOWN, $2, BIRD_KEEPER + $C8, $f + object SPRITE_BLACK_HAIR_BOY_1, $c, $b, STAY, DOWN, $3, BIRD_KEEPER + $C8, $10 + object SPRITE_BLACK_HAIR_BOY_1, $e, $f, STAY, UP, $4, BIRD_KEEPER + $C8, $11 + object SPRITE_BLACK_HAIR_BOY_1, $f, $1f, STAY, LEFT, $5, BIRD_KEEPER + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $31, STAY, UP, $6, BIRD_KEEPER + $C8, $5 + object SPRITE_BIKER, $5, $27, STAY, DOWN, $7, BIKER + $C8, $d + object SPRITE_BIKER, $4, $1e, STAY, RIGHT, $8, BIKER + $C8, $e + object SPRITE_BIKER, $f, $1e, STAY, LEFT, $9, BIKER + $C8, $f + object SPRITE_BIKER, $4, $1f, STAY, RIGHT, $a, BIKER + $C8, $2 diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 33e8f793..32ec8d8a 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -11,17 +11,17 @@ Route15Object: ; 0x5894e (size=126) db $9, $27, $c ; Route15Text12 db $b ; objects - object SPRITE_LASS, $29, $b, FACE, DOWN, $1, JR__TRAINER_F + $C8, $14 - object SPRITE_LASS, $35, $a, FACE, RIGHT, $2, JR__TRAINER_F + $C8, $15 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, FACE, UP, $3, BIRD_KEEPER + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $23, $d, FACE, UP, $4, BIRD_KEEPER + $C8, $7 - object SPRITE_FOULARD_WOMAN, $35, $b, FACE, DOWN, $5, BEAUTY + $C8, $9 - object SPRITE_FOULARD_WOMAN, $29, $a, FACE, LEFT, $6, BEAUTY + $C8, $a - object SPRITE_BIKER, $30, $a, FACE, DOWN, $7, BIKER + $C8, $3 - object SPRITE_BIKER, $2e, $a, FACE, DOWN, $8, BIKER + $C8, $4 - object SPRITE_LASS, $25, $5, FACE, LEFT, $9, JR__TRAINER_F + $C8, $16 - object SPRITE_LASS, $12, $d, FACE, UP, $a, JR__TRAINER_F + $C8, $17 - object SPRITE_BALL, $12, $5, FACE, STAY, $b, TM_20 + object SPRITE_LASS, $29, $b, STAY, DOWN, $1, JR__TRAINER_F + $C8, $14 + object SPRITE_LASS, $35, $a, STAY, LEFT, $2, JR__TRAINER_F + $C8, $15 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, BIRD_KEEPER + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, BIRD_KEEPER + $C8, $7 + object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, BEAUTY + $C8, $9 + object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, BEAUTY + $C8, $a + object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, BIKER + $C8, $3 + object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, BIKER + $C8, $4 + object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, JR__TRAINER_F + $C8, $16 + object SPRITE_LASS, $12, $d, STAY, UP, $a, JR__TRAINER_F + $C8, $17 + object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 ; warp-to EVENT_DISP ROUTE_15_WIDTH, $8, $7 ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index 2a4e88cc..f571ee03 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -11,7 +11,7 @@ Route15GateObject: ; 0x4960c (size=50) db $0 ; signs db $1 ; objects - object SPRITE_GUARD, $4, $1, FACE, STAY, $1 ; person + object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person ; warp-to EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $0 diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/route15gateupstairs.asm index f922a6ab..4362ade0 100755 --- a/data/mapObjects/route15gateupstairs.asm +++ b/data/mapObjects/route15gateupstairs.asm @@ -8,7 +8,7 @@ Route15GateUpstairsObject: ; 4969d (12:569d) db $2, $6, $2 ; Route15GateUpstairsText2 db $1 ; objects - object SPRITE_OAK_AIDE, $4, $2, FACE, DOWN, $1 + object SPRITE_OAK_AIDE, $4, $2, STAY, DOWN, $1 ; warp-to EVENT_DISP ROUTE_15_GATE_2F_WIDTH, $7, $7 ; ROUTE_15_GATE_1F diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index e3fd619e..94adaf96 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -17,13 +17,13 @@ Route16Object: ; 0x58afc (size=136) db $11, $5, $9 ; Route16Text9 db $7 ; objects - object SPRITE_BIKER, $11, $c, FACE, RIGHT, $1, BIKER + $C8, $5 - object SPRITE_BIKER, $e, $d, FACE, LEFT, $2, CUE_BALL + $C8, $1 - object SPRITE_BIKER, $b, $c, FACE, UP, $3, CUE_BALL + $C8, $2 - object SPRITE_BIKER, $9, $b, FACE, RIGHT, $4, BIKER + $C8, $6 - object SPRITE_BIKER, $6, $a, FACE, LEFT, $5, CUE_BALL + $C8, $3 - object SPRITE_BIKER, $3, $c, FACE, LEFT, $6, BIKER + $C8, $7 - object SPRITE_SNORLAX, $1a, $a, FACE, DOWN, $7 ; person + object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, BIKER + $C8, $5 + object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, CUE_BALL + $C8, $1 + object SPRITE_BIKER, $b, $c, STAY, UP, $3, CUE_BALL + $C8, $2 + object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, BIKER + $C8, $6 + object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, CUE_BALL + $C8, $3 + object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, BIKER + $C8, $7 + object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person ; warp-to EVENT_DISP ROUTE_16_WIDTH, $a, $11 ; ROUTE_16_GATE_1F diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/route16gate.asm index c7d54664..e1da990d 100755 --- a/data/mapObjects/route16gate.asm +++ b/data/mapObjects/route16gate.asm @@ -15,8 +15,8 @@ Route16GateObject: ; 0x4978b (size=88) db $0 ; signs db $2 ; objects - object SPRITE_GUARD, $4, $5, FACE, DOWN, $1 ; person - object SPRITE_GAMBLER, $4, $3, FACE, STAY, $2 ; person + object SPRITE_GUARD, $4, $5, STAY, DOWN, $1 ; person + object SPRITE_GAMBLER, $4, $3, STAY, NONE, $2 ; person ; warp-to EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $0 diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/route16gateupstairs.asm index 4d13b0f9..d8c2db12 100755 --- a/data/mapObjects/route16gateupstairs.asm +++ b/data/mapObjects/route16gateupstairs.asm @@ -9,7 +9,7 @@ Route16GateUpstairsObject: ; 0x4984c (size=30) db $2, $6, $4 ; Route16GateUpstairsText4 db $2 ; objects - object SPRITE_YOUNG_BOY, $4, $2, FACE, STAY, $1 ; person + object SPRITE_YOUNG_BOY, $4, $2, STAY, NONE, $1 ; person object SPRITE_LITTLE_GIRL, $2, $5, WALK, $2, $2 ; person ; warp-to diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/route16house.asm index bcaf7dd4..12a846c6 100755 --- a/data/mapObjects/route16house.asm +++ b/data/mapObjects/route16house.asm @@ -8,7 +8,7 @@ Route16HouseObject: ; 0x1e657 (size=32) db $0 ; signs db $2 ; objects - object SPRITE_BRUNETTE_GIRL, $2, $3, FACE, LEFT, $1 ; person + object SPRITE_BRUNETTE_GIRL, $2, $3, STAY, RIGHT, $1 ; person object SPRITE_BIRD, $6, $4, WALK, $0, $2 ; person ; warp-to diff --git a/data/mapObjects/route17.asm b/data/mapObjects/route17.asm index d6d30921..b0f22cde 100755 --- a/data/mapObjects/route17.asm +++ b/data/mapObjects/route17.asm @@ -12,13 +12,13 @@ Route17Object: ; 0x54b42 (size=102) db $8d, $9, $10 ; Route17Text16 db $a ; objects - object SPRITE_BIKER, $c, $13, FACE, RIGHT, $1, CUE_BALL + $C8, $4 - object SPRITE_BIKER, $b, $10, FACE, LEFT, $2, CUE_BALL + $C8, $5 - object SPRITE_BIKER, $4, $12, FACE, UP, $3, BIKER + $C8, $8 - object SPRITE_BIKER, $7, $20, FACE, RIGHT, $4, BIKER + $C8, $9 - object SPRITE_BIKER, $e, $22, FACE, LEFT, $5, BIKER + $C8, $a - object SPRITE_BIKER, $11, $3a, FACE, RIGHT, $6, CUE_BALL + $C8, $6 - object SPRITE_BIKER, $2, $44, FACE, LEFT, $7, CUE_BALL + $C8, $7 - object SPRITE_BIKER, $e, $62, FACE, LEFT, $8, CUE_BALL + $C8, $8 - object SPRITE_BIKER, $5, $62, FACE, RIGHT, $9, BIKER + $C8, $b - object SPRITE_BIKER, $a, $76, FACE, DOWN, $a, BIKER + $C8, $c + object SPRITE_BIKER, $c, $13, STAY, LEFT, $1, CUE_BALL + $C8, $4 + object SPRITE_BIKER, $b, $10, STAY, RIGHT, $2, CUE_BALL + $C8, $5 + object SPRITE_BIKER, $4, $12, STAY, UP, $3, BIKER + $C8, $8 + object SPRITE_BIKER, $7, $20, STAY, LEFT, $4, BIKER + $C8, $9 + object SPRITE_BIKER, $e, $22, STAY, RIGHT, $5, BIKER + $C8, $a + object SPRITE_BIKER, $11, $3a, STAY, LEFT, $6, CUE_BALL + $C8, $6 + object SPRITE_BIKER, $2, $44, STAY, RIGHT, $7, CUE_BALL + $C8, $7 + object SPRITE_BIKER, $e, $62, STAY, RIGHT, $8, CUE_BALL + $C8, $8 + object SPRITE_BIKER, $5, $62, STAY, LEFT, $9, BIKER + $C8, $b + object SPRITE_BIKER, $a, $76, STAY, DOWN, $a, BIKER + $C8, $c diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index ff51f080..7fd24383 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -12,9 +12,9 @@ Route18Object: ; 0x58c5a (size=66) db $5, $21, $5 ; Route18Text5 db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $24, $b, FACE, LEFT, $1, BIRD_KEEPER + $C8, $8 - object SPRITE_BLACK_HAIR_BOY_1, $28, $f, FACE, RIGHT, $2, BIRD_KEEPER + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, FACE, RIGHT, $3, BIRD_KEEPER + $C8, $a + object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, BIRD_KEEPER + $C8, $8 + object SPRITE_BLACK_HAIR_BOY_1, $28, $f, STAY, LEFT, $2, BIRD_KEEPER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, BIRD_KEEPER + $C8, $a ; warp-to EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/route18gate.asm index 846a9a51..d42026da 100755 --- a/data/mapObjects/route18gate.asm +++ b/data/mapObjects/route18gate.asm @@ -11,7 +11,7 @@ Route18GateObject: ; 0x49937 (size=50) db $0 ; signs db $1 ; objects - object SPRITE_GUARD, $4, $1, FACE, DOWN, $1 ; person + object SPRITE_GUARD, $4, $1, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $0 diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 078a29fa..f86a114a 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -17,24 +17,24 @@ ENDC db $a ; objects IF DEF(_OPTION_BEACH_HOUSE) - object SPRITE_BLACK_HAIR_BOY_1, $9, $7, FACE, LEFT, 1, SWIMMER + $C8, 2 - object SPRITE_BLACK_HAIR_BOY_1, $c, $9, FACE, RIGHT, 2, SWIMMER + $C8, 3 + object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, SWIMMER + $C8, 2 + object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, SWIMMER + $C8, 3 ELSE - object SPRITE_BLACK_HAIR_BOY_1, $8, $7, FACE, RIGHT, 1, SWIMMER + $C8, 2 - object SPRITE_BLACK_HAIR_BOY_1, $d, $7, FACE, RIGHT, 2, SWIMMER + $C8, 3 + object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, SWIMMER + $C8, 2 + object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, SWIMMER + $C8, 3 ENDC - object SPRITE_SWIMMER, $d, $19, FACE, RIGHT, $3, SWIMMER + $C8, $4 - object SPRITE_SWIMMER, $4, $1b, FACE, LEFT, $4, SWIMMER + $C8, $5 - object SPRITE_SWIMMER, $10, $1f, FACE, UP, $5, SWIMMER + $C8, $6 + object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, SWIMMER + $C8, $4 + object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, SWIMMER + $C8, $5 + object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, SWIMMER + $C8, $6 IF DEF(_OPTION_BEACH_HOUSE) - object SPRITE_SWIMMER, $9, $d, FACE, DOWN, $6, SWIMMER + $C8, $7 + object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, SWIMMER + $C8, $7 ELSE - object SPRITE_SWIMMER, $9, $b, FACE, DOWN, $6, SWIMMER + $C8, $7 + object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, SWIMMER + $C8, $7 ENDC - object SPRITE_SWIMMER, $8, $2b, FACE, RIGHT, $7, BEAUTY + $C8, $c - object SPRITE_SWIMMER, $b, $2b, FACE, LEFT, $8, BEAUTY + $C8, $d - object SPRITE_SWIMMER, $9, $2a, FACE, UP, $9, SWIMMER + $C8, $8 - object SPRITE_SWIMMER, $a, $2c, FACE, DOWN, $a, BEAUTY + $C8, $e + object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, BEAUTY + $C8, $c + object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, BEAUTY + $C8, $d + object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, SWIMMER + $C8, $8 + object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, BEAUTY + $C8, $e ; warp-to IF DEF(_OPTION_BEACH_HOUSE) diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 8f1f58b4..0e6784b2 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -14,8 +14,8 @@ Route2Object: ; 0x54022 (size=72) db $b, $b, $4 ; Route2Text4 db $2 ; objects - object SPRITE_BALL, $d, $36, FACE, STAY, $1, MOON_STONE - object SPRITE_BALL, $d, $2d, FACE, STAY, $2, HP_UP + object SPRITE_BALL, $d, $36, STAY, NONE, $1, MOON_STONE + object SPRITE_BALL, $d, $2d, STAY, NONE, $2, HP_UP ; warp-to EVENT_DISP ROUTE_2_WIDTH, $9, $c ; DIGLETTS_CAVE_EXIT diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index 6b622467..00aa4684 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -10,16 +10,16 @@ Route20Object: ; 0x50113 (size=106) db $b, $39, $c ; Route20Text12 db $a ; objects - object SPRITE_SWIMMER, $57, $8, FACE, UP, $1, SWIMMER + $C8, $9 - object SPRITE_SWIMMER, $44, $b, FACE, UP, $2, BEAUTY + $C8, $f - object SPRITE_SWIMMER, $2d, $a, FACE, DOWN, $3, BEAUTY + $C8, $6 - object SPRITE_SWIMMER, $37, $e, FACE, LEFT, $4, JR__TRAINER_F + $C8, $18 - object SPRITE_SWIMMER, $26, $d, FACE, DOWN, $5, SWIMMER + $C8, $a - object SPRITE_SWIMMER, $57, $d, FACE, UP, $6, SWIMMER + $C8, $b - object SPRITE_BLACK_HAIR_BOY_1, $22, $9, FACE, UP, $7, BIRD_KEEPER + $C8, $b - object SPRITE_SWIMMER, $19, $7, FACE, UP, $8, BEAUTY + $C8, $7 - object SPRITE_SWIMMER, $18, $c, FACE, DOWN, $9, JR__TRAINER_F + $C8, $10 - object SPRITE_SWIMMER, $f, $8, FACE, UP, $a, BEAUTY + $C8, $8 + object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, SWIMMER + $C8, $9 + object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, BEAUTY + $C8, $f + object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, BEAUTY + $C8, $6 + object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, JR__TRAINER_F + $C8, $18 + object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, SWIMMER + $C8, $a + object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, SWIMMER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, BIRD_KEEPER + $C8, $b + object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, BEAUTY + $C8, $7 + object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, JR__TRAINER_F + $C8, $10 + object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, BEAUTY + $C8, $8 ; warp-to EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1 diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index d8d6e242..68e4c630 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -6,12 +6,12 @@ Route21Object: ; 0x55021 (size=76) db $0 ; signs db $9 ; objects - object SPRITE_FISHER2, $4, $18, FACE, RIGHT, $1, FISHER + $C8, $7 - object SPRITE_FISHER2, $6, $19, FACE, DOWN, $2, FISHER + $C8, $9 - object SPRITE_SWIMMER, $a, $1f, FACE, UP, $3, SWIMMER + $C8, $c - object SPRITE_SWIMMER, $c, $1e, FACE, LEFT, $4, CUE_BALL + $C8, $9 - object SPRITE_SWIMMER, $10, $3f, FACE, DOWN, $5, SWIMMER + $C8, $d - object SPRITE_SWIMMER, $5, $47, FACE, LEFT, $6, SWIMMER + $C8, $e - object SPRITE_SWIMMER, $f, $47, FACE, RIGHT, $7, SWIMMER + $C8, $f - object SPRITE_FISHER2, $e, $38, FACE, RIGHT, $8, FISHER + $C8, $8 - object SPRITE_FISHER2, $11, $39, FACE, LEFT, $9, FISHER + $C8, $a + object SPRITE_FISHER2, $4, $18, STAY, LEFT, $1, FISHER + $C8, $7 + object SPRITE_FISHER2, $6, $19, STAY, DOWN, $2, FISHER + $C8, $9 + object SPRITE_SWIMMER, $a, $1f, STAY, UP, $3, SWIMMER + $C8, $c + object SPRITE_SWIMMER, $c, $1e, STAY, RIGHT, $4, CUE_BALL + $C8, $9 + object SPRITE_SWIMMER, $10, $3f, STAY, DOWN, $5, SWIMMER + $C8, $d + object SPRITE_SWIMMER, $5, $47, STAY, RIGHT, $6, SWIMMER + $C8, $e + object SPRITE_SWIMMER, $f, $47, STAY, LEFT, $7, SWIMMER + $C8, $f + object SPRITE_FISHER2, $e, $38, STAY, LEFT, $8, FISHER + $C8, $8 + object SPRITE_FISHER2, $11, $39, STAY, RIGHT, $9, FISHER + $C8, $a diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index 0040007e..999b9d8a 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -8,8 +8,8 @@ Route22Object: ; 0x50022 (size=27) db $b, $7, $3 ; Route22FrontGateText db $2 ; objects - object SPRITE_BLUE, $19, $5, FACE, STAY, $1 ; person - object SPRITE_BLUE, $19, $5, FACE, STAY, $2 ; person + object SPRITE_BLUE, $19, $5, STAY, NONE, $1 ; person + object SPRITE_BLUE, $19, $5, STAY, NONE, $2 ; person ; warp-to EVENT_DISP ROUTE_22_WIDTH, $5, $8 ; ROUTE_22_GATE diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 87296ce4..604a8730 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -10,7 +10,7 @@ Route22GateObject: ; 0x1e720 (size=42) db $0 ; signs db $1 ; objects - object SPRITE_GUARD, $6, $2, FACE, RIGHT, $1 ; person + object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person ; warp-to EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $4 diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm index 3e8d41fd..af8c8dab 100755 --- a/data/mapObjects/route23.asm +++ b/data/mapObjects/route23.asm @@ -11,13 +11,13 @@ Route23Object: ; 0x50361 (size=81) db $21, $3, $8 ; Route23Text8 db $7 ; objects - object SPRITE_GUARD, $4, $23, FACE, DOWN, $1 ; person - object SPRITE_GUARD, $a, $38, FACE, DOWN, $2 ; person - object SPRITE_SWIMMER, $8, $55, FACE, DOWN, $3 ; person - object SPRITE_SWIMMER, $b, $60, FACE, DOWN, $4 ; person - object SPRITE_GUARD, $c, $69, FACE, DOWN, $5 ; person - object SPRITE_GUARD, $8, $77, FACE, DOWN, $6 ; person - object SPRITE_GUARD, $8, $88, FACE, DOWN, $7 ; person + object SPRITE_GUARD, $4, $23, STAY, DOWN, $1 ; person + object SPRITE_GUARD, $a, $38, STAY, DOWN, $2 ; person + object SPRITE_SWIMMER, $8, $55, STAY, DOWN, $3 ; person + object SPRITE_SWIMMER, $b, $60, STAY, DOWN, $4 ; person + object SPRITE_GUARD, $c, $69, STAY, DOWN, $5 ; person + object SPRITE_GUARD, $8, $77, STAY, DOWN, $6 ; person + object SPRITE_GUARD, $8, $88, STAY, DOWN, $7 ; person ; warp-to EVENT_DISP ROUTE_23_WIDTH, $8b, $7 ; ROUTE_22_GATE diff --git a/data/mapObjects/route24.asm b/data/mapObjects/route24.asm index f7218515..95ee726c 100755 --- a/data/mapObjects/route24.asm +++ b/data/mapObjects/route24.asm @@ -6,11 +6,11 @@ Route24Object: ; 0x506a4 (size=67) db $0 ; signs db $8 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $b, $f, FACE, RIGHT, $1, ROCKET + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $5, $14, FACE, UP, $2, JR__TRAINER_M + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $b, $13, FACE, RIGHT, $3, JR__TRAINER_M + $C8, $3 - object SPRITE_LASS, $a, $16, FACE, LEFT, $4, LASS + $C8, $7 - object SPRITE_BUG_CATCHER, $b, $19, FACE, RIGHT, $5, YOUNGSTER + $C8, $4 - object SPRITE_LASS, $a, $1c, FACE, LEFT, $6, LASS + $C8, $8 - object SPRITE_BUG_CATCHER, $b, $1f, FACE, RIGHT, $7, BUG_CATCHER + $C8, $9 - object SPRITE_BALL, $a, $5, FACE, STAY, $8, TM_45 + object SPRITE_BLACK_HAIR_BOY_1, $b, $f, STAY, LEFT, $1, ROCKET + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_1, $5, $14, STAY, UP, $2, JR__TRAINER_M + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_1, $b, $13, STAY, LEFT, $3, JR__TRAINER_M + $C8, $3 + object SPRITE_LASS, $a, $16, STAY, RIGHT, $4, LASS + $C8, $7 + object SPRITE_BUG_CATCHER, $b, $19, STAY, LEFT, $5, YOUNGSTER + $C8, $4 + object SPRITE_LASS, $a, $1c, STAY, RIGHT, $6, LASS + $C8, $8 + object SPRITE_BUG_CATCHER, $b, $1f, STAY, LEFT, $7, BUG_CATCHER + $C8, $9 + object SPRITE_BALL, $a, $5, STAY, NONE, $8, TM_45 diff --git a/data/mapObjects/route25.asm b/data/mapObjects/route25.asm index dc41df1e..aa9bfe74 100755 --- a/data/mapObjects/route25.asm +++ b/data/mapObjects/route25.asm @@ -8,16 +8,16 @@ Route25Object: ; 0x507b2 (size=94) db $3, $2b, $b ; Route25Text11 db $a ; objects - object SPRITE_BUG_CATCHER, $e, $2, FACE, DOWN, $1, YOUNGSTER + $C8, $5 - object SPRITE_BUG_CATCHER, $12, $5, FACE, UP, $2, YOUNGSTER + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_1, $18, $4, FACE, DOWN, $3, JR__TRAINER_M + $C8, $2 - object SPRITE_LASS, $12, $8, FACE, LEFT, $4, LASS + $C8, $9 - object SPRITE_BUG_CATCHER, $20, $3, FACE, RIGHT, $5, YOUNGSTER + $C8, $7 - object SPRITE_LASS, $25, $4, FACE, DOWN, $6, LASS + $C8, $a - object SPRITE_HIKER, $8, $4, FACE, LEFT, $7, HIKER + $C8, $2 - object SPRITE_HIKER, $17, $9, FACE, UP, $8, HIKER + $C8, $3 - object SPRITE_HIKER, $d, $7, FACE, LEFT, $9, HIKER + $C8, $4 - object SPRITE_BALL, $16, $2, FACE, STAY, $a, TM_19 + object SPRITE_BUG_CATCHER, $e, $2, STAY, DOWN, $1, YOUNGSTER + $C8, $5 + object SPRITE_BUG_CATCHER, $12, $5, STAY, UP, $2, YOUNGSTER + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_1, $18, $4, STAY, DOWN, $3, JR__TRAINER_M + $C8, $2 + object SPRITE_LASS, $12, $8, STAY, RIGHT, $4, LASS + $C8, $9 + object SPRITE_BUG_CATCHER, $20, $3, STAY, LEFT, $5, YOUNGSTER + $C8, $7 + object SPRITE_LASS, $25, $4, STAY, DOWN, $6, LASS + $C8, $a + object SPRITE_HIKER, $8, $4, STAY, RIGHT, $7, HIKER + $C8, $2 + object SPRITE_HIKER, $17, $9, STAY, UP, $8, HIKER + $C8, $3 + object SPRITE_HIKER, $d, $7, STAY, RIGHT, $9, HIKER + $C8, $4 + object SPRITE_BALL, $16, $2, STAY, NONE, $a, TM_19 ; warp-to EVENT_DISP ROUTE_25_WIDTH, $3, $2d ; BILLS_HOUSE diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index 34718181..9a0b79e0 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -10,7 +10,7 @@ Route2GateObject: ; 0x5d620 (size=48) db $0 ; signs db $2 ; objects - object SPRITE_OAK_AIDE, $1, $4, FACE, RIGHT, $1 ; person + object SPRITE_OAK_AIDE, $1, $4, STAY, LEFT, $1 ; person object SPRITE_BUG_CATCHER, $5, $4, WALK, $2, $2 ; person ; warp-to diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/route2house.asm index 789d51cf..b8d6d20f 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/route2house.asm @@ -8,8 +8,8 @@ Route2HouseObject: ; 0x1df07 (size=32) db $0 ; signs db $2 ; objects - object SPRITE_OAK_AIDE, $2, $4, FACE, LEFT, $1 ; person - object SPRITE_GAMEBOY_KID_COPY, $4, $1, FACE, DOWN, $2 ; person + object SPRITE_OAK_AIDE, $2, $4, STAY, RIGHT, $1 ; person + object SPRITE_GAMEBOY_KID_COPY, $4, $1, STAY, DOWN, $2 ; person ; warp-to EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/route3.asm b/data/mapObjects/route3.asm index 6b140b5f..29a6307b 100755 --- a/data/mapObjects/route3.asm +++ b/data/mapObjects/route3.asm @@ -7,12 +7,12 @@ Route3Object: ; 0x54208 (size=77) db $9, $3b, $a ; Route3Text10 db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $39, $b, FACE, STAY, $1 ; person - object SPRITE_BUG_CATCHER, $a, $6, FACE, LEFT, $2, BUG_CATCHER + $C8, $4 - object SPRITE_BUG_CATCHER, $e, $4, FACE, DOWN, $3, YOUNGSTER + $C8, $1 - object SPRITE_LASS, $10, $9, FACE, RIGHT, $4, LASS + $C8, $1 - object SPRITE_BUG_CATCHER, $13, $5, FACE, DOWN, $5, BUG_CATCHER + $C8, $5 - object SPRITE_LASS, $17, $4, FACE, RIGHT, $6, LASS + $C8, $2 - object SPRITE_BUG_CATCHER, $16, $9, FACE, RIGHT, $7, YOUNGSTER + $C8, $2 - object SPRITE_BUG_CATCHER, $18, $6, FACE, LEFT, $8, BUG_CATCHER + $C8, $6 - object SPRITE_LASS, $21, $a, FACE, UP, $9, LASS + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_2, $39, $b, STAY, NONE, $1 ; person + object SPRITE_BUG_CATCHER, $a, $6, STAY, RIGHT, $2, BUG_CATCHER + $C8, $4 + object SPRITE_BUG_CATCHER, $e, $4, STAY, DOWN, $3, YOUNGSTER + $C8, $1 + object SPRITE_LASS, $10, $9, STAY, LEFT, $4, LASS + $C8, $1 + object SPRITE_BUG_CATCHER, $13, $5, STAY, DOWN, $5, BUG_CATCHER + $C8, $5 + object SPRITE_LASS, $17, $4, STAY, LEFT, $6, LASS + $C8, $2 + object SPRITE_BUG_CATCHER, $16, $9, STAY, LEFT, $7, YOUNGSTER + $C8, $2 + object SPRITE_BUG_CATCHER, $18, $6, STAY, RIGHT, $8, BUG_CATCHER + $C8, $6 + object SPRITE_LASS, $21, $a, STAY, UP, $9, LASS + $C8, $3 diff --git a/data/mapObjects/route4.asm b/data/mapObjects/route4.asm index fe00f5d1..e91b0301 100755 --- a/data/mapObjects/route4.asm +++ b/data/mapObjects/route4.asm @@ -13,8 +13,8 @@ Route4Object: ; 0x543b2 (size=58) db $3 ; objects object SPRITE_LASS, $9, $8, WALK, $0, $1 ; person - object SPRITE_LASS, $3f, $3, FACE, LEFT, $2, LASS + $C8, $4 - object SPRITE_BALL, $39, $3, FACE, STAY, $3, TM_04 + object SPRITE_LASS, $3f, $3, STAY, RIGHT, $2, LASS + $C8, $4 + object SPRITE_BALL, $39, $3, STAY, NONE, $3, TM_04 ; warp-to EVENT_DISP ROUTE_4_WIDTH, $5, $b ; MT_MOON_POKECENTER diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/route5gate.asm index 0fda3988..db2f4564 100755 --- a/data/mapObjects/route5gate.asm +++ b/data/mapObjects/route5gate.asm @@ -10,7 +10,7 @@ Route5GateObject: ; 0x1dffb (size=42) db $0 ; signs db $1 ; objects - object SPRITE_GUARD, $1, $3, FACE, LEFT, $1 ; person + object SPRITE_GUARD, $1, $3, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $3 diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index 119eb4ec..f1702acc 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -11,12 +11,12 @@ Route6Object: ; 0x58022 (size=87) db $f, $13, $7 ; Route6Text7 db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $a, $15, FACE, LEFT, $1, JR__TRAINER_M + $C8, $4 - object SPRITE_LASS, $b, $15, FACE, RIGHT, $2, JR__TRAINER_F + $C8, $2 - object SPRITE_BUG_CATCHER, $0, $f, FACE, LEFT, $3, BUG_CATCHER + $C8, $a - object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, FACE, RIGHT, $4, JR__TRAINER_M + $C8, $5 - object SPRITE_LASS, $b, $1e, FACE, RIGHT, $5, JR__TRAINER_F + $C8, $3 - object SPRITE_BUG_CATCHER, $13, $1a, FACE, RIGHT, $6, BUG_CATCHER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, JR__TRAINER_M + $C8, $4 + object SPRITE_LASS, $b, $15, STAY, LEFT, $2, JR__TRAINER_F + $C8, $2 + object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, BUG_CATCHER + $C8, $a + object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, JR__TRAINER_M + $C8, $5 + object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, JR__TRAINER_F + $C8, $3 + object SPRITE_BUG_CATCHER, $13, $1a, STAY, LEFT, $6, BUG_CATCHER + $C8, $b ; warp-to EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/route6gate.asm index 7f57bba2..59d08e57 100755 --- a/data/mapObjects/route6gate.asm +++ b/data/mapObjects/route6gate.asm @@ -10,7 +10,7 @@ Route6GateObject: ; 0x1e0be (size=42) db $0 ; signs db $1 ; objects - object SPRITE_GUARD, $6, $2, FACE, RIGHT, $1 ; person + object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person ; warp-to EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $3 diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 447b76dc..8c618fc1 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -10,7 +10,7 @@ Route7GateObject: ; 0x1e185 (size=42) db $0 ; signs db $1 ; objects - object SPRITE_GUARD, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_GUARD, $3, $1, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $0 diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 10cbe179..2687c596 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -12,15 +12,15 @@ Route8Object: ; 0x5814f (size=119) db $3, $11, $a ; Route8Text10 db $9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $8, $5, FACE, LEFT, $1, SUPER_NERD + $C8, $3 - object SPRITE_GAMBLER, $d, $9, FACE, UP, $2, GAMBLER + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $2a, $6, FACE, UP, $3, SUPER_NERD + $C8, $4 - object SPRITE_LASS, $1a, $3, FACE, RIGHT, $4, LASS + $C8, $d - object SPRITE_BLACK_HAIR_BOY_2, $1a, $4, FACE, LEFT, $5, SUPER_NERD + $C8, $5 - object SPRITE_LASS, $1a, $5, FACE, RIGHT, $6, LASS + $C8, $e - object SPRITE_LASS, $1a, $6, FACE, LEFT, $7, LASS + $C8, $f - object SPRITE_GAMBLER, $2e, $d, FACE, DOWN, $8, GAMBLER + $C8, $7 - object SPRITE_LASS, $33, $c, FACE, RIGHT, $9, LASS + $C8, $10 + object SPRITE_BLACK_HAIR_BOY_2, $8, $5, STAY, RIGHT, $1, SUPER_NERD + $C8, $3 + object SPRITE_GAMBLER, $d, $9, STAY, UP, $2, GAMBLER + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_2, $2a, $6, STAY, UP, $3, SUPER_NERD + $C8, $4 + object SPRITE_LASS, $1a, $3, STAY, LEFT, $4, LASS + $C8, $d + object SPRITE_BLACK_HAIR_BOY_2, $1a, $4, STAY, RIGHT, $5, SUPER_NERD + $C8, $5 + object SPRITE_LASS, $1a, $5, STAY, LEFT, $6, LASS + $C8, $e + object SPRITE_LASS, $1a, $6, STAY, RIGHT, $7, LASS + $C8, $f + object SPRITE_GAMBLER, $2e, $d, STAY, DOWN, $8, GAMBLER + $C8, $7 + object SPRITE_LASS, $33, $c, STAY, LEFT, $9, LASS + $C8, $10 ; warp-to EVENT_DISP ROUTE_8_WIDTH, $9, $1 ; ROUTE_8_GATE diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index fb9504dd..8c3fb54f 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -10,7 +10,7 @@ Route8GateObject: ; 0x1e247 (size=42) db $0 ; signs db $1 ; objects - object SPRITE_GUARD, $2, $1, FACE, DOWN, $1 ; person + object SPRITE_GUARD, $2, $1, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $0 diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index a18ee9c7..6871c73a 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -7,13 +7,13 @@ Route9Object: ; 0x546a8 (size=86) db $7, $19, $b ; Route9Text11 db $a ; objects - object SPRITE_LASS, $d, $a, FACE, RIGHT, $1, JR__TRAINER_F + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_1, $18, $7, FACE, RIGHT, $2, JR__TRAINER_M + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, FACE, LEFT, $3, JR__TRAINER_M + $C8, $8 - object SPRITE_LASS, $30, $8, FACE, LEFT, $4, JR__TRAINER_F + $C8, $6 - object SPRITE_HIKER, $10, $f, FACE, RIGHT, $5, HIKER + $C8, $b - object SPRITE_HIKER, $2b, $3, FACE, RIGHT, $6, HIKER + $C8, $6 - object SPRITE_BUG_CATCHER, $16, $2, FACE, DOWN, $7, BUG_CATCHER + $C8, $d - object SPRITE_HIKER, $2d, $f, FACE, LEFT, $8, HIKER + $C8, $5 - object SPRITE_BUG_CATCHER, $28, $8, FACE, LEFT, $9, BUG_CATCHER + $C8, $e - object SPRITE_BALL, $a, $f, FACE, STAY, $a, TM_30 + object SPRITE_LASS, $d, $a, STAY, LEFT, $1, JR__TRAINER_F + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, JR__TRAINER_M + $C8, $7 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, JR__TRAINER_M + $C8, $8 + object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, JR__TRAINER_F + $C8, $6 + object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, HIKER + $C8, $b + object SPRITE_HIKER, $2b, $3, STAY, LEFT, $6, HIKER + $C8, $6 + object SPRITE_BUG_CATCHER, $16, $2, STAY, DOWN, $7, BUG_CATCHER + $C8, $d + object SPRITE_HIKER, $2d, $f, STAY, RIGHT, $8, HIKER + $C8, $5 + object SPRITE_BUG_CATCHER, $28, $8, STAY, RIGHT, $9, BUG_CATCHER + $C8, $e + object SPRITE_BALL, $a, $f, STAY, NONE, $a, TM_30 diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm index 5af8539e..41886e9f 100755 --- a/data/mapObjects/safarizonecenter.asm +++ b/data/mapObjects/safarizonecenter.asm @@ -17,7 +17,7 @@ SafariZoneCenterObject: ; 0x45bc5 (size=89) db $16, $e, $3 ; SafariZoneCenterText3 db $1 ; objects - object SPRITE_BALL, $e, $a, FACE, STAY, $1, NUGGET + object SPRITE_BALL, $e, $a, STAY, NONE, $1, NUGGET ; warp-to EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $e ; SAFARI_ZONE_ENTRANCE diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/safarizoneeast.asm index a02aa9b1..4cb1e0ae 100755 --- a/data/mapObjects/safarizoneeast.asm +++ b/data/mapObjects/safarizoneeast.asm @@ -14,10 +14,10 @@ SafariZoneEastObject: ; 0x4588b (size=81) db $17, $5, $7 ; SafariZoneEastText7 db $4 ; objects - object SPRITE_BALL, $15, $a, FACE, STAY, $1, FULL_RESTORE - object SPRITE_BALL, $3, $7, FACE, STAY, $2, MAX_POTION - object SPRITE_BALL, $14, $d, FACE, STAY, $3, CARBOS - object SPRITE_BALL, $f, $c, FACE, STAY, $4, TM_37 + object SPRITE_BALL, $15, $a, STAY, NONE, $1, FULL_RESTORE + object SPRITE_BALL, $3, $7, STAY, NONE, $2, MAX_POTION + object SPRITE_BALL, $14, $d, STAY, NONE, $3, CARBOS + object SPRITE_BALL, $f, $c, STAY, NONE, $4, TM_37 ; warp-to EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $4, $0 ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/safarizoneentrance.asm index 2c06c6f6..543cf7dc 100755 --- a/data/mapObjects/safarizoneentrance.asm +++ b/data/mapObjects/safarizoneentrance.asm @@ -10,8 +10,8 @@ SafariZoneEntranceObject: ; 0x753f5 (size=48) db $0 ; signs db $2 ; objects - object SPRITE_WHITE_PLAYER, $6, $2, FACE, RIGHT, $1 ; person - object SPRITE_WHITE_PLAYER, $1, $4, FACE, LEFT, $2 ; person + object SPRITE_WHITE_PLAYER, $6, $2, STAY, LEFT, $1 ; person + object SPRITE_WHITE_PLAYER, $1, $4, STAY, RIGHT, $2 ; person ; warp-to EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $3 diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm index 95a8dcc4..e3c4cddb 100755 --- a/data/mapObjects/safarizonenorth.asm +++ b/data/mapObjects/safarizonenorth.asm @@ -20,8 +20,8 @@ SafariZoneNorthObject: ; 0x459d5 (size=105) db $1c, $1a, $7 ; SafariZoneNorthText7 db $2 ; objects - object SPRITE_BALL, $19, $1, FACE, STAY, $1, PROTEIN - object SPRITE_BALL, $13, $7, FACE, STAY, $2, TM_40 + object SPRITE_BALL, $19, $1, STAY, NONE, $1, PROTEIN + object SPRITE_BALL, $13, $7, STAY, NONE, $2, TM_40 ; warp-to EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $2 ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm index cd4b6e4c..d27a967f 100755 --- a/data/mapObjects/safarizoneresthouse1.asm +++ b/data/mapObjects/safarizoneresthouse1.asm @@ -8,7 +8,7 @@ SafariZoneRestHouse1Object: ; 0x45cfe (size=32) db $0 ; signs db $2 ; objects - object SPRITE_GIRL, $3, $2, FACE, DOWN, $1 ; person + object SPRITE_GIRL, $3, $2, STAY, DOWN, $1 ; person object SPRITE_OAK_AIDE, $1, $4, WALK, $1, $2 ; person ; warp-to diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/safarizoneresthouse2.asm index 55d3ea68..eb6c7a25 100755 --- a/data/mapObjects/safarizoneresthouse2.asm +++ b/data/mapObjects/safarizoneresthouse2.asm @@ -9,8 +9,8 @@ SafariZoneRestHouse2Object: ; 0x45d43 (size=38) db $3 ; objects object SPRITE_OAK_AIDE, $4, $4, WALK, $0, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $0, $2, FACE, LEFT, $2 ; person - object SPRITE_ERIKA, $6, $2, FACE, DOWN, $3 ; person + object SPRITE_BLACK_HAIR_BOY_1, $0, $2, STAY, RIGHT, $2 ; person + object SPRITE_ERIKA, $6, $2, STAY, DOWN, $3 ; person ; warp-to EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $2 ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm index af7265d5..4d698782 100755 --- a/data/mapObjects/safarizoneresthouse3.asm +++ b/data/mapObjects/safarizoneresthouse3.asm @@ -9,8 +9,8 @@ SafariZoneRestHouse3Object: ; 0x45d8e (size=38) db $3 ; objects object SPRITE_OAK_AIDE, $1, $3, WALK, $1, $1 ; person - object SPRITE_ROCKER, $4, $2, FACE, STAY, $2 ; person - object SPRITE_LAPRAS_GIVER, $5, $2, FACE, STAY, $3 ; person + object SPRITE_ROCKER, $4, $2, STAY, NONE, $2 ; person + object SPRITE_LAPRAS_GIVER, $5, $2, STAY, NONE, $3 ; person ; warp-to EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $2 ; SAFARI_ZONE_EAST diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm index 3b792914..1d928420 100755 --- a/data/mapObjects/safarizoneresthouse4.asm +++ b/data/mapObjects/safarizoneresthouse4.asm @@ -9,7 +9,7 @@ SafariZoneRestHouse4Object: ; 0x45dd9 (size=38) db $3 ; objects object SPRITE_OAK_AIDE, $6, $3, WALK, $2, $1 ; person - object SPRITE_WHITE_PLAYER, $3, $4, FACE, STAY, $2 ; person + object SPRITE_WHITE_PLAYER, $3, $4, STAY, NONE, $2 ; person object SPRITE_GENTLEMAN, $1, $5, WALK, $1, $3 ; person ; warp-to diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/safarizonesecrethouse.asm index f630c58a..471ec40b 100755 --- a/data/mapObjects/safarizonesecrethouse.asm +++ b/data/mapObjects/safarizonesecrethouse.asm @@ -8,7 +8,7 @@ SafariZoneSecretHouseObject: ; 0x4a365 (size=26) db $0 ; signs db $1 ; objects - object SPRITE_FISHER, $3, $3, FACE, DOWN, $1 ; person + object SPRITE_FISHER, $3, $3, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $2 ; SAFARI_ZONE_WEST diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm index 627ae65c..724476ae 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/safarizonewest.asm @@ -18,10 +18,10 @@ SafariZoneWestObject: ; 0x4a1dc (size=108) db $16, $18, $8 ; SafariZoneWestText8 db $4 ; objects - object SPRITE_BALL, $8, $14, FACE, STAY, $1, MAX_POTION - object SPRITE_BALL, $9, $7, FACE, STAY, $2, TM_32 - object SPRITE_BALL, $12, $12, FACE, STAY, $3, MAX_REVIVE - object SPRITE_BALL, $13, $7, FACE, STAY, $4, GOLD_TEETH + object SPRITE_BALL, $8, $14, STAY, NONE, $1, MAX_POTION + object SPRITE_BALL, $9, $7, STAY, NONE, $2, TM_32 + object SPRITE_BALL, $12, $12, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $13, $7, STAY, NONE, $4, GOLD_TEETH ; warp-to EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $14 ; SAFARI_ZONE_NORTH diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 27de2811..69e76ee7 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -24,21 +24,21 @@ SaffronCityObject: ; 0x509dc (size=188) db $13, $1, $19 ; SaffronCityText25 db $f ; objects - object SPRITE_ROCKET, $7, $6, FACE, STAY, $1 ; person + object SPRITE_ROCKET, $7, $6, STAY, NONE, $1 ; person object SPRITE_ROCKET, $14, $8, WALK, $2, $2 ; person - object SPRITE_ROCKET, $22, $4, FACE, STAY, $3 ; person - object SPRITE_ROCKET, $d, $c, FACE, STAY, $4 ; person + object SPRITE_ROCKET, $22, $4, STAY, NONE, $3 ; person + object SPRITE_ROCKET, $d, $c, STAY, NONE, $4 ; person object SPRITE_ROCKET, $b, $19, WALK, $2, $5 ; person object SPRITE_ROCKET, $20, $d, WALK, $2, $6 ; person object SPRITE_ROCKET, $12, $1e, WALK, $2, $7 ; person object SPRITE_OAK_AIDE, $8, $e, WALK, $0, $8 ; person - object SPRITE_LAPRAS_GIVER, $17, $17, FACE, STAY, $9 ; person + object SPRITE_LAPRAS_GIVER, $17, $17, STAY, NONE, $9 ; person object SPRITE_ERIKA, $11, $1e, WALK, $2, $a ; person - object SPRITE_GENTLEMAN, $1e, $c, FACE, DOWN, $b ; person - object SPRITE_BIRD, $1f, $c, FACE, DOWN, $c ; person - object SPRITE_ROCKER, $12, $8, FACE, UP, $d ; person - object SPRITE_ROCKET, $12, $16, FACE, DOWN, $e ; person - object SPRITE_ROCKET, $13, $16, FACE, DOWN, $f ; person + object SPRITE_GENTLEMAN, $1e, $c, STAY, DOWN, $b ; person + object SPRITE_BIRD, $1f, $c, STAY, DOWN, $c ; person + object SPRITE_ROCKER, $12, $8, STAY, UP, $d ; person + object SPRITE_ROCKET, $12, $16, STAY, DOWN, $e ; person + object SPRITE_ROCKET, $13, $16, STAY, DOWN, $f ; person ; warp-to EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/saffrongym.asm index 2e0ff092..3e11e006 100755 --- a/data/mapObjects/saffrongym.asm +++ b/data/mapObjects/saffrongym.asm @@ -38,15 +38,15 @@ SaffronGymObject: ; 0x5d259 (size=330) db $0 ; signs db $9 ; objects - object SPRITE_GIRL, $9, $8, FACE, DOWN, $1, SABRINA + $C8, $1 - object SPRITE_MEDIUM, $a, $1, FACE, DOWN, $2, CHANNELER + $C8, $16 - object SPRITE_BUG_CATCHER, $11, $1, FACE, DOWN, $3, PSYCHIC_TR + $C8, $1 - object SPRITE_MEDIUM, $3, $7, FACE, DOWN, $4, CHANNELER + $C8, $17 - object SPRITE_BUG_CATCHER, $11, $7, FACE, DOWN, $5, PSYCHIC_TR + $C8, $2 - object SPRITE_MEDIUM, $3, $d, FACE, DOWN, $6, CHANNELER + $C8, $18 - object SPRITE_BUG_CATCHER, $11, $d, FACE, DOWN, $7, PSYCHIC_TR + $C8, $3 - object SPRITE_BUG_CATCHER, $3, $1, FACE, DOWN, $8, PSYCHIC_TR + $C8, $4 - object SPRITE_GYM_HELPER, $a, $f, FACE, DOWN, $9 ; person + object SPRITE_GIRL, $9, $8, STAY, DOWN, $1, SABRINA + $C8, $1 + object SPRITE_MEDIUM, $a, $1, STAY, DOWN, $2, CHANNELER + $C8, $16 + object SPRITE_BUG_CATCHER, $11, $1, STAY, DOWN, $3, PSYCHIC_TR + $C8, $1 + object SPRITE_MEDIUM, $3, $7, STAY, DOWN, $4, CHANNELER + $C8, $17 + object SPRITE_BUG_CATCHER, $11, $7, STAY, DOWN, $5, PSYCHIC_TR + $C8, $2 + object SPRITE_MEDIUM, $3, $d, STAY, DOWN, $6, CHANNELER + $C8, $18 + object SPRITE_BUG_CATCHER, $11, $d, STAY, DOWN, $7, PSYCHIC_TR + $C8, $3 + object SPRITE_BUG_CATCHER, $3, $1, STAY, DOWN, $8, PSYCHIC_TR + $C8, $4 + object SPRITE_GYM_HELPER, $a, $f, STAY, DOWN, $9 ; person ; warp-to EVENT_DISP SAFFRON_GYM_WIDTH, $11, $8 diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/saffronhouse1.asm index e1dbf1a9..0480cbd9 100755 --- a/data/mapObjects/saffronhouse1.asm +++ b/data/mapObjects/saffronhouse1.asm @@ -8,10 +8,10 @@ SaffronHouse1Object: ; 0x1de04 (size=44) db $0 ; signs db $4 ; objects - object SPRITE_BRUNETTE_GIRL, $2, $3, FACE, LEFT, $1 ; person + object SPRITE_BRUNETTE_GIRL, $2, $3, STAY, RIGHT, $1 ; person object SPRITE_BIRD, $0, $4, WALK, $1, $2 ; person - object SPRITE_BUG_CATCHER, $4, $1, FACE, DOWN, $3 ; person - object SPRITE_PAPER_SHEET, $3, $3, FACE, STAY, $4 ; person + object SPRITE_BUG_CATCHER, $4, $1, STAY, DOWN, $3 ; person + object SPRITE_PAPER_SHEET, $3, $3, STAY, NONE, $4 ; person ; warp-to EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/saffronhouse2.asm index 2468af22..ffcbd64d 100755 --- a/data/mapObjects/saffronhouse2.asm +++ b/data/mapObjects/saffronhouse2.asm @@ -8,7 +8,7 @@ SaffronHouse2Object: ; 0x1de8a (size=26) db $0 ; signs db $1 ; objects - object SPRITE_FISHER, $5, $3, FACE, RIGHT, $1 ; person + object SPRITE_FISHER, $5, $3, STAY, LEFT, $1 ; person ; warp-to EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index 7d7c531f..be3803af 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -8,8 +8,8 @@ SaffronMartObject: ; 0x5d41c (size=38) db $0 ; signs db $3 ; objects - object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person - object SPRITE_BLACK_HAIR_BOY_2, $4, $2, FACE, STAY, $2 ; person + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, NONE, $2 ; person object SPRITE_LASS, $6, $5, WALK, $0, $3 ; person ; warp-to diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/saffronpokecenter.asm index e6cf4468..8487bb01 100755 --- a/data/mapObjects/saffronpokecenter.asm +++ b/data/mapObjects/saffronpokecenter.asm @@ -8,10 +8,10 @@ SaffronPokecenterObject: ; 0x5d54f (size=44) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person - object SPRITE_FOULARD_WOMAN, $5, $5, FACE, STAY, $2 ; person - object SPRITE_GENTLEMAN, $8, $3, FACE, DOWN, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_FOULARD_WOMAN, $5, $5, STAY, NONE, $2 ; person + object SPRITE_GENTLEMAN, $8, $3, STAY, DOWN, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index 8433bb95..b60be6c0 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -8,8 +8,8 @@ SchoolObject: ; 0x1d55d (size=32) db $0 ; signs db $2 ; objects - object SPRITE_BRUNETTE_GIRL, $3, $5, FACE, UP, $1 ; person - object SPRITE_LASS, $4, $1, FACE, DOWN, $2 ; person + object SPRITE_BRUNETTE_GIRL, $3, $5, STAY, UP, $1 ; person + object SPRITE_LASS, $4, $1, STAY, DOWN, $2 ; person ; warp-to EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2 diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index fd872499..287f67ce 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -13,8 +13,8 @@ SeafoamIslands1Object: ; 0x4484f (size=72) db $0 ; signs db $2 ; objects - object SPRITE_BOULDER, $12, $a, FACE, BOULDER_MOVEMENT_BYTE_2, $1 ; person - object SPRITE_BOULDER, $1a, $7, FACE, BOULDER_MOVEMENT_BYTE_2, $2 ; person + object SPRITE_BOULDER, $12, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $1a, $7, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $4 diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index fc07bf64..29cdfa59 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -13,8 +13,8 @@ SeafoamIslands2Object: ; 0x46376 (size=72) db $0 ; signs db $2 ; objects - object SPRITE_BOULDER, $11, $6, FACE, BOULDER_MOVEMENT_BYTE_2, $1 ; person - object SPRITE_BOULDER, $16, $6, FACE, BOULDER_MOVEMENT_BYTE_2, $2 ; person + object SPRITE_BOULDER, $11, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $16, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3 diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm index 23ddbbc1..28a5e67b 100755 --- a/data/mapObjects/seafoamislands3.asm +++ b/data/mapObjects/seafoamislands3.asm @@ -13,8 +13,8 @@ SeafoamIslands3Object: ; 0x464b2 (size=72) db $0 ; signs db $2 ; objects - object SPRITE_BOULDER, $12, $6, FACE, BOULDER_MOVEMENT_BYTE_2, $1 ; person - object SPRITE_BOULDER, $17, $6, FACE, BOULDER_MOVEMENT_BYTE_2, $2 ; person + object SPRITE_BOULDER, $12, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $17, $6, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $5 ; SEAFOAM_ISLANDS_2 diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm index 56e208d9..e90b3865 100755 --- a/data/mapObjects/seafoamislands4.asm +++ b/data/mapObjects/seafoamislands4.asm @@ -13,12 +13,12 @@ SeafoamIslands4Object: ; 0x466a6 (size=96) db $0 ; signs db $6 ; objects - object SPRITE_BOULDER, $5, $e, FACE, BOULDER_MOVEMENT_BYTE_2, $1 ; person - object SPRITE_BOULDER, $3, $f, FACE, BOULDER_MOVEMENT_BYTE_2, $2 ; person - object SPRITE_BOULDER, $8, $e, FACE, BOULDER_MOVEMENT_BYTE_2, $3 ; person - object SPRITE_BOULDER, $9, $e, FACE, BOULDER_MOVEMENT_BYTE_2, $4 ; person - object SPRITE_BOULDER, $12, $6, FACE, STAY, $5 ; person - object SPRITE_BOULDER, $13, $6, FACE, STAY, $6 ; person + object SPRITE_BOULDER, $5, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $1 ; person + object SPRITE_BOULDER, $3, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $2 ; person + object SPRITE_BOULDER, $8, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $3 ; person + object SPRITE_BOULDER, $9, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $4 ; person + object SPRITE_BOULDER, $12, $6, STAY, NONE, $5 ; person + object SPRITE_BOULDER, $13, $6, STAY, NONE, $6 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $c, $5 ; SEAFOAM_ISLANDS_3 diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm index 65b7fac9..e5fbaecd 100755 --- a/data/mapObjects/seafoamislands5.asm +++ b/data/mapObjects/seafoamislands5.asm @@ -12,9 +12,9 @@ SeafoamIslands5Object: ; 0x468bc (size=62) db $1, $17, $5 ; SeafoamIslands5Text5 db $3 ; objects - object SPRITE_BOULDER, $4, $f, FACE, STAY, $1 ; person - object SPRITE_BOULDER, $5, $f, FACE, STAY, $2 ; person - object SPRITE_BIRD, $6, $1, FACE, DOWN, $3, ARTICUNO, 50 + object SPRITE_BOULDER, $4, $f, STAY, NONE, $1 ; person + object SPRITE_BOULDER, $5, $f, STAY, NONE, $2 ; person + object SPRITE_BIRD, $6, $1, STAY, DOWN, $3, ARTICUNO, 50 ; warp-to EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_4 diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index 2e177f35..a953f376 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -11,7 +11,7 @@ SilphCo1Object: ; 0x5d470 (size=50) db $0 ; signs db $1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, $4, $2, FACE, DOWN, $1 ; person + object SPRITE_CABLE_CLUB_WOMAN, $4, $2, STAY, DOWN, $1 ; person ; warp-to EVENT_DISP SILPH_CO_1F_WIDTH, $11, $a diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/silphco10.asm index a5e1f633..e48a4284 100755 --- a/data/mapObjects/silphco10.asm +++ b/data/mapObjects/silphco10.asm @@ -12,12 +12,12 @@ SilphCo10Object: ; 0x5a1fb (size=95) db $0 ; signs db $6 ; objects - object SPRITE_ROCKET, $1, $9, FACE, LEFT, $1, ROCKET + $C8, $27 - object SPRITE_OAK_AIDE, $a, $2, FACE, RIGHT, $2, SCIENTIST + $C8, $b + object SPRITE_ROCKET, $1, $9, STAY, RIGHT, $1, ROCKET + $C8, $27 + object SPRITE_OAK_AIDE, $a, $2, STAY, LEFT, $2, SCIENTIST + $C8, $b object SPRITE_ERIKA, $9, $f, WALK, $0, $3 ; person - object SPRITE_BALL, $2, $c, FACE, STAY, $4, TM_26 - object SPRITE_BALL, $4, $e, FACE, STAY, $5, RARE_CANDY - object SPRITE_BALL, $5, $b, FACE, STAY, $6, CARBOS + object SPRITE_BALL, $2, $c, STAY, NONE, $4, TM_26 + object SPRITE_BALL, $4, $e, STAY, NONE, $5, RARE_CANDY + object SPRITE_BALL, $5, $b, STAY, NONE, $6, CARBOS ; warp-to EVENT_DISP SILPH_CO_10F_WIDTH, $0, $8 ; SILPH_CO_9F diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index ddab6d12..e1a7a568 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -10,11 +10,11 @@ SilphCo11Object: ; 0x62380 (size=72) db $0 ; signs db $5 ; objects - object SPRITE_MR_MASTERBALL, $7, $5, FACE, DOWN, $1 ; person - object SPRITE_FOULARD_WOMAN, $a, $5, FACE, DOWN, $2 ; person - object SPRITE_GIOVANNI, $6, $9, FACE, DOWN, $3, GIOVANNI + $C8, $2 - object SPRITE_ROCKET, $3, $10, FACE, UP, $4, ROCKET + $C8, $29 - object SPRITE_ROCKET, $f, $9, FACE, UP, $5, ROCKET + $C8, $28 + object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person + object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person + object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, GIOVANNI + $C8, $2 + object SPRITE_ROCKET, $3, $10, STAY, UP, $4, ROCKET + $C8, $29 + object SPRITE_ROCKET, $f, $9, STAY, UP, $5, ROCKET + $C8, $28 ; warp-to EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/silphco2.asm index 918df25e..cd4f8be5 100755 --- a/data/mapObjects/silphco2.asm +++ b/data/mapObjects/silphco2.asm @@ -13,11 +13,11 @@ SilphCo2Object: ; 0x59e66 (size=98) db $0 ; signs db $5 ; objects - object SPRITE_ERIKA, $a, $1, FACE, UP, $1 ; person - object SPRITE_OAK_AIDE, $5, $c, FACE, DOWN, $2, SCIENTIST + $C8, $2 - object SPRITE_OAK_AIDE, $18, $d, FACE, RIGHT, $3, SCIENTIST + $C8, $3 - object SPRITE_ROCKET, $10, $b, FACE, UP, $4, ROCKET + $C8, $17 - object SPRITE_ROCKET, $18, $7, FACE, UP, $5, ROCKET + $C8, $18 + object SPRITE_ERIKA, $a, $1, STAY, UP, $1 ; person + object SPRITE_OAK_AIDE, $5, $c, STAY, DOWN, $2, SCIENTIST + $C8, $2 + object SPRITE_OAK_AIDE, $18, $d, STAY, LEFT, $3, SCIENTIST + $C8, $3 + object SPRITE_ROCKET, $10, $b, STAY, UP, $4, ROCKET + $C8, $17 + object SPRITE_ROCKET, $18, $7, STAY, UP, $5, ROCKET + $C8, $18 ; warp-to EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/silphco3.asm index 462e58a3..a293593a 100755 --- a/data/mapObjects/silphco3.asm +++ b/data/mapObjects/silphco3.asm @@ -16,10 +16,10 @@ SilphCo3Object: ; 0x5a035 (size=113) db $0 ; signs db $4 ; objects - object SPRITE_LAPRAS_GIVER, $18, $8, FACE, STAY, $1 ; person - object SPRITE_ROCKET, $14, $7, FACE, RIGHT, $2, ROCKET + $C8, $19 - object SPRITE_OAK_AIDE, $7, $9, FACE, DOWN, $3, SCIENTIST + $C8, $4 - object SPRITE_BALL, $8, $5, FACE, STAY, $4, HYPER_POTION + object SPRITE_LAPRAS_GIVER, $18, $8, STAY, NONE, $1 ; person + object SPRITE_ROCKET, $14, $7, STAY, LEFT, $2, ROCKET + $C8, $19 + object SPRITE_OAK_AIDE, $7, $9, STAY, DOWN, $3, SCIENTIST + $C8, $4 + object SPRITE_BALL, $8, $5, STAY, NONE, $4, HYPER_POTION ; warp-to EVENT_DISP SILPH_CO_3F_WIDTH, $0, $1a ; SILPH_CO_2F diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm index a5eae9f0..f9974ccb 100755 --- a/data/mapObjects/silphco4.asm +++ b/data/mapObjects/silphco4.asm @@ -13,13 +13,13 @@ SilphCo4Object: ; 0x19e35 (size=111) db $0 ; signs db $7 ; objects - object SPRITE_LAPRAS_GIVER, $6, $2, FACE, STAY, $1 ; person - object SPRITE_ROCKET, $9, $e, FACE, LEFT, $2, ROCKET + $C8, $1a - object SPRITE_OAK_AIDE, $e, $6, FACE, RIGHT, $3, SCIENTIST + $C8, $5 - object SPRITE_ROCKET, $1a, $a, FACE, UP, $4, ROCKET + $C8, $1b - object SPRITE_BALL, $3, $9, FACE, STAY, $5, FULL_HEAL - object SPRITE_BALL, $4, $7, FACE, STAY, $6, MAX_REVIVE - object SPRITE_BALL, $5, $8, FACE, STAY, $7, ESCAPE_ROPE + object SPRITE_LAPRAS_GIVER, $6, $2, STAY, NONE, $1 ; person + object SPRITE_ROCKET, $9, $e, STAY, RIGHT, $2, ROCKET + $C8, $1a + object SPRITE_OAK_AIDE, $e, $6, STAY, LEFT, $3, SCIENTIST + $C8, $5 + object SPRITE_ROCKET, $1a, $a, STAY, UP, $4, ROCKET + $C8, $1b + object SPRITE_BALL, $3, $9, STAY, NONE, $5, FULL_HEAL + object SPRITE_BALL, $4, $7, STAY, NONE, $6, MAX_REVIVE + object SPRITE_BALL, $5, $8, STAY, NONE, $7, ESCAPE_ROPE ; warp-to EVENT_DISP SILPH_CO_4F_WIDTH, $0, $18 ; SILPH_CO_3F diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/silphco5.asm index 215521ec..bb7bf68e 100755 --- a/data/mapObjects/silphco5.asm +++ b/data/mapObjects/silphco5.asm @@ -13,17 +13,17 @@ SilphCo5Object: ; 0x1a08d (size=137) db $0 ; signs db $b ; objects - object SPRITE_LAPRAS_GIVER, $d, $9, FACE, STAY, $1 ; person - object SPRITE_ROCKET, $8, $10, FACE, LEFT, $2, ROCKET + $C8, $1c - object SPRITE_OAK_AIDE, $8, $3, FACE, LEFT, $3, SCIENTIST + $C8, $6 - object SPRITE_ROCKER, $12, $a, FACE, UP, $4, JUGGLER + $C8, $1 - object SPRITE_ROCKET, $1c, $4, FACE, UP, $5, ROCKET + $C8, $1d - object SPRITE_BALL, $2, $d, FACE, STAY, $6, TM_09 - object SPRITE_BALL, $4, $6, FACE, STAY, $7, PROTEIN - object SPRITE_BALL, $15, $10, FACE, STAY, $8, CARD_KEY - object SPRITE_CLIPBOARD, $16, $c, FACE, STAY, $9 ; person - object SPRITE_CLIPBOARD, $19, $a, FACE, STAY, $a ; person - object SPRITE_CLIPBOARD, $18, $6, FACE, STAY, $b ; person + object SPRITE_LAPRAS_GIVER, $d, $9, STAY, NONE, $1 ; person + object SPRITE_ROCKET, $8, $10, STAY, RIGHT, $2, ROCKET + $C8, $1c + object SPRITE_OAK_AIDE, $8, $3, STAY, RIGHT, $3, SCIENTIST + $C8, $6 + object SPRITE_ROCKER, $12, $a, STAY, UP, $4, JUGGLER + $C8, $1 + object SPRITE_ROCKET, $1c, $4, STAY, UP, $5, ROCKET + $C8, $1d + object SPRITE_BALL, $2, $d, STAY, NONE, $6, TM_09 + object SPRITE_BALL, $4, $6, STAY, NONE, $7, PROTEIN + object SPRITE_BALL, $15, $10, STAY, NONE, $8, CARD_KEY + object SPRITE_CLIPBOARD, $16, $c, STAY, NONE, $9 ; person + object SPRITE_CLIPBOARD, $19, $a, STAY, NONE, $a ; person + object SPRITE_CLIPBOARD, $18, $6, STAY, NONE, $b ; person ; warp-to EVENT_DISP SILPH_CO_5F_WIDTH, $0, $18 ; SILPH_CO_6F diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/silphco6.asm index b3637c80..c1cdebd0 100755 --- a/data/mapObjects/silphco6.asm +++ b/data/mapObjects/silphco6.asm @@ -11,16 +11,16 @@ SilphCo6Object: ; 0x1a2fb (size=112) db $0 ; signs db $a ; objects - object SPRITE_LAPRAS_GIVER, $a, $6, FACE, STAY, $1 ; person - object SPRITE_LAPRAS_GIVER, $14, $6, FACE, STAY, $2 ; person - object SPRITE_ERIKA, $15, $6, FACE, DOWN, $3 ; person - object SPRITE_ERIKA, $b, $a, FACE, LEFT, $4 ; person - object SPRITE_LAPRAS_GIVER, $12, $d, FACE, UP, $5 ; person - object SPRITE_ROCKET, $11, $3, FACE, LEFT, $6, ROCKET + $C8, $1e - object SPRITE_OAK_AIDE, $7, $8, FACE, DOWN, $7, SCIENTIST + $C8, $7 - object SPRITE_ROCKET, $e, $f, FACE, RIGHT, $8, ROCKET + $C8, $1f - object SPRITE_BALL, $3, $c, FACE, STAY, $9, HP_UP - object SPRITE_BALL, $2, $f, FACE, STAY, $a, X_ACCURACY + object SPRITE_LAPRAS_GIVER, $a, $6, STAY, NONE, $1 ; person + object SPRITE_LAPRAS_GIVER, $14, $6, STAY, NONE, $2 ; person + object SPRITE_ERIKA, $15, $6, STAY, DOWN, $3 ; person + object SPRITE_ERIKA, $b, $a, STAY, RIGHT, $4 ; person + object SPRITE_LAPRAS_GIVER, $12, $d, STAY, UP, $5 ; person + object SPRITE_ROCKET, $11, $3, STAY, RIGHT, $6, ROCKET + $C8, $1e + object SPRITE_OAK_AIDE, $7, $8, STAY, DOWN, $7, SCIENTIST + $C8, $7 + object SPRITE_ROCKET, $e, $f, STAY, LEFT, $8, ROCKET + $C8, $1f + object SPRITE_BALL, $3, $c, STAY, NONE, $9, HP_UP + object SPRITE_BALL, $2, $f, STAY, NONE, $a, X_ACCURACY ; warp-to EVENT_DISP SILPH_CO_6F_WIDTH, $0, $10 ; SILPH_CO_7F diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/silphco7.asm index b4e387b8..42a84faa 100755 --- a/data/mapObjects/silphco7.asm +++ b/data/mapObjects/silphco7.asm @@ -12,17 +12,17 @@ SilphCo7Object: ; 0x51ed7 (size=128) db $0 ; signs db $b ; objects - object SPRITE_LAPRAS_GIVER, $1, $5, FACE, STAY, $1 ; person - object SPRITE_LAPRAS_GIVER, $d, $d, FACE, UP, $2 ; person - object SPRITE_LAPRAS_GIVER, $7, $a, FACE, STAY, $3 ; person - object SPRITE_ERIKA, $a, $8, FACE, STAY, $4 ; person - object SPRITE_ROCKET, $d, $1, FACE, DOWN, $5, ROCKET + $C8, $20 - object SPRITE_OAK_AIDE, $2, $d, FACE, DOWN, $6, SCIENTIST + $C8, $8 - object SPRITE_ROCKET, $14, $2, FACE, RIGHT, $7, ROCKET + $C8, $21 - object SPRITE_ROCKET, $13, $e, FACE, LEFT, $8, ROCKET + $C8, $22 - object SPRITE_BLUE, $3, $7, FACE, UP, $9 ; person - object SPRITE_BALL, $1, $9, FACE, STAY, $a, CALCIUM - object SPRITE_BALL, $18, $b, FACE, STAY, $b, TM_03 + object SPRITE_LAPRAS_GIVER, $1, $5, STAY, NONE, $1 ; person + object SPRITE_LAPRAS_GIVER, $d, $d, STAY, UP, $2 ; person + object SPRITE_LAPRAS_GIVER, $7, $a, STAY, NONE, $3 ; person + object SPRITE_ERIKA, $a, $8, STAY, NONE, $4 ; person + object SPRITE_ROCKET, $d, $1, STAY, DOWN, $5, ROCKET + $C8, $20 + object SPRITE_OAK_AIDE, $2, $d, STAY, DOWN, $6, SCIENTIST + $C8, $8 + object SPRITE_ROCKET, $14, $2, STAY, LEFT, $7, ROCKET + $C8, $21 + object SPRITE_ROCKET, $13, $e, STAY, RIGHT, $8, ROCKET + $C8, $22 + object SPRITE_BLUE, $3, $7, STAY, UP, $9 ; person + object SPRITE_BALL, $1, $9, STAY, NONE, $a, CALCIUM + object SPRITE_BALL, $18, $b, STAY, NONE, $b, TM_03 ; warp-to EVENT_DISP SILPH_CO_7F_WIDTH, $0, $10 ; SILPH_CO_8F diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index 7aaf3c1a..6b7541ad 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -13,10 +13,10 @@ SilphCo8Object: ; 0x56613 (size=90) db $0 ; signs db $4 ; objects - object SPRITE_LAPRAS_GIVER, $4, $2, FACE, STAY, $1 ; person - object SPRITE_ROCKET, $13, $2, FACE, RIGHT, $2, ROCKET + $C8, $23 - object SPRITE_OAK_AIDE, $a, $2, FACE, DOWN, $3, SCIENTIST + $C8, $9 - object SPRITE_ROCKET, $c, $f, FACE, LEFT, $4, ROCKET + $C8, $24 + object SPRITE_LAPRAS_GIVER, $4, $2, STAY, NONE, $1 ; person + object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, ROCKET + $C8, $23 + object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, SCIENTIST + $C8, $9 + object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, ROCKET + $C8, $24 ; warp-to EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/silphco9.asm index a73b42fd..5fb1db79 100755 --- a/data/mapObjects/silphco9.asm +++ b/data/mapObjects/silphco9.asm @@ -11,10 +11,10 @@ SilphCo9Object: ; 0x5d93f (size=74) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $e, FACE, DOWN, $1 ; person - object SPRITE_ROCKET, $2, $4, FACE, UP, $2, ROCKET + $C8, $25 - object SPRITE_OAK_AIDE, $15, $d, FACE, DOWN, $3, SCIENTIST + $C8, $a - object SPRITE_ROCKET, $d, $10, FACE, UP, $4, ROCKET + $C8, $26 + object SPRITE_NURSE, $3, $e, STAY, DOWN, $1 ; person + object SPRITE_ROCKET, $2, $4, STAY, UP, $2, ROCKET + $C8, $25 + object SPRITE_OAK_AIDE, $15, $d, STAY, DOWN, $3, SCIENTIST + $C8, $a + object SPRITE_ROCKET, $d, $10, STAY, UP, $4, ROCKET + $C8, $26 ; warp-to EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm index d3e10966..c631074c 100755 --- a/data/mapObjects/ssanne1.asm +++ b/data/mapObjects/ssanne1.asm @@ -18,7 +18,7 @@ SSAnne1Object: ; 0x61277 (size=104) db $2 ; objects object SPRITE_WAITER, $c, $6, WALK, $2, $1 ; person - object SPRITE_SAILOR, $1b, $5, FACE, STAY, $2 ; person + object SPRITE_SAILOR, $1b, $5, STAY, NONE, $2 ; person ; warp-to EVENT_DISP SS_ANNE_1_WIDTH, $0, $1a ; VERMILION_DOCK diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm index 1d1f4377..8001c043 100755 --- a/data/mapObjects/ssanne10.asm +++ b/data/mapObjects/ssanne10.asm @@ -16,17 +16,17 @@ SSAnne10Object: ; 0x61e75 (size=165) db $0 ; signs db $b ; objects - object SPRITE_SAILOR, $0, $d, FACE, DOWN, $1, SAILOR + $C8, $3 - object SPRITE_SAILOR, $2, $b, FACE, DOWN, $2, SAILOR + $C8, $4 - object SPRITE_SAILOR, $c, $3, FACE, RIGHT, $3, SAILOR + $C8, $5 - object SPRITE_SAILOR, $16, $2, FACE, DOWN, $4, SAILOR + $C8, $6 - object SPRITE_SAILOR, $0, $2, FACE, LEFT, $5, SAILOR + $C8, $7 - object SPRITE_FISHER2, $0, $4, FACE, LEFT, $6, FISHER + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_2, $a, $d, FACE, LEFT, $7 ; person - object SPRITE_SLOWBRO, $b, $c, FACE, STAY, $8 ; person - object SPRITE_BALL, $14, $2, FACE, STAY, $9, ETHER - object SPRITE_BALL, $a, $2, FACE, STAY, $a, TM_44 - object SPRITE_BALL, $c, $b, FACE, STAY, $b, MAX_POTION + object SPRITE_SAILOR, $0, $d, STAY, DOWN, $1, SAILOR + $C8, $3 + object SPRITE_SAILOR, $2, $b, STAY, DOWN, $2, SAILOR + $C8, $4 + object SPRITE_SAILOR, $c, $3, STAY, LEFT, $3, SAILOR + $C8, $5 + object SPRITE_SAILOR, $16, $2, STAY, DOWN, $4, SAILOR + $C8, $6 + object SPRITE_SAILOR, $0, $2, STAY, RIGHT, $5, SAILOR + $C8, $7 + object SPRITE_FISHER2, $0, $4, STAY, RIGHT, $6, FISHER + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_2, $a, $d, STAY, RIGHT, $7 ; person + object SPRITE_SLOWBRO, $b, $c, STAY, NONE, $8 ; person + object SPRITE_BALL, $14, $2, STAY, NONE, $9, ETHER + object SPRITE_BALL, $a, $2, STAY, NONE, $a, TM_44 + object SPRITE_BALL, $c, $b, STAY, NONE, $b, MAX_POTION ; warp-to EVENT_DISP SS_ANNE_10_WIDTH, $5, $2 ; SS_ANNE_4 diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm index 73397712..80e54683 100755 --- a/data/mapObjects/ssanne2.asm +++ b/data/mapObjects/ssanne2.asm @@ -16,7 +16,7 @@ SSAnne2Object: ; 0x61514 (size=90) db $2 ; objects object SPRITE_WAITER, $3, $7, WALK, $1, $1 ; person - object SPRITE_BLUE, $24, $4, FACE, DOWN, $2, SONY1 + $C8, $1 + object SPRITE_BLUE, $24, $4, STAY, DOWN, $2, SONY1 + $C8, $1 ; warp-to EVENT_DISP SS_ANNE_2_WIDTH, $b, $9 ; SS_ANNE_9 diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/ssanne5.asm index 3787467d..e8a48417 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/ssanne5.asm @@ -8,11 +8,11 @@ SSAnne5Object: ; 0x6172b (size=54) db $0 ; signs db $5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $5, $2, FACE, UP, $1 ; person - object SPRITE_SAILOR, $4, $9, FACE, STAY, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $7, $b, FACE, STAY, $3 ; person - object SPRITE_SAILOR, $4, $4, FACE, DOWN, $4, SAILOR + $C8, $1 - object SPRITE_SAILOR, $a, $8, FACE, UP, $5, SAILOR + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_2, $5, $2, STAY, UP, $1 ; person + object SPRITE_SAILOR, $4, $9, STAY, NONE, $2 ; person + object SPRITE_BLACK_HAIR_BOY_1, $7, $b, STAY, NONE, $3 ; person + object SPRITE_SAILOR, $4, $4, STAY, DOWN, $4, SAILOR + $C8, $1 + object SPRITE_SAILOR, $a, $8, STAY, UP, $5, SAILOR + $C8, $2 ; warp-to EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3 diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/ssanne6.asm index 659409dd..159a3ed2 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/ssanne6.asm @@ -10,10 +10,10 @@ SSAnne6Object: ; 0x6181b (size=54) object SPRITE_COOK, $1, $8, WALK, $1, $1 ; person object SPRITE_COOK, $5, $8, WALK, $1, $2 ; person object SPRITE_COOK, $9, $7, WALK, $1, $3 ; person - object SPRITE_COOK, $d, $6, FACE, STAY, $4 ; person - object SPRITE_COOK, $d, $8, FACE, STAY, $5 ; person - object SPRITE_COOK, $d, $a, FACE, STAY, $6 ; person - object SPRITE_COOK, $b, $d, FACE, UP, $7 ; person + object SPRITE_COOK, $d, $6, STAY, NONE, $4 ; person + object SPRITE_COOK, $d, $8, STAY, NONE, $5 ; person + object SPRITE_COOK, $d, $a, STAY, NONE, $6 ; person + object SPRITE_COOK, $b, $d, STAY, UP, $7 ; person ; warp-to EVENT_DISP SS_ANNE_6_WIDTH, $0, $6 ; SS_ANNE_1 diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/ssanne7.asm index ddd05959..6179a28e 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/ssanne7.asm @@ -9,7 +9,7 @@ SSAnne7Object: ; 0x61946 (size=24) db $2, $1, $3 ; SSAnne7Text3 db $1 ; objects - object SPRITE_SS_CAPTAIN, $4, $2, FACE, UP, $1 ; person + object SPRITE_SS_CAPTAIN, $4, $2, STAY, UP, $1 ; person ; warp-to EVENT_DISP SS_ANNE_7_WIDTH, $7, $0 ; SS_ANNE_2 diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/ssanne8.asm index 92d784cb..e9c2aa71 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/ssanne8.asm @@ -12,16 +12,16 @@ SSAnne8Object: ; 0x61a60 (size=127) db $0 ; signs db $b ; objects - object SPRITE_GENTLEMAN, $2, $3, FACE, RIGHT, $1, GENTLEMAN + $C8, $1 - object SPRITE_GENTLEMAN, $b, $4, FACE, UP, $2, GENTLEMAN + $C8, $2 - object SPRITE_BUG_CATCHER, $b, $e, FACE, UP, $3, YOUNGSTER + $C8, $8 - object SPRITE_LASS, $d, $b, FACE, RIGHT, $4, LASS + $C8, $b + object SPRITE_GENTLEMAN, $2, $3, STAY, LEFT, $1, GENTLEMAN + $C8, $1 + object SPRITE_GENTLEMAN, $b, $4, STAY, UP, $2, GENTLEMAN + $C8, $2 + object SPRITE_BUG_CATCHER, $b, $e, STAY, UP, $3, YOUNGSTER + $C8, $8 + object SPRITE_LASS, $d, $b, STAY, LEFT, $4, LASS + $C8, $b object SPRITE_GIRL, $16, $3, WALK, $1, $5 ; person - object SPRITE_FAT_BALD_GUY, $0, $e, FACE, STAY, $6 ; person - object SPRITE_LITTLE_GIRL, $2, $b, FACE, DOWN, $7 ; person - object SPRITE_CLEFAIRY, $3, $b, FACE, DOWN, $8 ; person - object SPRITE_GIRL, $a, $d, FACE, LEFT, $9 ; person - object SPRITE_BALL, $c, $f, FACE, STAY, $a, TM_08 + object SPRITE_FAT_BALD_GUY, $0, $e, STAY, NONE, $6 ; person + object SPRITE_LITTLE_GIRL, $2, $b, STAY, DOWN, $7 ; person + object SPRITE_CLEFAIRY, $3, $b, STAY, DOWN, $8 ; person + object SPRITE_GIRL, $a, $d, STAY, RIGHT, $9 ; person + object SPRITE_BALL, $c, $f, STAY, NONE, $a, TM_08 object SPRITE_GENTLEMAN, $15, $d, WALK, $2, $b ; person ; warp-to diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index cec21d1b..a9bccafa 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -18,19 +18,19 @@ SSAnne9Object: ; 0x61c8d (size=188) db $0 ; signs db $d ; objects - object SPRITE_GENTLEMAN, $a, $2, FACE, LEFT, $1, GENTLEMAN + $C8, $3 - object SPRITE_FISHER2, $d, $4, FACE, RIGHT, $2, FISHER + $C8, $1 - object SPRITE_GENTLEMAN, $0, $e, FACE, LEFT, $3, GENTLEMAN + $C8, $5 - object SPRITE_LASS, $2, $b, FACE, DOWN, $4, LASS + $C8, $c - object SPRITE_GENTLEMAN, $1, $2, FACE, DOWN, $5 ; person - object SPRITE_BALL, $c, $1, FACE, STAY, $6, MAX_ETHER - object SPRITE_GENTLEMAN, $15, $2, FACE, DOWN, $7 ; person - object SPRITE_OLD_PERSON, $16, $1, FACE, DOWN, $8 ; person - object SPRITE_BALL, $0, $c, FACE, STAY, $9, RARE_CANDY - object SPRITE_GENTLEMAN, $c, $c, FACE, DOWN, $a ; person - object SPRITE_YOUNG_BOY, $b, $e, FACE, STAY, $b ; person - object SPRITE_BRUNETTE_GIRL, $16, $c, FACE, RIGHT, $c ; person - object SPRITE_FOULARD_WOMAN, $14, $c, FACE, LEFT, $d ; person + object SPRITE_GENTLEMAN, $a, $2, STAY, RIGHT, $1, GENTLEMAN + $C8, $3 + object SPRITE_FISHER2, $d, $4, STAY, LEFT, $2, FISHER + $C8, $1 + object SPRITE_GENTLEMAN, $0, $e, STAY, RIGHT, $3, GENTLEMAN + $C8, $5 + object SPRITE_LASS, $2, $b, STAY, DOWN, $4, LASS + $C8, $c + object SPRITE_GENTLEMAN, $1, $2, STAY, DOWN, $5 ; person + object SPRITE_BALL, $c, $1, STAY, NONE, $6, MAX_ETHER + object SPRITE_GENTLEMAN, $15, $2, STAY, DOWN, $7 ; person + object SPRITE_OLD_PERSON, $16, $1, STAY, DOWN, $8 ; person + object SPRITE_BALL, $0, $c, STAY, NONE, $9, RARE_CANDY + object SPRITE_GENTLEMAN, $c, $c, STAY, DOWN, $a ; person + object SPRITE_YOUNG_BOY, $b, $e, STAY, NONE, $b ; person + object SPRITE_BRUNETTE_GIRL, $16, $c, STAY, LEFT, $c ; person + object SPRITE_FOULARD_WOMAN, $14, $c, STAY, RIGHT, $d ; person ; warp-to EVENT_DISP SS_ANNE_9_WIDTH, $5, $2 ; SS_ANNE_2 diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm index c5b81715..a2f18179 100755 --- a/data/mapObjects/undergroundpathentranceroute5.asm +++ b/data/mapObjects/undergroundpathentranceroute5.asm @@ -9,7 +9,7 @@ UndergroundPathEntranceRoute5Object: ; 0x5d6c1 (size=34) db $0 ; signs db $1 ; objects - object SPRITE_LITTLE_GIRL, $2, $3, FACE, STAY, $1 ; person + object SPRITE_LITTLE_GIRL, $2, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm index b64f928b..834263b5 100755 --- a/data/mapObjects/undergroundpathentranceroute6.asm +++ b/data/mapObjects/undergroundpathentranceroute6.asm @@ -9,7 +9,7 @@ UndergroundPathEntranceRoute6Object: ; 0x5d6fe (size=34) db $0 ; signs db $1 ; objects - object SPRITE_GIRL, $2, $3, FACE, STAY, $1 ; person + object SPRITE_GIRL, $2, $3, STAY, NONE, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm index a0e4d867..909ff4a0 100755 --- a/data/mapObjects/undergroundpathentranceroute7.asm +++ b/data/mapObjects/undergroundpathentranceroute7.asm @@ -9,7 +9,7 @@ UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34) db $0 ; signs db $1 ; objects - object SPRITE_FAT_BALD_GUY, $2, $4, FACE, STAY, $1 ; person + object SPRITE_FAT_BALD_GUY, $2, $4, STAY, NONE, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm index cd87acbd..707a0e0e 100755 --- a/data/mapObjects/undergroundpathentranceroute7copy.asm +++ b/data/mapObjects/undergroundpathentranceroute7copy.asm @@ -9,8 +9,8 @@ UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787) db $0 ; signs db $2 ; objects - object SPRITE_GIRL, $3, $2, FACE, STAY, $1 ; person - object SPRITE_FAT_BALD_GUY, $2, $4, FACE, STAY, $2 ; person + object SPRITE_GIRL, $3, $2, STAY, NONE, $1 ; person + object SPRITE_FAT_BALD_GUY, $2, $4, STAY, NONE, $2 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $3 diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm index e3558a15..9a1d9d37 100755 --- a/data/mapObjects/undergroundpathentranceroute8.asm +++ b/data/mapObjects/undergroundpathentranceroute8.asm @@ -9,7 +9,7 @@ UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34) db $0 ; signs db $1 ; objects - object SPRITE_GIRL, $3, $4, FACE, STAY, $1 ; person + object SPRITE_GIRL, $3, $4, STAY, NONE, $1 ; person ; warp-to EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $3 diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index 47d4fc49..c55711b4 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -15,9 +15,9 @@ UnknownDungeon1Object: ; 0x74d15 (size=97) db $0 ; signs db $3 ; objects - object SPRITE_BALL, $7, $d, FACE, STAY, $1, FULL_RESTORE - object SPRITE_BALL, $13, $3, FACE, STAY, $2, MAX_ELIXER - object SPRITE_BALL, $5, $0, FACE, STAY, $3, NUGGET + object SPRITE_BALL, $7, $d, STAY, NONE, $1, FULL_RESTORE + object SPRITE_BALL, $13, $3, STAY, NONE, $2, MAX_ELIXER + object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET ; warp-to EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18 diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index 9ce00fbc..e5ebca56 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -12,9 +12,9 @@ UnknownDungeon2Object: ; 0x45e14 (size=73) db $0 ; signs db $3 ; objects - object SPRITE_BALL, $1d, $9, FACE, STAY, $1, PP_UP - object SPRITE_BALL, $4, $f, FACE, STAY, $2, ULTRA_BALL - object SPRITE_BALL, $d, $6, FACE, STAY, $3, FULL_RESTORE + object SPRITE_BALL, $1d, $9, STAY, NONE, $1, PP_UP + object SPRITE_BALL, $4, $f, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $d, $6, STAY, NONE, $3, FULL_RESTORE ; warp-to EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index c8dca6a8..8b733e6b 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -7,9 +7,9 @@ UnknownDungeon3Object: ; 0x45f36 (size=34) db $0 ; signs db $3 ; objects - object SPRITE_SLOWBRO, $1b, $d, FACE, DOWN, $1, MEWTWO, 70 - object SPRITE_BALL, $10, $9, FACE, STAY, $2, ULTRA_BALL - object SPRITE_BALL, $12, $1, FACE, STAY, $3, MAX_REVIVE + object SPRITE_SLOWBRO, $1b, $d, STAY, DOWN, $1, MEWTWO, 70 + object SPRITE_BALL, $10, $9, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $12, $1, STAY, NONE, $3, MAX_REVIVE ; warp-to EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index b8ec91d4..c5602be1 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -23,9 +23,9 @@ VermilionCityObject: ; 0x189ba (size=133) db $6 ; objects object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person - object SPRITE_GAMBLER, $e, $6, FACE, STAY, $2 ; person - object SPRITE_SAILOR, $13, $1e, FACE, UP, $3 ; person - object SPRITE_GAMBLER, $1e, $7, FACE, STAY, $4 ; person + object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person + object SPRITE_SAILOR, $13, $1e, STAY, UP, $3 ; person + object SPRITE_GAMBLER, $1e, $7, STAY, NONE, $4 ; person object SPRITE_SLOWBRO, $1d, $9, WALK, $1, $5 ; person object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/vermiliongym.asm index d98bc854..df3da382 100755 --- a/data/mapObjects/vermiliongym.asm +++ b/data/mapObjects/vermiliongym.asm @@ -8,11 +8,11 @@ VermilionGymObject: ; 0x5cbfe (size=58) db $0 ; signs db $5 ; objects - object SPRITE_ROCKER, $5, $1, FACE, DOWN, $1, LT__SURGE + $C8, $1 - object SPRITE_GENTLEMAN, $9, $6, FACE, RIGHT, $2, GENTLEMAN + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_2, $3, $8, FACE, RIGHT, $3, ROCKER + $C8, $1 - object SPRITE_SAILOR, $0, $a, FACE, LEFT, $4, SAILOR + $C8, $8 - object SPRITE_GYM_HELPER, $4, $e, FACE, DOWN, $5 ; person + object SPRITE_ROCKER, $5, $1, STAY, DOWN, $1, LT__SURGE + $C8, $1 + object SPRITE_GENTLEMAN, $9, $6, STAY, LEFT, $2, GENTLEMAN + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_2, $3, $8, STAY, LEFT, $3, ROCKER + $C8, $1 + object SPRITE_SAILOR, $0, $a, STAY, RIGHT, $4, SAILOR + $C8, $8 + object SPRITE_GYM_HELPER, $4, $e, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP VERMILION_GYM_WIDTH, $11, $4 diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/vermilionhouse1.asm index 2e8ddcb4..952661cc 100755 --- a/data/mapObjects/vermilionhouse1.asm +++ b/data/mapObjects/vermilionhouse1.asm @@ -8,9 +8,9 @@ VermilionHouse1Object: ; 0x1db20 (size=38) db $0 ; signs db $3 ; objects - object SPRITE_BUG_CATCHER, $5, $3, FACE, RIGHT, $1 ; person + object SPRITE_BUG_CATCHER, $5, $3, STAY, LEFT, $1 ; person object SPRITE_BIRD, $3, $5, WALK, $2, $2 ; person - object SPRITE_PAPER_SHEET, $4, $3, FACE, STAY, $3 ; person + object SPRITE_PAPER_SHEET, $4, $3, STAY, NONE, $3 ; person ; warp-to EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $2 diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/vermilionhouse2.asm index 1feac502..03c3c1a2 100755 --- a/data/mapObjects/vermilionhouse2.asm +++ b/data/mapObjects/vermilionhouse2.asm @@ -8,7 +8,7 @@ VermilionHouse2Object: ; 0x560cf (size=26) db $0 ; signs db $1 ; objects - object SPRITE_FISHER, $2, $4, FACE, LEFT, $1 ; person + object SPRITE_FISHER, $2, $4, STAY, RIGHT, $1 ; person ; warp-to EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $2 diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/vermilionhouse3.asm index 31433ff2..ab955a20 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/vermilionhouse3.asm @@ -8,7 +8,7 @@ VermilionHouse3Object: ; 0x19c25 (size=26) db $0 ; signs db $1 ; objects - object SPRITE_LITTLE_GIRL, $3, $5, FACE, UP, $1 ; person + object SPRITE_LITTLE_GIRL, $3, $5, STAY, UP, $1 ; person ; warp-to EVENT_DISP VERMILION_HOUSE_3_WIDTH, $7, $2 diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/vermilionmart.asm index f0211199..56c52944 100755 --- a/data/mapObjects/vermilionmart.asm +++ b/data/mapObjects/vermilionmart.asm @@ -8,8 +8,8 @@ VermilionMartObject: ; 0x5c9f4 (size=38) db $0 ; signs db $3 ; objects - object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person - object SPRITE_BLACK_HAIR_BOY_1, $5, $6, FACE, STAY, $2 ; person + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person + object SPRITE_BLACK_HAIR_BOY_1, $5, $6, STAY, NONE, $2 ; person object SPRITE_LASS, $3, $3, WALK, $2, $3 ; person ; warp-to diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/vermilionpokecenter.asm index 7898fb5d..e5d1d147 100755 --- a/data/mapObjects/vermilionpokecenter.asm +++ b/data/mapObjects/vermilionpokecenter.asm @@ -8,10 +8,10 @@ VermilionPokecenterObject: ; 0x5c9a9 (size=44) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person - object SPRITE_FISHER, $a, $5, FACE, STAY, $2 ; person - object SPRITE_SAILOR, $5, $4, FACE, STAY, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_FISHER, $a, $5, STAY, NONE, $2 ; person + object SPRITE_SAILOR, $5, $4, STAY, NONE, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $3 diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm index bdd6369a..75552f36 100755 --- a/data/mapObjects/victoryroad1.asm +++ b/data/mapObjects/victoryroad1.asm @@ -9,13 +9,13 @@ VictoryRoad1Object: ; 0x5dab8 (size=76) db $0 ; signs db $7 ; objects - object SPRITE_LASS, $7, $5, FACE, LEFT, $1, COOLTRAINER_F + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_1, $3, $2, FACE, DOWN, $2, COOLTRAINER_M + $C8, $5 - object SPRITE_BALL, $b, $0, FACE, STAY, $3, TM_43 - object SPRITE_BALL, $9, $2, FACE, STAY, $4, RARE_CANDY - object SPRITE_BOULDER, $5, $f, FACE, BOULDER_MOVEMENT_BYTE_2, $5 ; person - object SPRITE_BOULDER, $e, $2, FACE, BOULDER_MOVEMENT_BYTE_2, $6 ; person - object SPRITE_BOULDER, $2, $a, FACE, BOULDER_MOVEMENT_BYTE_2, $7 ; person + object SPRITE_LASS, $7, $5, STAY, RIGHT, $1, COOLTRAINER_F + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_1, $3, $2, STAY, DOWN, $2, COOLTRAINER_M + $C8, $5 + object SPRITE_BALL, $b, $0, STAY, NONE, $3, TM_43 + object SPRITE_BALL, $9, $2, STAY, NONE, $4, RARE_CANDY + object SPRITE_BOULDER, $5, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $5 ; person + object SPRITE_BOULDER, $e, $2, STAY, BOULDER_MOVEMENT_BYTE_2, $6 ; person + object SPRITE_BOULDER, $2, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person ; warp-to EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8 diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 0a17e2e8..3d6cd633 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -13,19 +13,19 @@ VictoryRoad2Object: ; 0x51915 (size=154) db $0 ; signs db $d ; objects - object SPRITE_HIKER, $c, $9, FACE, RIGHT, $1, BLACKBELT + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $15, $d, FACE, RIGHT, $2, JUGGLER + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $13, $8, FACE, DOWN, $3, TAMER + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $4, $2, FACE, DOWN, $4, POKEMANIAC + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, FACE, RIGHT, $5, JUGGLER + $C8, $5 - object SPRITE_BIRD, $b, $5, FACE, UP, $6, MOLTRES, 50 - object SPRITE_BALL, $1b, $5, FACE, STAY, $7, TM_17 - object SPRITE_BALL, $12, $9, FACE, STAY, $8, FULL_HEAL - object SPRITE_BALL, $9, $b, FACE, STAY, $9, TM_05 - object SPRITE_BALL, $b, $0, FACE, STAY, $a, GUARD_SPEC_ - object SPRITE_BOULDER, $4, $e, FACE, BOULDER_MOVEMENT_BYTE_2, $b ; person - object SPRITE_BOULDER, $5, $5, FACE, BOULDER_MOVEMENT_BYTE_2, $c ; person - object SPRITE_BOULDER, $17, $10, FACE, BOULDER_MOVEMENT_BYTE_2, $d ; person + object SPRITE_HIKER, $c, $9, STAY, LEFT, $1, BLACKBELT + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $15, $d, STAY, LEFT, $2, JUGGLER + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_1, $13, $8, STAY, DOWN, $3, TAMER + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, DOWN, $4, POKEMANIAC + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, STAY, LEFT, $5, JUGGLER + $C8, $5 + object SPRITE_BIRD, $b, $5, STAY, UP, $6, MOLTRES, 50 + object SPRITE_BALL, $1b, $5, STAY, NONE, $7, TM_17 + object SPRITE_BALL, $12, $9, STAY, NONE, $8, FULL_HEAL + object SPRITE_BALL, $9, $b, STAY, NONE, $9, TM_05 + object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC_ + object SPRITE_BOULDER, $4, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $b ; person + object SPRITE_BOULDER, $5, $5, STAY, BOULDER_MOVEMENT_BYTE_2, $c ; person + object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person ; warp-to EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $0 ; VICTORY_ROAD_1 diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm index 60cafafb..843b388f 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/victoryroad3.asm @@ -10,16 +10,16 @@ VictoryRoad3Object: ; 0x44acd (size=106) db $0 ; signs db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, FACE, RIGHT, $1, COOLTRAINER_M + $C8, $2 - object SPRITE_LASS, $7, $d, FACE, LEFT, $2, COOLTRAINER_F + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $6, $e, FACE, RIGHT, $3, COOLTRAINER_M + $C8, $3 - object SPRITE_LASS, $d, $3, FACE, LEFT, $4, COOLTRAINER_F + $C8, $3 - object SPRITE_BALL, $1a, $5, FACE, STAY, $5, MAX_REVIVE - object SPRITE_BALL, $7, $7, FACE, STAY, $6, TM_47 - object SPRITE_BOULDER, $16, $3, FACE, BOULDER_MOVEMENT_BYTE_2, $7 ; person - object SPRITE_BOULDER, $d, $c, FACE, BOULDER_MOVEMENT_BYTE_2, $8 ; person - object SPRITE_BOULDER, $18, $a, FACE, BOULDER_MOVEMENT_BYTE_2, $9 ; person - object SPRITE_BOULDER, $16, $f, FACE, BOULDER_MOVEMENT_BYTE_2, $a ; person + object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, STAY, LEFT, $1, COOLTRAINER_M + $C8, $2 + object SPRITE_LASS, $7, $d, STAY, RIGHT, $2, COOLTRAINER_F + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_1, $6, $e, STAY, LEFT, $3, COOLTRAINER_M + $C8, $3 + object SPRITE_LASS, $d, $3, STAY, RIGHT, $4, COOLTRAINER_F + $C8, $3 + object SPRITE_BALL, $1a, $5, STAY, NONE, $5, MAX_REVIVE + object SPRITE_BALL, $7, $7, STAY, NONE, $6, TM_47 + object SPRITE_BOULDER, $16, $3, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person + object SPRITE_BOULDER, $d, $c, STAY, BOULDER_MOVEMENT_BYTE_2, $8 ; person + object SPRITE_BOULDER, $18, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $9 ; person + object SPRITE_BOULDER, $16, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $a ; person ; warp-to EVENT_DISP VICTORY_ROAD_3_WIDTH, $7, $17 ; VICTORY_ROAD_2 diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/viridiancity.asm index dcc075c1..a2d2815f 100755 --- a/data/mapObjects/viridiancity.asm +++ b/data/mapObjects/viridiancity.asm @@ -18,11 +18,11 @@ ViridianCityObject: ; 0x18384 (size=104) db $7 ; objects object SPRITE_BUG_CATCHER, $d, $14, WALK, $0, $1 ; person - object SPRITE_GAMBLER, $1e, $8, FACE, STAY, $2 ; person + object SPRITE_GAMBLER, $1e, $8, STAY, NONE, $2 ; person object SPRITE_BUG_CATCHER, $1e, $19, WALK, $0, $3 ; person - object SPRITE_GIRL, $11, $9, FACE, LEFT, $4 ; person - object SPRITE_LYING_OLD_MAN, $12, $9, FACE, STAY, $5 ; person - object SPRITE_FISHER2, $6, $17, FACE, DOWN, $6 ; person + object SPRITE_GIRL, $11, $9, STAY, RIGHT, $4 ; person + object SPRITE_LYING_OLD_MAN, $12, $9, STAY, NONE, $5 ; person + object SPRITE_FISHER2, $6, $17, STAY, DOWN, $6 ; person object SPRITE_GAMBLER, $11, $5, WALK, $2, $7 ; person ; warp-to diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/viridianforest.asm index 55daa691..1ae1d1e2 100755 --- a/data/mapObjects/viridianforest.asm +++ b/data/mapObjects/viridianforest.asm @@ -18,14 +18,14 @@ ViridianForestObject: ; 0x611da (size=127) db $1, $2, $e ; ViridianForestText14 db $8 ; objects - object SPRITE_BUG_CATCHER, $10, $2b, FACE, STAY, $1 ; person - object SPRITE_BUG_CATCHER, $1e, $21, FACE, RIGHT, $2, BUG_CATCHER + $C8, $1 - object SPRITE_BUG_CATCHER, $1e, $13, FACE, RIGHT, $3, BUG_CATCHER + $C8, $2 - object SPRITE_BUG_CATCHER, $2, $12, FACE, RIGHT, $4, BUG_CATCHER + $C8, $3 - object SPRITE_BALL, $19, $b, FACE, STAY, $5, ANTIDOTE - object SPRITE_BALL, $c, $1d, FACE, STAY, $6, POTION - object SPRITE_BALL, $1, $1f, FACE, STAY, $7, POKE_BALL - object SPRITE_BUG_CATCHER, $1b, $28, FACE, STAY, $8 ; person + object SPRITE_BUG_CATCHER, $10, $2b, STAY, NONE, $1 ; person + object SPRITE_BUG_CATCHER, $1e, $21, STAY, LEFT, $2, BUG_CATCHER + $C8, $1 + object SPRITE_BUG_CATCHER, $1e, $13, STAY, LEFT, $3, BUG_CATCHER + $C8, $2 + object SPRITE_BUG_CATCHER, $2, $12, STAY, LEFT, $4, BUG_CATCHER + $C8, $3 + object SPRITE_BALL, $19, $b, STAY, NONE, $5, ANTIDOTE + object SPRITE_BALL, $c, $1d, STAY, NONE, $6, POTION + object SPRITE_BALL, $1, $1f, STAY, NONE, $7, POKE_BALL + object SPRITE_BUG_CATCHER, $1b, $28, STAY, NONE, $8 ; person ; warp-to EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index 5a6bebf7..fc676a6d 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -10,7 +10,7 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48) db $0 ; signs db $2 ; objects - object SPRITE_GIRL, $8, $4, FACE, RIGHT, $1 ; person + object SPRITE_GIRL, $8, $4, STAY, LEFT, $1 ; person object SPRITE_LITTLE_GIRL, $2, $4, WALK, $1, $2 ; person ; warp-to diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/viridianforestexit.asm index 9ac6fc96..be8b65ea 100755 --- a/data/mapObjects/viridianforestexit.asm +++ b/data/mapObjects/viridianforestexit.asm @@ -10,8 +10,8 @@ ViridianForestExitObject: ; 0x5d598 (size=48) db $0 ; signs db $2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $2, FACE, STAY, $1 ; person - object SPRITE_OLD_PERSON, $2, $5, FACE, STAY, $2 ; person + object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, NONE, $1 ; person + object SPRITE_OLD_PERSON, $2, $5, STAY, NONE, $2 ; person ; warp-to EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $4 diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index 63fe3eee..fb81788d 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -8,17 +8,17 @@ ViridianGymObject: ; 0x74bde (size=105) db $0 ; signs db $b ; objects - object SPRITE_GIOVANNI, $2, $1, FACE, DOWN, $1, GIOVANNI + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_1, $c, $7, FACE, DOWN, $2, COOLTRAINER_M + $C8, $9 - object SPRITE_HIKER, $b, $b, FACE, UP, $3, BLACKBELT + $C8, $6 - object SPRITE_ROCKER, $a, $7, FACE, DOWN, $4, TAMER + $C8, $3 - object SPRITE_HIKER, $3, $7, FACE, RIGHT, $5, BLACKBELT + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_1, $d, $5, FACE, LEFT, $6, COOLTRAINER_M + $C8, $a - object SPRITE_HIKER, $a, $1, FACE, DOWN, $7, BLACKBELT + $C8, $8 - object SPRITE_ROCKER, $2, $10, FACE, LEFT, $8, TAMER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $6, $5, FACE, DOWN, $9, COOLTRAINER_M + $C8, $1 - object SPRITE_GYM_HELPER, $10, $f, FACE, DOWN, $a ; person - object SPRITE_BALL, $10, $9, FACE, STAY, $b, REVIVE + object SPRITE_GIOVANNI, $2, $1, STAY, DOWN, $1, GIOVANNI + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_1, $c, $7, STAY, DOWN, $2, COOLTRAINER_M + $C8, $9 + object SPRITE_HIKER, $b, $b, STAY, UP, $3, BLACKBELT + $C8, $6 + object SPRITE_ROCKER, $a, $7, STAY, DOWN, $4, TAMER + $C8, $3 + object SPRITE_HIKER, $3, $7, STAY, LEFT, $5, BLACKBELT + $C8, $7 + object SPRITE_BLACK_HAIR_BOY_1, $d, $5, STAY, RIGHT, $6, COOLTRAINER_M + $C8, $a + object SPRITE_HIKER, $a, $1, STAY, DOWN, $7, BLACKBELT + $C8, $8 + object SPRITE_ROCKER, $2, $10, STAY, RIGHT, $8, TAMER + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9, COOLTRAINER_M + $C8, $1 + object SPRITE_GYM_HELPER, $10, $f, STAY, DOWN, $a ; person + object SPRITE_BALL, $10, $9, STAY, NONE, $b, REVIVE ; warp-to EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $10 diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/viridianhouse.asm index 30dd6356..ba45adac 100755 --- a/data/mapObjects/viridianhouse.asm +++ b/data/mapObjects/viridianhouse.asm @@ -8,10 +8,10 @@ ViridianHouseObject: ; 0x1d5bb (size=44) db $0 ; signs db $4 ; objects - object SPRITE_BALDING_GUY, $5, $3, FACE, STAY, $1 ; person + object SPRITE_BALDING_GUY, $5, $3, STAY, NONE, $1 ; person object SPRITE_LITTLE_GIRL, $1, $4, WALK, $1, $2 ; person object SPRITE_BIRD, $5, $5, WALK, $2, $3 ; person - object SPRITE_CLIPBOARD, $4, $0, FACE, STAY, $4 ; person + object SPRITE_CLIPBOARD, $4, $0, STAY, NONE, $4 ; person ; warp-to EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $2 diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/viridianmart.asm index d85d089b..ed2642f9 100755 --- a/data/mapObjects/viridianmart.asm +++ b/data/mapObjects/viridianmart.asm @@ -8,9 +8,9 @@ ViridianMartObject: ; 0x1d50a (size=38) db $0 ; signs db $3 ; objects - object SPRITE_MART_GUY, $0, $5, FACE, LEFT, $1 ; person + object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person object SPRITE_BUG_CATCHER, $5, $5, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $3, $3, FACE, STAY, $3 ; person + object SPRITE_BLACK_HAIR_BOY_1, $3, $3, STAY, NONE, $3 ; person ; warp-to EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $3 diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 8423ea1a..652efb97 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -8,10 +8,10 @@ ViridianPokecenterObject: ; 0x44277 (size=44) db $0 ; signs db $4 ; objects - object SPRITE_NURSE, $3, $1, FACE, DOWN, $1 ; person + object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_GENTLEMAN, $a, $5, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $4, $3, FACE, STAY, $3 ; person - object SPRITE_CABLE_CLUB_WOMAN, $b, $2, FACE, DOWN, $4 ; person + object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, NONE, $3 ; person + object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person ; warp-to EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3 diff --git a/macros.asm b/macros.asm index 5fc6c348..c207a5b8 100644 --- a/macros.asm +++ b/macros.asm @@ -233,18 +233,18 @@ tx_pre_jump: MACRO ENDM WALK EQU $FE -FACE EQU $FF +STAY EQU $FF DOWN EQU $D0 UP EQU $D1 -RIGHT EQU $D2 -LEFT EQU $D3 -STAY EQU $FF +LEFT EQU $D2 +RIGHT EQU $D3 +NONE EQU $FF ;\1 sprite id ;\2 x position ;\3 y position -;\4 movement (WALK/FACE) +;\4 movement (WALK/STAY) ;\5 range or direction ;\6 text id ;\7 items only: item id -- cgit v1.3.1-sl0p From 006507ed53349ce932681b1a40995b12d4ebf999 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 18 Jul 2015 23:39:29 -0500 Subject: A few missed object constants --- data/mapObjects/colosseum.asm | 2 +- data/mapObjects/tradecenter.asm | 2 +- macros.asm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'macros.asm') diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm index 0304368d..5be02b44 100755 --- a/data/mapObjects/colosseum.asm +++ b/data/mapObjects/colosseum.asm @@ -6,4 +6,4 @@ ColosseumObject: ; 0x4fd87 (size=10) db $0 ; signs db $1 ; objects - object SPRITE_RED, $2, $2, $ff, $0, $1 ; person + object SPRITE_RED, $2, $2, STAY, $0, $1 ; person diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/tradecenter.asm index ff6fc5e3..57a3eee5 100755 --- a/data/mapObjects/tradecenter.asm +++ b/data/mapObjects/tradecenter.asm @@ -6,4 +6,4 @@ TradeCenterObject: ; 0x4fd53 (size=10) db $0 ; signs db $1 ; objects - object SPRITE_RED, $2, $2, $ff, $0, $1 ; person + object SPRITE_RED, $2, $2, STAY, $0, $1 ; person diff --git a/macros.asm b/macros.asm index c207a5b8..5f1deaf6 100644 --- a/macros.asm +++ b/macros.asm @@ -594,7 +594,7 @@ WEST_MAP_CONNECTION: MACRO db \2_WIDTH ; map width db (\3 - \4) * -2 ; y alignment db (\2_WIDTH * 2) - 1 ; x alignment - dw wOverworldMap + 6 + (2 * \2_WIDTH) ; window (position of the upper left block after entring the map) + dw wOverworldMap + 6 + (2 * \2_WIDTH) ; window (position of the upper left block after entering the map) ENDM ;\1 (byte) = current map id -- cgit v1.3.1-sl0p From c169073eed4f0362ef42170098a141a2fcbd71d0 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 18 Jul 2015 20:49:52 -0700 Subject: misc --- constants/misc_constants.asm | 1 - engine/HoF_room_pc.asm | 2 +- engine/battle/animations.asm | 10 +- engine/battle/core.asm | 2 +- engine/battle/experience.asm | 2 +- engine/battle/init_battle_variables.asm | 2 +- engine/cable_club.asm | 2 +- engine/evolution.asm | 67 ++++++------ engine/evos_moves.asm | 68 +++++++----- engine/experience.asm | 84 ++++++++------- engine/game_corner_slots.asm | 2 +- engine/game_corner_slots2.asm | 4 +- engine/give_pokemon.asm | 25 +++-- engine/hidden_object_functions17.asm | 6 +- engine/hidden_object_functions7.asm | 2 +- engine/items/itemfinder.asm | 32 +++--- engine/items/items.asm | 36 +++---- engine/menu/league_pc.asm | 8 +- engine/menu/main_menu.asm | 120 +++++++++++---------- engine/menu/pokedex.asm | 18 ++-- engine/menu/prize_menu.asm | 10 +- engine/menu/status_screen.asm | 43 ++++---- engine/oak_speech.asm | 4 +- engine/oam_dma.asm | 2 +- engine/overworld/hidden_items.asm | 44 ++++---- engine/overworld/hidden_objects.asm | 10 +- engine/overworld/movement.asm | 17 ++- engine/palettes.asm | 46 ++++---- engine/predefs.asm | 8 +- engine/save.asm | 181 +++++++++++++++++--------------- engine/slot_machine.asm | 2 +- engine/titlescreen.asm | 2 +- home/init.asm | 16 +-- hram.asm | 4 + macros.asm | 2 +- main.asm | 8 +- scripts/agatha.asm | 2 +- scripts/bruno.asm | 2 +- scripts/ceruleancity.asm | 2 +- scripts/daycarem.asm | 144 +++++++++++++------------ scripts/lance.asm | 2 +- scripts/lorelei.asm | 2 +- scripts/mansion3.asm | 2 +- scripts/mtmoonpokecenter.asm | 36 +++---- scripts/museum1f.asm | 8 +- scripts/oakslab.asm | 20 ++-- scripts/pewterpokecenter.asm | 34 +++--- scripts/safarizoneentrance.asm | 2 +- scripts/seafoamislands1.asm | 4 +- scripts/seafoamislands2.asm | 4 +- scripts/seafoamislands3.asm | 4 +- scripts/seafoamislands4.asm | 4 +- scripts/seafoamislands5.asm | 4 +- scripts/silphco7.asm | 2 +- scripts/vermiliondock.asm | 47 +++++---- scripts/victoryroad2.asm | 2 +- scripts/victoryroad3.asm | 8 +- sram.asm | 8 +- text/maps/daycare_1.asm | 20 ++-- text/maps/daycare_2.asm | 14 +-- wram.asm | 86 +++++++++++++-- 61 files changed, 743 insertions(+), 612 deletions(-) (limited to 'macros.asm') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 5eecb38f..c06e7a65 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -10,7 +10,6 @@ HOF_MON EQU $10 HOF_TEAM EQU PARTY_LENGTH * HOF_MON HOF_TEAM_CAPACITY EQU 50 - A_BUTTON EQU %00000001 B_BUTTON EQU %00000010 SELECT EQU %00000100 diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index dc05814a..06c926db 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -29,7 +29,7 @@ HallOfFamePC: ; 7405c (1d:405c) ld c, 128 call DelayFrames xor a - ld [wWhichTrade], a + ld [wNumCreditsMonsDisplayed - 1], a ; not read ld [wNumCreditsMonsDisplayed], a jp Credits diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 6803c38b..d21e07e5 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -796,9 +796,9 @@ DoBallShakeSpecialEffects: ; 78f96 (1e:4f96) dec a ret nz ; if it's the end of the ball shaking subanimation, check if more shakes are left and restart the subanimation - ld a,[wWhichTrade] ; number of shakes + ld a,[wNumShakes] ; number of shakes dec a ; decrement number of shakes - ld [wWhichTrade],a + ld [wNumShakes],a ret z ; if there are shakes left, restart the subanimation ld a,[W_SUBANIMSUBENTRYADDR] @@ -1998,11 +1998,11 @@ AnimationWavyScreen: ; 79666 (1e:5666) ret Func_796ae: ; 796ae (1e:56ae) - ld a, [$ff41] + ld a, [rSTAT] and $3 jr nz, Func_796ae ld a, [hl] - ld [$ff43], a + ld [rSCX], a inc hl ld a, [hl] cp d @@ -2895,7 +2895,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) ; store these for later ld a,b and a,$F - ld [wWhichTrade],a + ld [wNumShakes],a ld hl,.PokeBallAnimations ; choose which toss animation to use diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 5deeb4dc..3cf3c9e9 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6298,7 +6298,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) dec de dec de xor a - ld [wHPBarMaxHP], a + ld [wLearningMovesFromDayCare], a predef WriteMonMoves ; get moves based on current level .loadMovePPs ld hl, wEnemyMonMoves diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 11a1e87c..6ec8c463 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -254,7 +254,7 @@ GainExperience: ; 5524f (15:524f) ld a, [wd0b5] ld [wd11e], a predef LearnMoveFromLevelUp - ld hl, wccd3 + ld hl, wCanEvolveFlags ld a, [wWhichPokemon] ld c, a ld b, $1 diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index 74df62aa..f10e9f5e 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -19,7 +19,7 @@ InitBattleVariables: ; 525af (14:65af) ld hl, wcf1d ld [hli], a ld [hl], a - ld hl, wccd3 + ld hl, wCanEvolveFlags ld b, $3c .loop ld [hli], a diff --git a/engine/cable_club.asm b/engine/cable_club.asm index fbdb6260..9ccffdbb 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -297,7 +297,7 @@ CallCurrentTradeCenterFunction: ld b, 0 ld a, [wTradeCenterPointerTableIndex] cp $ff - jp z, LoadTitlescreenGraphics + jp z, DisplayTitleScreen add a ld c, a add hl, bc diff --git a/engine/evolution.asm b/engine/evolution.asm index 9ed38c21..d110110a 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -20,11 +20,11 @@ EvolveMon: ; 7bde9 (1e:7de9) xor a ld [H_AUTOBGTRANSFERENABLED], a ld [hTilesetType], a - ld a, [wHPBarMaxHP] + ld a, [wEvoOldSpecies] ld [wcf1d], a ld c, $0 call EvolutionSetWholeScreenPalette - ld a, [wHPBarMaxHP + 1] + ld a, [wEvoNewSpecies] ld [wcf91], a ld [wd0b5], a call Evolution_LoadPic @@ -32,13 +32,13 @@ EvolveMon: ; 7bde9 (1e:7de9) ld hl, vBackPic ld bc, 7 * 7 call CopyVideoData - ld a, [wHPBarMaxHP] + ld a, [wEvoOldSpecies] ld [wcf91], a ld [wd0b5], a call Evolution_LoadPic ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a - ld a, [wHPBarMaxHP] + ld a, [wEvoOldSpecies] call PlayCry call WaitForSoundToFinish ld c, BANK(Music_SafariZone) @@ -49,23 +49,23 @@ EvolveMon: ; 7bde9 (1e:7de9) ld c, $1 call EvolutionSetWholeScreenPalette ld bc, $110 -.asm_7be63 +.animLoop push bc call Evolution_CheckForCancel jr c, .evolutionCancelled - call Func_7bec2 + call Evolution_BackAndForthAnim pop bc inc b dec c dec c - jr nz, .asm_7be63 + jr nz, .animLoop xor a - ld [wHPBarOldHP + 1], a + ld [wEvoCancelled], a ld a, $31 - ld [wHPBarOldHP], a - call Func_7bed6 - ld a, [wHPBarMaxHP + 1] -.afterCancellation + ld [wEvoMonTileOffset], a + call Evolution_ChangeMonPic ; show the new species pic + ld a, [wEvoNewSpecies] +.done ld [wcf1d], a ld a, $ff ld [wc0ee], a @@ -81,17 +81,17 @@ EvolveMon: ; 7bde9 (1e:7de9) pop bc pop de pop hl - ld a, [wHPBarOldHP + 1] + ld a, [wEvoCancelled] and a ret z scf ret .evolutionCancelled pop bc - ld a, $1 - ld [wHPBarOldHP + 1], a - ld a, [wHPBarMaxHP] - jr .afterCancellation + ld a, 1 + ld [wEvoCancelled], a + ld a, [wEvoOldSpecies] + jr .done EvolutionSetWholeScreenPalette: ; 7beb4 (1e:7eb4) ld b, $b @@ -102,37 +102,38 @@ Evolution_LoadPic: ; 7beb9 (1e:7eb9) coord hl, 7, 2 jp LoadFlippedFrontSpriteByMonIndex -Func_7bec2: ; 7bec2 (1e:7ec2) +Evolution_BackAndForthAnim: ; 7bec2 (1e:7ec2) +; show the mon change back and forth between the new and old species b times ld a, $31 - ld [wHPBarOldHP], a - call Func_7bed6 - ld a, $cf - ld [wHPBarOldHP], a - call Func_7bed6 + ld [wEvoMonTileOffset], a + call Evolution_ChangeMonPic + ld a, -$31 + ld [wEvoMonTileOffset], a + call Evolution_ChangeMonPic dec b - jr nz, Func_7bec2 + jr nz, Evolution_BackAndForthAnim ret -Func_7bed6: ; 7bed6 (1e:7ed6) +Evolution_ChangeMonPic: ; 7bed6 (1e:7ed6) push bc xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 7, 2 - ld bc, $707 - ld de, $d -.asm_7bee3 + lb bc, 7, 7 + ld de, SCREEN_WIDTH - 7 +.loop push bc -.asm_7bee4 - ld a, [wHPBarOldHP] +.innerLoop + ld a, [wEvoMonTileOffset] add [hl] ld [hli], a dec c - jr nz, .asm_7bee4 + jr nz, .innerLoop pop bc add hl, de dec b - jr nz, .asm_7bee3 - ld a, $1 + jr nz, .loop + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 pop bc diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 4a253c68..9a0f2d84 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -1,6 +1,6 @@ ; try to evolve the mon in [wWhichPokemon] TryEvolvingMon: ; 3ad0e (e:6d0e) - ld hl, wccd3 + ld hl, wCanEvolveFlags xor a ld [hl], a ld a, [wWhichPokemon] @@ -31,17 +31,17 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [hl] cp $ff ; have we reached the end of the party? jp z, .done - ld [wHPBarMaxHP], a + ld [wEvoOldSpecies], a push hl ld a, [wWhichPokemon] ld c, a - ld hl, wccd3 + ld hl, wCanEvolveFlags ld b, $2 call Evolution_FlagAction ld a, c and a ; is the mon's bit set? jp z, Evolution_PartyMonLoop ; if not, go to the next mon - ld a, [wHPBarMaxHP] + ld a, [wEvoOldSpecies] dec a ld b, 0 ld hl, EvosMovesPointerTable @@ -110,7 +110,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld [wd121], a push hl ld a, [hl] - ld [wHPBarMaxHP + 1], a + ld [wEvoNewSpecies], a ld a, [wWhichPokemon] ld hl, wPartyMonNicks call GetPartyMonName @@ -122,7 +122,7 @@ Evolution_PartyMonLoop: ; loop over party mons xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 0, 0 - ld bc, $c14 + lb bc, 12, 20 call ClearScreenArea ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a @@ -137,7 +137,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [hl] ld [wd0b5], a ld [wLoadedMonSpecies], a - ld [wHPBarMaxHP + 1], a + ld [wEvoNewSpecies], a ld a, MONSTER_NAME ld [wNameListType], a ld a, BANK(TrainerNames) ; bank is not used for monster names @@ -357,7 +357,7 @@ LearnMoveFromLevelUp: ; 3af5b (e:6f5b) ld bc, wPartyMon2 - wPartyMon1 call AddNTimes .next - ld b, $4 + ld b, NUM_MOVES .checkCurrentMovesLoop ; check if the move to learn is already known ld a, [hli] cp d @@ -377,14 +377,13 @@ LearnMoveFromLevelUp: ; 3af5b (e:6f5b) ; writes the moves a mon has at level [W_CURENEMYLVL] to [de] ; move slots are being filled up sequentially and shifted if all slots are full -; [wHPBarMaxHP]: (?) WriteMonMoves: ; 3afb8 (e:6fb8) call GetPredefRegisters push hl push de push bc ld hl, EvosMovesPointerTable - ld b, $0 + ld b, 0 ld a, [wcf91] ; cur mon ID dec a add a @@ -411,25 +410,30 @@ WriteMonMoves: ; 3afb8 (e:6fb8) ld a, [W_CURENEMYLVL] cp b jp c, .done ; mon level < move level (assumption: learnset is sorted by level) - ld a, [wHPBarMaxHP] + ld a, [wLearningMovesFromDayCare] and a jr z, .skipMinLevelCheck - ld a, [wWhichTrade] ; min move level) + ld a, [wDayCareStartLevel] cp b jr nc, .nextMove2 ; min level >= move level + .skipMinLevelCheck + +; check if the move is already known push de - ld c, $4 -.moveAlreadyLearnedCheckLoop + ld c, NUM_MOVES +.alreadyKnowsCheckLoop ld a, [de] inc de cp [hl] jr z, .nextMove dec c - jr nz, .moveAlreadyLearnedCheckLoop + jr nz, .alreadyKnowsCheckLoop + +; try to find an empty move slot pop de push de - ld c, $4 + ld c, NUM_MOVES .findEmptySlotLoop ld a, [de] and a @@ -437,47 +441,55 @@ WriteMonMoves: ; 3afb8 (e:6fb8) inc de dec c jr nz, .findEmptySlotLoop - pop de ; no empty move slots found + +; no empty move slots found + pop de push de push hl ld h, d ld l, e call WriteMonMoves_ShiftMoveData ; shift all moves one up (deleting move 1) - ld a, [wHPBarMaxHP] + ld a, [wLearningMovesFromDayCare] and a jr z, .writeMoveToSlot + +; shift PP as well if learning moves from day care push de - ld bc, $12 + ld bc, wPartyMon1PP - (wPartyMon1Moves + 3) add hl, bc ld d, h ld e, l call WriteMonMoves_ShiftMoveData ; shift all move PP data one up pop de + .writeMoveToSlot pop hl .writeMoveToSlot2 ld a, [hl] ld [de], a - ld a, [wHPBarMaxHP] + ld a, [wLearningMovesFromDayCare] and a jr z, .nextMove - push hl ; write move PP value + +; write move PP value if learning moves from day care + push hl ld a, [hl] - ld hl, $15 + ld hl, wPartyMon1PP - wPartyMon1Moves add hl, de push hl dec a ld hl, Moves - ld bc, $6 + ld bc, 6 call AddNTimes - ld de, wHPBarMaxHP + ld de, wBuffer ld a, BANK(Moves) call FarCopyData - ld a, [wHPBarNewHP + 1] + ld a, [wBuffer + 5] pop hl ld [hl], a pop hl jr .nextMove + .done pop bc pop de @@ -486,13 +498,13 @@ WriteMonMoves: ; 3afb8 (e:6fb8) ; shifts all move data one up (freeing 4th move slot) WriteMonMoves_ShiftMoveData: ; 3b04e (e:704e) - ld c, $3 -.asm_3b050 + ld c, NUM_MOVES - 1 +.loop inc de ld a, [de] ld [hli], a dec c - jr nz, .asm_3b050 + jr nz, .loop ret Evolution_FlagAction: ; 3b057 (e:7057) diff --git a/engine/experience.asm b/engine/experience.asm index 752536cf..b43fbcf9 100755 --- a/engine/experience.asm +++ b/engine/experience.asm @@ -10,15 +10,15 @@ CalcLevelFromExperience: ; 58f43 (16:4f43) push hl ld hl, wLoadedMonExp + 2 ; current exp ; compare exp needed for level d with current exp - ld a, [H_MULTIPLICAND + 2] + ld a, [hExperience + 2] ld c, a ld a, [hld] sub c - ld a, [H_MULTIPLICAND + 1] + ld a, [hExperience + 1] ld c, a ld a, [hld] sbc c - ld a, [H_MULTIPLICAND] + ld a, [hExperience] ld c, a ld a, [hl] sbc c @@ -33,7 +33,7 @@ CalcExperience: ; 58f6a (16:4f6a) add a add a ld c, a - ld b, $0 + ld b, 0 ld hl, GrowthRateTable add hl, bc call CalcDSquared @@ -50,96 +50,100 @@ CalcExperience: ; 58f6a (16:4f6a) ld [H_DIVISOR], a ld b, $4 call Divide - ld a, [H_MULTIPLICAND] ; (aliases: H_NUMTOPRINT) + ld a, [H_QUOTIENT + 1] push af - ld a, [H_MULTIPLICAND+1] + ld a, [H_QUOTIENT + 2] push af - ld a, [H_MULTIPLICAND+2] + ld a, [H_QUOTIENT + 3] push af call CalcDSquared ld a, [hl] and $7f ld [H_MULTIPLIER], a call Multiply - ld a, [H_MULTIPLICAND] ; (aliases: H_NUMTOPRINT) + ld a, [H_PRODUCT + 1] push af - ld a, [H_MULTIPLICAND+1] + ld a, [H_PRODUCT + 2] push af - ld a, [H_MULTIPLICAND+2] + ld a, [H_PRODUCT + 3] push af ld a, [hli] push af xor a ld [H_MULTIPLICAND], a - ld [H_MULTIPLICAND+1], a + ld [H_MULTIPLICAND + 1], a ld a, d - ld [H_MULTIPLICAND+2], a + ld [H_MULTIPLICAND + 2], a ld a, [hli] ld [H_MULTIPLIER], a call Multiply ld b, [hl] - ld a, [H_MULTIPLICAND+2] + ld a, [H_PRODUCT + 3] sub b - ld [H_MULTIPLICAND+2], a + ld [H_PRODUCT + 3], a ld b, $0 - ld a, [H_MULTIPLICAND+1] + ld a, [H_PRODUCT + 2] sbc b - ld [H_MULTIPLICAND+1], a - ld a, [H_MULTIPLICAND] + ld [H_PRODUCT + 2], a + ld a, [H_PRODUCT + 1] sbc b - ld [H_MULTIPLICAND], a + ld [H_PRODUCT + 1], a +; The difference of the linear term and the constant term consists of 3 bytes +; starting at H_PRODUCT + 1. Below, hExperience (an alias of that address) will +; be used instead for the further work of adding or subtracting the squared +; term and adding the cubed term. pop af and $80 jr nz, .subtractSquaredTerm ; check sign pop bc - ld a, [H_MULTIPLICAND+2] + ld a, [hExperience + 2] add b - ld [H_MULTIPLICAND+2], a + ld [hExperience + 2], a pop bc - ld a, [H_MULTIPLICAND+1] + ld a, [hExperience + 1] adc b - ld [H_MULTIPLICAND+1], a + ld [hExperience + 1], a pop bc - ld a, [H_MULTIPLICAND] + ld a, [hExperience] adc b - ld [H_MULTIPLICAND], a + ld [hExperience], a jr .addCubedTerm .subtractSquaredTerm pop bc - ld a, [H_MULTIPLICAND+2] + ld a, [hExperience + 2] sub b - ld [H_MULTIPLICAND+2], a + ld [hExperience + 2], a pop bc - ld a, [H_MULTIPLICAND+1] + ld a, [hExperience + 1] sbc b - ld [H_MULTIPLICAND+1], a + ld [hExperience + 1], a pop bc - ld a, [H_MULTIPLICAND] + ld a, [hExperience] sbc b - ld [H_MULTIPLICAND], a + ld [hExperience], a .addCubedTerm pop bc - ld a, [H_MULTIPLICAND+2] + ld a, [hExperience + 2] add b - ld [H_MULTIPLICAND+2], a + ld [hExperience + 2], a pop bc - ld a, [H_MULTIPLICAND+1] + ld a, [hExperience + 1] adc b - ld [H_MULTIPLICAND+1], a + ld [hExperience + 1], a pop bc - ld a, [H_MULTIPLICAND] + ld a, [hExperience] adc b - ld [H_MULTIPLICAND], a + ld [hExperience], a ret ; calculates d*d CalcDSquared: ; 59010 (16:5010) xor a - ld [H_MULTIPLICAND], a ; (aliases: H_NUMTOPRINT) - ld [H_MULTIPLICAND+1], a + ld [H_MULTIPLICAND], a + ld [H_MULTIPLICAND + 1], a ld a, d - ld [H_MULTIPLICAND+2], a - ld [H_MULTIPLIER], a ; (aliases: H_DIVISOR, H_REMAINDER, H_POWEROFTEN) + ld [H_MULTIPLICAND + 2], a + ld [H_MULTIPLIER], a jp Multiply ; each entry has the following scheme: diff --git a/engine/game_corner_slots.asm b/engine/game_corner_slots.asm index b3b2490c..ff17d4d3 100755 --- a/engine/game_corner_slots.asm +++ b/engine/game_corner_slots.asm @@ -7,7 +7,7 @@ StartSlotMachine: ; 37e2d (d:7e2d) cp $ff jr z, .printSomeonesKeys callba AbleToPlaySlotsCheck - ld a, [wHiddenObjectFunctionArgument] + ld a, [wCanPlaySlots] and a ret z ld a, [wLuckySlotHiddenObjectIndex] diff --git a/engine/game_corner_slots2.asm b/engine/game_corner_slots2.asm index 850b1f99..643536ea 100755 --- a/engine/game_corner_slots2.asm +++ b/engine/game_corner_slots2.asm @@ -1,4 +1,4 @@ -AbleToPlaySlotsCheck ; 2ff09 (b:7f09) +AbleToPlaySlotsCheck: ; 2ff09 (b:7f09) ld a, [wSpriteStateData1 + 2] and $8 jr z, .done ; not able @@ -19,7 +19,7 @@ AbleToPlaySlotsCheck ; 2ff09 (b:7f09) call PrintPredefTextID xor a .done - ld [wWhichTrade], a + ld [wCanPlaySlots], a ret GameCornerCoinCaseText: ; 2ff32 (b:7f32) diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 45e88b9c..4b45631d 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -1,13 +1,16 @@ _GivePokemon: ; 4fda5 (13:7da5) +; returns success in carry +; and whether the mon was added to the party in [wAddedToParty] call EnableAutoTextBoxDrawing xor a - ld [wccd3], a + ld [wAddedToParty], a ld a, [wPartyCount] cp PARTY_LENGTH - jr c, .asm_4fe01 + jr c, .addToParty ld a, [W_NUMINBOX] cp MONS_PER_BOX - jr nc, .asm_4fdf9 + jr nc, .boxFull +; add to box xor a ld [W_ENEMYBATTSTATUS3], a ld a, [wcf91] @@ -19,32 +22,32 @@ _GivePokemon: ; 4fda5 (13:7da5) ld a, [wCurrentBoxNum] and $7f cp 9 - jr c, .asm_4fdec + jr c, .singleDigitBoxNum sub 9 ld [hl], "1" inc hl add "0" - jr .asm_4fdee -.asm_4fdec + jr .next +.singleDigitBoxNum add "1" -.asm_4fdee +.next ld [hli], a ld [hl], "@" ld hl, SetToBoxText call PrintText scf ret -.asm_4fdf9 +.boxFull ld hl, BoxIsFullText call PrintText and a ret -.asm_4fe01 +.addToParty call SetPokedexOwnedFlag call AddPartyMon - ld a, $1 + ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld [wccd3], a + ld [wAddedToParty], a scf ret diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 841929b8..44941d36 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -55,7 +55,7 @@ KabutopsFossilText: ; 5dbd4 (17:5bd4) DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9) ; Displays a pokemon's front sprite in a pop-up window. ; [wcf91] = pokemon interal id number - ld a, $1 + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a @@ -85,7 +85,7 @@ PrintBlackboardLinkCableText: ; 5dc1a (17:5c1a) call EnableAutoTextBoxDrawing ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, [wWhichTrade] + ld a, [wHiddenObjectFunctionArgument] call PrintPredefTextID ret @@ -310,7 +310,7 @@ VermilionGymTrashText: ; 5ddf7 (17:5df7) GymTrashScript: ; 5ddfc (17:5dfc) call EnableAutoTextBoxDrawing - ld a, [wWhichTrade] + ld a, [wHiddenObjectFunctionArgument] ld [wcd5b], a ; Don't do the trash can puzzle if it's already been done. diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index 31ae17a4..8e8b27b1 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -128,7 +128,7 @@ CinnabarGymQuiz: ; 1ea25 (7:6a25) TX_ASM xor a ld [wda38], a - ld a, [wWhichTrade] + ld a, [wHiddenObjectFunctionArgument] push af and $f ld [$ffdb], a diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm index 96abecd3..51277632 100755 --- a/engine/items/itemfinder.asm +++ b/engine/items/itemfinder.asm @@ -1,14 +1,14 @@ HiddenItemNear: ; 7481f (1d:481f) ld hl, HiddenItemCoords - ld b, $0 -.asm_74824 - ld de, $0003 + ld b, 0 +.loop + ld de, 3 ld a, [W_CURMAP] call IsInRestOfArray ret nc ; return if current map has no hidden items push bc push hl - ld hl, wd6f0 + ld hl, wObtainedHiddenItemsFlags ld c, b ld b, $2 predef FlagActionPredef @@ -22,28 +22,30 @@ HiddenItemNear: ; 7481f (1d:481f) inc hl ld e, [hl] inc hl - jr nz, .asm_74824 + jr nz, .loop ; if the item has already been obtained +; check if the item is within 4-5 tiles (depending on the direction of item) ld a, [W_YCOORD] - call Func_7486b + call Sub5ClampTo0 cp d - jr nc, .asm_74824 + jr nc, .loop ld a, [W_YCOORD] - add $4 + add 4 cp d - jr c, .asm_74824 + jr c, .loop ld a, [W_XCOORD] - call Func_7486b + call Sub5ClampTo0 cp e - jr nc, .asm_74824 + jr nc, .loop ld a, [W_XCOORD] - add $5 + add 5 cp e - jr c, .asm_74824 + jr c, .loop scf ret -Func_7486b: ; 7486b (1d:486b) - sub $5 +Sub5ClampTo0: ; 7486b (1d:486b) +; subtract 5 but clamp to 0 + sub 5 cp $f0 ret c xor a diff --git a/engine/items/items.asm b/engine/items/items.asm index fe2d71c8..bc8d16fa 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1216,11 +1216,11 @@ ItemUseMedicine: ; dabb (3:5abb) ld bc,-19 add hl,bc ; hl now points to experience ; update experience to minimum for new level - ld a,[$ff96] + ld a,[hExperience] ld [hli],a - ld a,[$ff97] + ld a,[hExperience + 1] ld [hli],a - ld a,[$ff98] + ld a,[hExperience + 2] ld [hl],a pop hl ld a,[wWhichPokemon] @@ -1618,8 +1618,8 @@ ItemUsePokeflute: ; e140 (3:6140) jp PrintText .inBattle xor a - ld [wWhichTrade],a ; initialize variable that indicates if any pokemon were woken up to zero - ld b,~SLP & $FF + ld [wWereAnyMonsAsleep],a + ld b,~SLP & $ff ld hl,wPartyMon1Status call WakeUpEntireParty ld a,[W_ISINBATTLE] @@ -1638,7 +1638,7 @@ ItemUsePokeflute: ; e140 (3:6140) and b ; remove Sleep status ld [hl],a call LoadScreenTilesFromBuffer2 ; restore saved screen - ld a,[wWhichTrade] + ld a,[wWereAnyMonsAsleep] and a ; were any pokemon asleep before playing the flute? ld hl,PlayedFluteNoEffectText jp z,PrintText ; if no pokemon were asleep @@ -1662,9 +1662,9 @@ ItemUsePokeflute: ; e140 (3:6140) ; INPUT: ; hl must point to status of first pokemon in party (player's or enemy's) ; b must equal ~SLP -; [wWhichTrade] should be initialized to 0 +; [wWereAnyMonsAsleep] should be initialized to 0 ; OUTPUT: -; [wWhichTrade]: set to 1 if any pokemon were asleep +; [wWereAnyMonsAsleep]: set to 1 if any pokemon were asleep WakeUpEntireParty: ; e1e5 (3:61e5) ld de,44 ld c,6 @@ -1674,7 +1674,7 @@ WakeUpEntireParty: ; e1e5 (3:61e5) and a,SLP ; is pokemon asleep? jr z,.notAsleep ld a,1 - ld [wWhichTrade],a ; indicate that a pokemon had to be woken up + ld [wWereAnyMonsAsleep],a ; indicate that a pokemon had to be woken up .notAsleep pop af and b ; remove Sleep status @@ -1874,7 +1874,7 @@ ItemUsePPRestore: ; e31e (3:631e) ld a,[wWhichPokemon] push af ld a,[wcf91] - ld [wWhichTrade],a + ld [wPPRestoreItem],a .chooseMon xor a ld [wUpdateSpritesEnabled],a @@ -1884,13 +1884,13 @@ ItemUsePPRestore: ; e31e (3:631e) jr nc,.chooseMove jp .itemNotUsed .chooseMove - ld a,[wWhichTrade] + ld a,[wPPRestoreItem] cp a,ELIXER jp nc,.useElixir ; if Elixir or Max Elixir ld a,$02 ld [wMoveMenuType],a ld hl,RaisePPWhichTechniqueText - ld a,[wWhichTrade] + ld a,[wPPRestoreItem] cp a,ETHER ; is it a PP Up? jr c,.printWhichTechniqueMessage ; if so, print the raise PP message ld hl,RestorePPWhichTechniqueText ; otherwise, print the restore PP message @@ -1911,7 +1911,7 @@ ItemUsePPRestore: ; e31e (3:631e) call GetMoveName call CopyStringToCF4B ; copy name to wcf4b pop hl - ld a,[wWhichTrade] + ld a,[wPPRestoreItem] cp a,ETHER jr nc,.useEther ; if Ether or Max Ether .usePPUp @@ -1973,7 +1973,7 @@ ItemUsePPRestore: ; e31e (3:631e) add hl,bc ; hl now points to move's PP ld a,[wd11e] ld b,a ; b = max PP - ld a,[wWhichTrade] + ld a,[wPPRestoreItem] cp a,MAX_ETHER jr z,.fullyRestorePP ld a,[hl] ; move PP @@ -2005,7 +2005,7 @@ ItemUsePPRestore: ; e31e (3:631e) jr .storeNewAmount .useElixir ; decrement the item ID so that ELIXER becomes ETHER and MAX_ELIXER becomes MAX_ETHER - ld hl,wWhichTrade + ld hl,wPPRestoreItem dec [hl] dec [hl] xor a @@ -2701,13 +2701,13 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld d, a callab CalcExperience pop de - ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) + ld a, [hExperience] ld [de], a inc de - ld a, [$ff97] + ld a, [hExperience + 1] ld [de], a inc de - ld a, [$ff98] + ld a, [hExperience + 2] ld [de], a inc de xor a diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 560ed421..06a7894c 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -12,7 +12,7 @@ PKMNLeaguePC: ; 0x7657e ld [hTilesetType], a ld [W_SPRITEFLIPPED], a ld [wUpdateSpritesEnabled], a - ld [wTrainerScreenX], a + ld [wHoFTeamIndex2], a ld [wHoFTeamNo], a ld a, [wNumHoFTeams] ld b, a @@ -27,13 +27,13 @@ PKMNLeaguePC: ; 0x7657e ld hl, wHoFTeamNo inc [hl] push bc - ld a, [wTrainerScreenX] - ld [wHoFMonSpecies], a + ld a, [wHoFTeamIndex2] + ld [wHoFTeamIndex], a callba LoadHallOfFameTeams call LeaguePCShowTeam pop bc jr c, .doneShowingTeams - ld hl, wTrainerScreenX + ld hl, wHoFTeamIndex2 inc [hl] ld a, [hl] cp b diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 9e160f81..5dc6e61f 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -1,17 +1,16 @@ MainMenu: ; 5af2 (1:5af2) ; Check save file - call Func_5bff + call InitOptions xor a - ld [wd08a],a + ld [wOptionsInitialized],a inc a - ld [wd088],a - call Func_609e - jr nc,.next0 + ld [wSaveFileStatus],a + call CheckForPlayerNameInSRAM + jr nc,.mainMenuLoop - ; Predef 52 loads the save from SRAM to RAM predef LoadSAV -.next0 +.mainMenuLoop ld c,20 call DelayFrames xor a ; LINK_STATE_NONE @@ -30,9 +29,10 @@ MainMenu: ; 5af2 (1:5af2) call LoadFontTilePatterns ld hl,wd730 set 6,[hl] - ld a,[wd088] + ld a,[wSaveFileStatus] cp a,1 - jr z,.next1 + jr z,.noSaveFile +; there's a save file coord hl, 0, 0 ld b,6 ld c,13 @@ -41,7 +41,7 @@ MainMenu: ; 5af2 (1:5af2) ld de,ContinueText call PlaceString jr .next2 -.next1 +.noSaveFile coord hl, 0, 0 ld b,4 ld c,13 @@ -63,31 +63,33 @@ MainMenu: ; 5af2 (1:5af2) ld [wTopMenuItemY],a ld a,$B ld [wMenuWatchedKeys],a - ld a,[wd088] + ld a,[wSaveFileStatus] ld [wMaxMenuItem],a call HandleMenuInput - bit 1,a - jp nz,LoadTitlescreenGraphics ; load title screen (gfx and arrangement) + bit 1,a ; pressed B? + jp nz,DisplayTitleScreen ; if so, go back to the title screen ld c,20 call DelayFrames ld a,[wCurrentMenuItem] ld b,a - ld a,[wd088] + ld a,[wSaveFileStatus] cp a,2 - jp z,.next3 - inc b ; adjust MenuArrow_Counter -.next3 + jp z,.skipInc +; If there's no save file, increment the current menu item so that the numbers +; are the same whether or not there's a save file. + inc b +.skipInc ld a,b and a - jr z,.next4 ; if press_A on Continue + jr z,.choseContinue cp a,1 - jp z,Func_5d52 ; if press_A on NewGame - call DisplayOptionMenu ; if press_a on Options + jp z,StartNewGame + call DisplayOptionMenu ld a,1 - ld [wd08a],a - jp .next0 -.next4 - call ContinueGame + ld [wOptionsInitialized],a + jp .mainMenuLoop +.choseContinue + call DisplayContinueGameInfo ld hl,wd126 set 5,[hl] .inputLoop @@ -100,7 +102,7 @@ MainMenu: ; 5af2 (1:5af2) bit 0,a jr nz,.pressedA bit 1,a - jp nz,.next0 ; pressedB + jp nz,.mainMenuLoop ; pressed B jr .inputLoop .pressedA call GBPalWhiteOutWithDelay3 @@ -122,10 +124,10 @@ MainMenu: ; 5af2 (1:5af2) call SpecialWarpIn jp SpecialEnterMap -Func_5bff: ; 5bff (1:5bff) - ld a,1 +InitOptions: ; 5bff (1:5bff) + ld a,1 ; no delay ld [wLetterPrintingDelayFlags],a - ld a,3 + ld a,3 ; medium speed ld [W_OPTIONS],a ret @@ -301,7 +303,7 @@ LinkCanceledText: ; 5d4d (1:5d4d) TX_FAR _LinkCanceledText db "@" -Func_5d52: ; 5d52 (1:5d52) +StartNewGame: ; 5d52 (1:5d52) ld hl, wd732 res 1, [hl] call OakSpeech @@ -337,12 +339,12 @@ CableClubOptionsText: ; 5d97 (1:5d97) db "COLOSSEUM", $4e db "CANCEL@" -ContinueGame: ; 5db5 (1:5db5) +DisplayContinueGameInfo: ; 5db5 (1:5db5) xor a ld [H_AUTOBGTRANSFERENABLED], a coord hl, 4, 7 - ld b, $8 - ld c, $e + ld b, 8 + ld c, 14 call TextBoxBorder coord hl, 5, 9 ld de, SaveScreenInfoText @@ -351,12 +353,12 @@ ContinueGame: ; 5db5 (1:5db5) ld de, wPlayerName call PlaceString coord hl, 17, 11 - call Func_5e2f + call PrintNumBadges coord hl, 16, 13 - call Func_5e42 + call PrintNumOwnedMons coord hl, 13, 15 - call Func_5e55 - ld a, $1 + call PrintPlayTime + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a ld c, 30 jp DelayFrames @@ -377,17 +379,17 @@ PrintSaveScreenText: ; 5def (1:5def) ld de, wPlayerName call PlaceString coord hl, 17, 4 - call Func_5e2f + call PrintNumBadges coord hl, 16, 6 - call Func_5e42 + call PrintNumOwnedMons coord hl, 13, 8 - call Func_5e55 + call PrintPlayTime ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ld c, 30 jp DelayFrames -Func_5e2f: ; 5e2f (1:5e2f) +PrintNumBadges: ; 5e2f (1:5e2f) push hl ld hl, W_OBTAINEDBADGES ld b, $1 @@ -397,7 +399,7 @@ Func_5e2f: ; 5e2f (1:5e2f) ld bc, $102 jp PrintNumber -Func_5e42: ; 5e42 (1:5e42) +PrintNumOwnedMons: ; 5e42 (1:5e42) push hl ld hl, wPokedexOwned ld b, wPokedexOwnedEnd - wPokedexOwned @@ -407,7 +409,7 @@ Func_5e42: ; 5e42 (1:5e42) ld bc, $103 jp PrintNumber -Func_5e55: ; 5e55 (1:5e55) +PrintPlayTime: ; 5e55 (1:5e55) ld de, W_PLAYTIMEHOURS + 1 ld bc, $103 call PrintNumber @@ -678,28 +680,32 @@ TextSpeedOptionData: ; 6096 (1:6096) db 7 ; default X coordinate (Medium) db $ff ; terminator -Func_609e: ; 609e (1:609e) - ld a, $a - ld [$0], a +CheckForPlayerNameInSRAM: ; 609e (1:609e) +; Check if the player name data in SRAM has a string terminator character +; (indicating that a name may have been saved there) and return whether it does +; in carry. + ld a, SRAM_ENABLE + ld [MBC1SRamEnable], a ld a, $1 - ld [$6000], a - ld [$4000], a + ld [MBC1SRamBankingMode], a + ld [MBC1SRamBank], a ld b, $b - ld hl, $a598 -.asm_60b0 + ld hl, sPlayerName +.loop ld a, [hli] - cp $50 - jr z, .asm_60c1 + cp "@" + jr z, .found dec b - jr nz, .asm_60b0 + jr nz, .loop +; not found xor a - ld [$0], a - ld [$6000], a + ld [MBC1SRamEnable], a + ld [MBC1SRamBankingMode], a and a ret -.asm_60c1 +.found xor a - ld [$0], a - ld [$6000], a + ld [MBC1SRamEnable], a + ld [MBC1SRamBankingMode], a scf ret diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 08ce0da9..4e173bc0 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -71,8 +71,8 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ld [wd11e],a ld a,[wd11e] push af - ld a,[wWhichTrade] - push af + ld a,[wDexMaxSeenMon] + push af ; this doesn't need to be preserved ld hl,wPokedexSeen call IsPokemonBitSet ld b,2 @@ -108,7 +108,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d) ld b,1 .exitSideMenu pop af - ld [wWhichTrade],a + ld [wDexMaxSeenMon],a pop af ld [wd11e],a pop af @@ -207,7 +207,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) jr .maxSeenPokemonLoop .storeMaxSeenPokemon ld a,b - ld [wWhichTrade],a ; max seen pokemon + ld [wDexMaxSeenMon],a .loop xor a ld [H_AUTOBGTRANSFERENABLED],a @@ -218,7 +218,7 @@ HandlePokedexListMenu: ; 40111 (10:4111) ld a,[wListScrollOffset] ld [wd11e],a ld d,7 - ld a,[wWhichTrade] + ld a,[wDexMaxSeenMon] cp a,7 jr nc,.printPokemonLoop ld d,a @@ -294,9 +294,9 @@ HandlePokedexListMenu: ; 40111 (10:4111) bit 7,a ; was Down pressed? jr z,.checkIfRightPressed .downPressed ; scroll down one row - ld a,[wWhichTrade] + ld a,[wDexMaxSeenMon] cp a,7 - jp c,.loop + jp c,.loop ; can't if the list is shorter than 7 sub a,7 ld b,a ld a,[wListScrollOffset] @@ -309,9 +309,9 @@ HandlePokedexListMenu: ; 40111 (10:4111) bit 4,a ; was Right pressed? jr z,.checkIfLeftPressed .rightPressed ; scroll down 7 rows - ld a,[wWhichTrade] + ld a,[wDexMaxSeenMon] cp a,7 - jp c,.loop + jp c,.loop ; can't if the list is shorter than 7 sub a,6 ld b,a ld a,[wListScrollOffset] diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index d1fa0c72..b1b751b9 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -231,18 +231,24 @@ HandlePrizeChoice: ; 528c6 (14:68c6) pop af ld b,a call GivePokemon + +; If either the party or box was full, wait after displaying message. push af - ld a,[wccd3] ; XXX is there room? + ld a,[wAddedToParty] and a call z,WaitForTextScrollButtonPress pop af + +; If the mon couldn't be given to the player (because both the party and box +; were full), return without subtracting coins. ret nc + .SubtractCoins call LoadCoinsToSubtract ld hl,hCoins + 1 ld de,wPlayerCoins + 1 ld c,$02 ; how many bytes - predef SubBCDPredef ; subtract coins (BCD daa operations) + predef SubBCDPredef jp PrintPrizePrice .BagFull ld hl,PrizeRoomBagIsFullTextPtr diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index 75de182b..3bf3464a 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -297,8 +297,8 @@ StatusScreen2: ; 12b57 (4:6b57) push af xor a ld [hTilesetType], a - ld [$ffba], a - ld bc, $0005 + ld [H_AUTOBGTRANSFERENABLED], a + ld bc, NUM_MOVES + 1 ld hl, wMoves call FillMemory ld hl, wLoadedMonMoves @@ -307,13 +307,13 @@ StatusScreen2: ; 12b57 (4:6b57) call CopyData callab FormatMovesString coord hl, 9, 2 - ld bc, $050a + lb bc, 5, 10 call ClearScreenArea ; Clear under name coord hl, 19, 3 ld [hl], $78 coord hl, 0, 8 - ld b, $8 - ld c, $12 + ld b, 8 + ld c, 18 call TextBoxBorder ; Draw move container coord hl, 2, 9 ld de, wMovesString @@ -387,9 +387,9 @@ StatusScreen2: ; 12b57 (4:6b57) jr nz, .PrintPP .PPDone coord hl, 9, 3 - ld de, EXPPointsText + ld de, StatusScreenExpText call PlaceString - ld a, [wLoadedMonLevel] ; level + ld a, [wLoadedMonLevel] push af cp MAX_LEVEL jr z, .Level100 @@ -407,11 +407,11 @@ StatusScreen2: ; 12b57 (4:6b57) coord hl, 12, 4 ld bc, $0307 call PrintNumber ; exp - call .asm_12c86 + call CalcExpToLevelUp ld de, wLoadedMonExp coord hl, 7, 6 ld bc, $0307 - call PrintNumber + call PrintNumber ; exp needed to level up coord hl, 9, 0 call StatusScreen_ClearName coord hl, 9, 1 @@ -422,7 +422,7 @@ StatusScreen2: ; 12b57 (4:6b57) coord hl, 9, 1 call PlaceString ld a, $1 - ld [$ffba], a + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 call WaitForTextScrollButtonPress ; wait for button pop af @@ -433,25 +433,26 @@ StatusScreen2: ; 12b57 (4:6b57) ld [$ff24], a call GBPalWhiteOut jp ClearScreen -.asm_12c86 ; This does some magic with lvl/exp? - ld a, [wLoadedMonLevel] ; Load level + +CalcExpToLevelUp: ; 12c86 (4:6c86) + ld a, [wLoadedMonLevel] cp MAX_LEVEL - jr z, .asm_12ca7 ; If 100 + jr z, .atMaxLevel inc a ld d, a callab CalcExperience ld hl, wLoadedMonExp + 2 - ld a, [$ff98] + ld a, [hExperience + 2] sub [hl] ld [hld], a - ld a, [$ff97] + ld a, [hExperience + 1] sbc [hl] ld [hld], a - ld a, [$ff96] + ld a, [hExperience] sbc [hl] ld [hld], a ret -.asm_12ca7 +.atMaxLevel ld hl, wLoadedMonExp xor a ld [hli], a @@ -459,11 +460,9 @@ StatusScreen2: ; 12b57 (4:6b57) ld [hl], a ret -EXPPointsText: ; 12caf (4:6caf) - db "EXP POINTS", $4e - -LevelUpText: ; 12cba (4:6cba) - db "LEVEL UP@" +StatusScreenExpText: ; 12caf (4:6caf) + db "EXP POINTS" + next "LEVEL UP@" StatusScreen_ClearName: ; 12cc3 (4:6cc3) ld bc, 10 diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index c7b2f4d6..9b9b1c7e 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -19,9 +19,9 @@ SetDefaultNames: ; 60ca (1:60ca) ld [W_OPTIONS], a pop af ld [wLetterPrintingDelayFlags], a - ld a, [wd08a] + ld a, [wOptionsInitialized] and a - call z, Func_5bff + call z, InitOptions ld hl, NintenText ld de, wPlayerName ld bc, $b diff --git a/engine/oam_dma.asm b/engine/oam_dma.asm index bd89677a..7326445e 100644 --- a/engine/oam_dma.asm +++ b/engine/oam_dma.asm @@ -15,7 +15,7 @@ WriteDMACodeToHRAM: DMARoutine: ; initiate DMA ld a, wOAMBuffer / $100 - ld [$ff46], a + ld [rDMA], a ; wait for DMA to finish ld a, $28 diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm index 910fcf04..3fb4ffca 100755 --- a/engine/overworld/hidden_items.asm +++ b/engine/overworld/hidden_items.asm @@ -1,9 +1,9 @@ HiddenItems: ; 76688 (1d:6688) ld hl, HiddenItemCoords - call Func_76857 - ld [wTrainerScreenX], a - ld hl, wd6f0 - ld a, [wTrainerScreenX] + call FindHiddenItemOrCoinsIndex + ld [wHiddenItemOrCoinsIndex], a + ld hl, wObtainedHiddenItemsFlags + ld a, [wHiddenItemOrCoinsIndex] ld c, a ld b, $2 predef FlagActionPredef @@ -11,9 +11,9 @@ HiddenItems: ; 76688 (1d:6688) and a ret nz call EnableAutoTextBoxDrawing - ld a, $1 + ld a, 1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, [wWhichTrade] ; item ID + ld a, [wHiddenObjectFunctionArgument] ; item ID ld [wd11e], a call GetItemName tx_pre_jump FoundHiddenItemText @@ -23,12 +23,12 @@ INCLUDE "data/hidden_item_coords.asm" FoundHiddenItemText: ; 7675b (1d:675b) TX_FAR _FoundHiddenItemText TX_ASM - ld a, [wWhichTrade] ; item ID + ld a, [wHiddenObjectFunctionArgument] ; item ID ld b, a ld c, 1 call GiveItem jr nc, .BagFull - ld hl, wd6f0 + ld hl, wObtainedHiddenItemsFlags ld a, [wTrainerScreenX] ld c, a ld b, $1 @@ -56,10 +56,10 @@ HiddenCoins: ; 76799 (1d:6799) and a ret z ld hl, HiddenCoinCoords - call Func_76857 - ld [wTrainerScreenX], a - ld hl, wd6fe - ld a, [wTrainerScreenX] + call FindHiddenItemOrCoinsIndex + ld [wHiddenItemOrCoinsIndex], a + ld hl, wObtainedHiddenCoinsFlags + ld a, [wHiddenItemOrCoinsIndex] ld c, a ld b, $2 predef FlagActionPredef @@ -70,7 +70,7 @@ HiddenCoins: ; 76799 (1d:6799) ld [hCoins - 1], a ld [hCoins], a ld [hCoins + 1], a - ld a, [wWhichTrade] + ld a, [wHiddenObjectFunctionArgument] sub COIN cp 10 jr z, .bcd10 @@ -99,7 +99,7 @@ HiddenCoins: ; 76799 (1d:6799) ld hl, hCoins + 1 ld c, $2 predef AddBCDPredef - ld hl, wd6fe + ld hl, wObtainedHiddenCoinsFlags ld a, [wTrainerScreenX] ld c, a ld b, $1 @@ -130,31 +130,31 @@ DroppedHiddenCoinsText: ; 7684d (1d:684d) TX_FAR _DroppedHiddenCoinsText db "@" -Func_76857: ; 76857 (1d:6857) - ld a, [wTrainerScreenY] +FindHiddenItemOrCoinsIndex: ; 76857 (1d:6857) + ld a, [wHiddenObjectY] ld d, a - ld a, [wTrainerScreenX] + ld a, [wHiddenObjectX] ld e, a ld a, [W_CURMAP] ld b, a - ld c, $ff + ld c, -1 .loop inc c ld a, [hli] cp $ff ; end of the list? ret z ; if so, we're done here cp b - jr nz, .asm_76877 + jr nz, .next1 ld a, [hli] cp d - jr nz, .asm_76878 + jr nz, .next2 ld a, [hli] cp e jr nz, .loop ld a, c ret -.asm_76877 +.next1 inc hl -.asm_76878 +.next2 inc hl jr .loop diff --git a/engine/overworld/hidden_objects.asm b/engine/overworld/hidden_objects.asm index ae67aeed..cabfc093 100755 --- a/engine/overworld/hidden_objects.asm +++ b/engine/overworld/hidden_objects.asm @@ -1,4 +1,4 @@ -Func_46981: ; 46981 (11:6981) +IsPlayerOnDungeonWarp: ; 46981 (11:6981) xor a ld [wWhichDungeonWarp], a ld a, [wd72d] @@ -6,7 +6,7 @@ Func_46981: ; 46981 (11:6981) ret nz call ArePlayerCoordsInArray ret nc - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [wWhichDungeonWarp], a ld hl, wd72d set 4, [hl] @@ -58,7 +58,7 @@ CheckForHiddenObject: ; 469a0 (11:69a0) ld [wHiddenObjectX], a ld c, a call CheckIfCoordsInFrontOfPlayerMatch - ld a, [$ffea] + ld a, [hCoordsInFrontOfPlayerMatch] and a jr z, .foundMatchingObject inc hl @@ -85,7 +85,7 @@ CheckForHiddenObject: ; 469a0 (11:69a0) ret ; checks if the coordinates in front of the player's sprite match Y in b and X in c -; [$ffea] = $00 if they match, $ff if they don't match +; [hCoordsInFrontOfPlayerMatch] = $00 if they match, $ff if they don't match CheckIfCoordsInFrontOfPlayerMatch: ; 46a01 (11:6a01) ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction cp SPRITE_FACING_UP @@ -127,7 +127,7 @@ CheckIfCoordsInFrontOfPlayerMatch: ; 46a01 (11:6a01) .didNotMatch ld a, $ff .done - ld [$ffea], a + ld [hCoordsInFrontOfPlayerMatch], a ret INCLUDE "data/hidden_objects.asm" diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 89b09bba..f618261e 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -210,9 +210,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveDown ld de, 2*SCREEN_WIDTH add hl, de ; move tile pointer two rows down - ld de, $100 - - ld bc, $400 + lb de, 1, 0 + lb bc, 4, SPRITE_FACING_DOWN jr TryWalking .notDown cp $80 ; $40 <= a < $80: up (or right) @@ -223,8 +222,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveUp ld de, -2*SCREEN_WIDTH add hl, de ; move tile pointer two rows up - ld de, $ff00 - ld bc, $804 + lb de, -1, 0 + lb bc, 8, SPRITE_FACING_UP jr TryWalking .notUp cp $c0 ; $80 <= a < $c0: left (or up) @@ -235,8 +234,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveLeft dec hl dec hl ; move tile pointer two columns left - ld de, $ff - ld bc, $208 + lb de, 0, -1 + lb bc, 2, SPRITE_FACING_LEFT jr TryWalking .notLeft ; $c0 <= a: right (or down) ld a, [wCurSpriteMovement2] @@ -245,8 +244,8 @@ UpdateNPCSprite: ; 4ed1 (1:4ed1) .moveRight inc hl inc hl ; move tile pointer two columns right - ld de, $1 - ld bc, $10c + lb de, 0, 1 + lb bc, 1, SPRITE_FACING_RIGHT jr TryWalking ; changes facing direction by zeroing the movement delta and calling TryWalking diff --git a/engine/palettes.asm b/engine/palettes.asm index a9160d21..a325e0a3 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -328,10 +328,10 @@ SendSGBPacket: ; 71feb (1c:5feb) ld [$fff9],a ; send RESET signal (P14=LOW, P15=LOW) xor a - ld [$ff00],a + ld [rJOYP],a ; set P14=HIGH, P15=HIGH ld a,$30 - ld [$ff00],a + ld [rJOYP],a ;load length of packets (16 bytes) ld b,$10 .nextByte @@ -348,10 +348,10 @@ SendSGBPacket: ; 71feb (1c:5feb) ; else (if 0th bit is zero) set P14=LOW,P15=HIGH (send bit 0) ld a,$20 .next0 - ld [$ff00],a + ld [rJOYP],a ; must set P14=HIGH,P15=HIGH between each "pulse" ld a,$30 - ld [$ff00],a + ld [rJOYP],a ; rotation will put next bit in 0th position (so we can always use command ; "bit 0,d" to fetch the bit that has to be sent) rr d @@ -362,10 +362,10 @@ SendSGBPacket: ; 71feb (1c:5feb) jr nz,.nextByte ; send bit 1 as a "stop bit" (end of parameter data) ld a,$20 - ld [$ff00],a + ld [rJOYP],a ; set P14=HIGH,P15=HIGH ld a,$30 - ld [$ff00],a + ld [rJOYP],a xor a ld [$fff9],a ; wait for about 70000 cycles @@ -448,38 +448,38 @@ CheckSGB: ; 7209b (1c:609b) ld [$fff9], a ei call Wait7000 - ld a, [rJOYP] ; $ff0 + ld a, [rJOYP] and $3 cp $3 jr nz, .asm_720fd ld a, $20 - ld [rJOYP], a ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 + ld [rJOYP], a + ld a, [rJOYP] + ld a, [rJOYP] call Wait7000 call Wait7000 ld a, $30 - ld [rJOYP], a ; $ff0 + ld [rJOYP], a call Wait7000 call Wait7000 ld a, $10 - ld [rJOYP], a ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 + ld [rJOYP], a + ld a, [rJOYP] + ld a, [rJOYP] + ld a, [rJOYP] + ld a, [rJOYP] + ld a, [rJOYP] + ld a, [rJOYP] call Wait7000 call Wait7000 ld a, $30 - ld [rJOYP], a ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 - ld a, [rJOYP] ; $ff0 + ld [rJOYP], a + ld a, [rJOYP] + ld a, [rJOYP] + ld a, [rJOYP] call Wait7000 call Wait7000 - ld a, [rJOYP] ; $ff0 + ld a, [rJOYP] and $3 cp $3 jr nz, .asm_720fd diff --git a/engine/predefs.asm b/engine/predefs.asm index 17f94b73..73a22ad9 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -111,7 +111,7 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef InternalClockTradeAnim add_predef TrainerEngage add_predef IndexToPokedex - add_predef DisplayPicCenteredOrUpperRight; 3B display pic? + add_predef DisplayPicCenteredOrUpperRight add_predef UsedCut add_predef ShowPokedexData add_predef WriteMonMoves @@ -128,15 +128,15 @@ PredefPointers:: ; 4fe79 (13:7e79) add_predef DrawEnemyHUDAndHPBar add_predef LoadTownMap_Nest add_predef PrintMonType - add_predef EmotionBubble; 4C player exclamation + add_predef EmotionBubble add_predef EmptyFunc3; return immediately add_predef AskName add_predef PewterGuys add_predef SaveSAVtoSRAM2 - add_predef LoadSAVCheckSum2 + add_predef LoadSAV2 add_predef LoadSAV add_predef SaveSAVtoSRAM1 - add_predef DoInGameTradeDialogue ; 54 initiate trade + add_predef DoInGameTradeDialogue add_predef HallOfFamePC add_predef DisplayDexRating dbw $1E, _LeaveMapAnim ; wrong bank diff --git a/engine/save.asm b/engine/save.asm index 56468595..7265fa3c 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -4,11 +4,11 @@ LoadSAV: ; 735e8 (1c:75e8) call ClearScreen call LoadFontTilePatterns call LoadTextBoxTilePatterns - call LoadSAVCheckSum + call LoadSAV0 jr c, .badsum - call LoadSAVCheckSum1 + call LoadSAV1 jr c, .badsum - call LoadSAVCheckSum2 + call LoadSAV2 jr c, .badsum ld a, $2 ; good checksum jr .goodsum @@ -24,14 +24,14 @@ LoadSAV: ; 735e8 (1c:75e8) res 6, [hl] ld a, $1 ; bad checksum .goodsum - ld [wd088], a ; checksum flag + ld [wSaveFileStatus], a ret FileDataDestroyedText: ; 7361e (1c:761e) TX_FAR _FileDataDestroyedText db "@" -LoadSAVCheckSum: ; 73623 (1c:7623) +LoadSAV0: ; 73623 (1c:7623) ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -43,7 +43,9 @@ LoadSAVCheckSum: ; 73623 (1c:7623) ld c, a ld a, [sMainDataCheckSum] ; SAV's checksum cp c - jp z, .Func_73652 + jp z, .checkSumsMatched + +; If the computed checksum didn't match the saved on, try again. ld hl, sPlayerName ld bc, sMainDataCheckSum - sPlayerName call SAVCheckSum @@ -52,7 +54,7 @@ LoadSAVCheckSum: ; 73623 (1c:7623) cp c jp nz, SAVBadCheckSum -.Func_73652 ; 73652 (1c:7652) +.checkSumsMatched ld hl, sPlayerName ld de, wPlayerName ld bc, 11 @@ -76,7 +78,7 @@ LoadSAVCheckSum: ; 73623 (1c:7623) and a jp SAVGoodChecksum -LoadSAVCheckSum1: ; 73690 (1c:7690) +LoadSAV1: ; 73690 (1c:7690) ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -96,7 +98,7 @@ LoadSAVCheckSum1: ; 73690 (1c:7690) and a jp SAVGoodChecksum -LoadSAVCheckSum2: ; 736bd (1c:76bd) +LoadSAV2: ; 736bd (1c:76bd) ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -129,10 +131,11 @@ SAVGoodChecksum: ; 736f8 (1c:76f8) ld [MBC1SRamEnable], a ret -Func_73701: ; 73701 (1c:7701) - call LoadSAVCheckSum - call LoadSAVCheckSum1 - jp LoadSAVCheckSum2 +LoadSAVIgnoreBadCheckSum: ; 73701 (1c:7701) +; unused function that loads save data and ignores bad checksums + call LoadSAV0 + call LoadSAV1 + jp LoadSAV2 SaveSAV: ; 7370a (1c:770a) callba PrintSaveScreenText @@ -140,7 +143,7 @@ SaveSAV: ; 7370a (1c:770a) call SaveSAVConfirm and a ;|0 = Yes|1 = No| ret nz - ld a,[wd088] + ld a,[wSaveFileStatus] dec a jr z,.save call SAVCheckRandomID @@ -270,14 +273,14 @@ SaveSAVtoSRAM2: ; 7380f (1c:780f) SaveSAVtoSRAM: ; 73848 (1c:7848) ld a, $2 - ld [wd088], a + ld [wSaveFileStatus], a call SaveSAVtoSRAM0 call SaveSAVtoSRAM1 jp SaveSAVtoSRAM2 SAVCheckSum: ; 73856 (1c:7856) ;Check Sum (result[1 byte] is complemented) - ld d, $0 + ld d, 0 .loop ld a, [hli] add d @@ -290,11 +293,11 @@ SAVCheckSum: ; 73856 (1c:7856) cpl ret -Func_73863: ; 73863 (1c:7863) +CalcIndividualBoxCheckSums: ; 73863 (1c:7863) ld hl, sBox1 ; sBox7 - ld de, sBoxes1CheckSum2 ; sBoxes2CheckSum2 + ld de, sBank2IndividualBoxChecksums ; sBank3IndividualBoxChecksums ld b, NUM_BOXES / 2 -.asm_7386b +.loop push bc push de ld bc, wBoxMonNicksEnd - W_NUMINBOX @@ -304,21 +307,23 @@ Func_73863: ; 73863 (1c:7863) inc de pop bc dec b - jr nz, .asm_7386b + jr nz, .loop ret -Func_7387b: ; 7387b (1c:787b) - ld hl, PointerTable_73895 +GetBoxSRAMLocation: ; 7387b (1c:787b) +; in: a = box num +; out: b = box SRAM bank, hl = pointer to start of box + ld hl, BoxSRAMPointerTable ld a, [wCurrentBoxNum] and $7f cp NUM_BOXES / 2 - ld b, $2 - jr c, .asm_7388c + ld b, 2 + jr c, .next inc b sub NUM_BOXES / 2 -.asm_7388c +.next ld e, a - ld d, $0 + ld d, 0 add hl, de add hl, de ld a, [hli] @@ -326,7 +331,7 @@ Func_7387b: ; 7387b (1c:787b) ld l, a ret -PointerTable_73895: ; 73895 (1c:7895) +BoxSRAMPointerTable: ; 73895 (1c:7895) dw sBox1 ; sBox7 dw sBox2 ; sBox8 dw sBox3 ; sBox9 @@ -342,9 +347,9 @@ ChangeBox:: ; 738a1 (1c:78a1) and a ret nz ; return if No was chosen ld hl, wCurrentBoxNum - bit 7, [hl] - call z, Func_73a29 - call Func_7393f + bit 7, [hl] ; is it the first time player is changing the box? + call z, EmptyAllSRAMBoxes ; if so, empty all boxes in SRAM + call DisplayChangeBoxMenu call UpdateSprites ld hl, hFlags_0xFFF6 set 1, [hl] @@ -353,17 +358,17 @@ ChangeBox:: ; 738a1 (1c:78a1) res 1, [hl] bit 1, a ret nz - call Func_7387b + call GetBoxSRAMLocation ld e, l ld d, h ld hl, W_NUMINBOX - call Func_7390e + call CopyBoxToOrFromSRAM ; copy old box from WRAM to SRAM ld a, [wCurrentMenuItem] set 7, a ld [wCurrentBoxNum], a - call Func_7387b + call GetBoxSRAMLocation ld de, W_NUMINBOX - call Func_7390e + call CopyBoxToOrFromSRAM ; copy new box from SRAM to WRAM ld hl, W_MAPTEXTPTR ld de, wChangeBoxSavedMapTextPointer ld a, [hli] @@ -384,7 +389,8 @@ WhenYouChangeBoxText: ; 73909 (1c:7909) TX_FAR _WhenYouChangeBoxText db "@" -Func_7390e: ; 7390e (1c:790e) +CopyBoxToOrFromSRAM: ; 7390e (1c:790e) +; copy an entire box from hl to de with b as the SRAM bank push hl ld a, SRAM_ENABLE ld [MBC1SRamEnable], a @@ -395,30 +401,33 @@ Func_7390e: ; 7390e (1c:790e) ld bc, wBoxMonNicksEnd - W_NUMINBOX call CopyData pop hl + +; mark the memory that the box was copied from as am empty box xor a ld [hli], a dec a ld [hl], a + ld hl, sBox1 ; sBox7 - ld bc, sBoxes1CheckSum - sBox1 + ld bc, sBank2AllBoxesChecksum - sBox1 call SAVCheckSum - ld [sBoxes1CheckSum], a ; sBoxes2CheckSum - call Func_73863 + ld [sBank2AllBoxesChecksum], a ; sBank3AllBoxesChecksum + call CalcIndividualBoxCheckSums xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a ret -Func_7393f: ; 7393f (1c:793f) +DisplayChangeBoxMenu: ; 7393f (1c:793f) xor a ld [H_AUTOBGTRANSFERENABLED], a - ld a, $3 + ld a, A_BUTTON | B_BUTTON ld [wMenuWatchedKeys], a - ld a, $b + ld a, 11 ld [wMaxMenuItem], a - ld a, $1 + ld a, 1 ld [wTopMenuItemY], a - ld a, $c + ld a, 12 ld [wTopMenuItemX], a xor a ld [wMenuWatchMovingOutOfBounds], a @@ -427,14 +436,14 @@ Func_7393f: ; 7393f (1c:793f) ld [wCurrentMenuItem], a ld [wLastMenuItem], a coord hl, 0, 0 - ld b, $2 - ld c, $9 + ld b, 2 + ld c, 9 call TextBoxBorder ld hl, ChooseABoxText call PrintText coord hl, 11, 0 - ld b, $c - ld c, $7 + ld b, 12 + ld c, 7 call TextBoxBorder ld hl, hFlags_0xFFF6 set 2, [hl] @@ -446,37 +455,37 @@ Func_7393f: ; 7393f (1c:793f) ld a, [wCurrentBoxNum] and $7f cp 9 - jr c, .asm_739a6 + jr c, .singleDigitBoxNum sub 9 coord hl, 8, 2 ld [hl], "1" add "0" - jr .asm_739a8 -.asm_739a6 + jr .next +.singleDigitBoxNum add "1" -.asm_739a8 +.next Coorda 9, 2 coord hl, 1, 2 ld de, BoxNoText call PlaceString - call Func_73a84 + call GetMonCountsForAllBoxes coord hl, 18, 1 - ld de, wWhichTrade + ld de, wBoxMonCounts ld bc, SCREEN_WIDTH ld a, $c -.asm_739c2 +.loop push af ld a, [de] - and a - jr z, .asm_739c9 - ld [hl], $78 -.asm_739c9 + and a ; is the box empty? + jr z, .skipPlacingPokeball + ld [hl], $78 ; place pokeball tile next to box name if box not empty +.skipPlacingPokeball add hl, bc inc de pop af dec a - jr nz, .asm_739c2 - ld a, $1 + jr nz, .loop + ld a, 1 ld [H_AUTOBGTRANSFERENABLED], a ret @@ -501,51 +510,54 @@ BoxNames: ; 739d9 (1c:79d9) BoxNoText: ; 73a21 (1c:7a21) db "BOX No.@" -Func_73a29: ; 73a29 (1c:7a29) +EmptyAllSRAMBoxes: ; 73a29 (1c:7a29) +; marks all boxes in SRAM as empty (initialisation for the first time the +; player changes the box) ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 ld [MBC1SRamBankingMode], a - ld a, $2 + ld a, 2 ld [MBC1SRamBank], a - call Func_73a4b - ld a, $3 + call EmptySRAMBoxesInBank + ld a, 3 ld [MBC1SRamBank], a - call Func_73a4b + call EmptySRAMBoxesInBank xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a ret -Func_73a4b: ; 73a4b (1c:7a4b) +EmptySRAMBoxesInBank: ; 73a4b (1c:7a4b) +; marks every box in the current SRAM bank as empty ld hl, sBox1 ; sBox7 - call Func_73a7f + call EmptySRAMBox ld hl, sBox2 ; sBox8 - call Func_73a7f + call EmptySRAMBox ld hl, sBox3 ; sBox9 - call Func_73a7f + call EmptySRAMBox ld hl, sBox4 ; sBox10 - call Func_73a7f + call EmptySRAMBox ld hl, sBox5 ; sBox11 - call Func_73a7f + call EmptySRAMBox ld hl, sBox6 ; sBox12 - call Func_73a7f + call EmptySRAMBox ld hl, sBox1 ; sBox7 - ld bc, sBoxes1CheckSum - sBox1 + ld bc, sBank2AllBoxesChecksum - sBox1 call SAVCheckSum - ld [sBoxes1CheckSum], a ; sBoxes2CheckSum - call Func_73863 + ld [sBank2AllBoxesChecksum], a ; sBank3AllBoxesChecksum + call CalcIndividualBoxCheckSums ret -Func_73a7f: ; 73a7f (1c:7a7f) +EmptySRAMBox: ; 73a7f (1c:7a7f) xor a ld [hli], a dec a ld [hl], a ret -Func_73a84: ; 73a84 (1c:7a84) - ld hl, wWhichTrade +GetMonCountsForAllBoxes: ; 73a84 (1c:7a84) + ld hl, wBoxMonCounts push hl ld a, SRAM_ENABLE ld [MBC1SRamEnable], a @@ -553,24 +565,27 @@ Func_73a84: ; 73a84 (1c:7a84) ld [MBC1SRamBankingMode], a ld a, $2 ld [MBC1SRamBank], a - call Func_73ab8 + call GetMonCountsForBoxesInBank ld a, $3 ld [MBC1SRamBank], a - call Func_73ab8 + call GetMonCountsForBoxesInBank xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a pop hl + +; copy the count for the current box from WRAM ld a, [wCurrentBoxNum] and $7f ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, [W_NUMINBOX] ld [hl], a + ret -Func_73ab8: ; 73ab8 (1c:7ab8) +GetMonCountsForBoxesInBank: ; 73ab8 (1c:7ab8) ld a, [sBox1] ; sBox7 ld [hli], a ld a, [sBox2] ; sBox8 @@ -646,7 +661,7 @@ SaveHallOfFameTeams: ; 73b0d (1c:7b0d) LoadHallOfFameTeams: ; 73b3f (1c:7b3f) ld hl, sHallOfFame ld bc, HOF_TEAM - ld a, [wWhichTrade] + ld a, [wHoFTeamIndex] call AddNTimes ld de, wcc5b ld bc, HOF_TEAM diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index ea1eb315..cf6ad3d5 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -867,7 +867,7 @@ LoadSlotMachineTiles: ; 378a8 (d:78a8) ld bc, $00f0 call CopyData call EnableLCD - ld hl, wTrainerEngageDistance + ld hl, wSlotMachineWheel1Offset ld a, $1c ld [hli], a ld [hli], a diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 3a4e2e4c..5acdd2c9 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -21,7 +21,7 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7) ld [wc0ef], a ld [wc0f0], a -LoadTitlescreenGraphics: ; 42dd (1:42dd) +DisplayTitleScreen: ; 42dd (1:42dd) call GBPalWhiteOut ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a diff --git a/home/init.asm b/home/init.asm index 932797ac..3e8d1d2b 100644 --- a/home/init.asm +++ b/home/init.asm @@ -23,17 +23,17 @@ rLCDC_DEFAULT EQU %11100011 xor a ld [rIF], a ld [rIE], a - ld [$ff43], a - ld [$ff42], a + ld [rSCX], a + ld [rSCY], a ld [rSB], a ld [rSC], a ld [rWX], a - ld [$ff4a], a - ld [$ff06], a - ld [$ff07], a + ld [rWY], a + ld [rTMA], a + ld [rTAC], a ld [rBGP], a ld [rOBP0], a - ld [$ff49], a + ld [rOBP1], a ld a, rLCDC_ENABLE_MASK ld [rLCDC], a @@ -66,10 +66,10 @@ rLCDC_DEFAULT EQU %11100011 xor a ld [hTilesetType], a - ld [$ff41], a + ld [rSTAT], a ld [hSCX], a ld [hSCY], a - ld [$ff0f], a + ld [rIF], a ld a, 1 << VBLANK + 1 << TIMER + 1 << SERIAL ld [rIE], a diff --git a/hram.asm b/hram.asm index a05f3d18..8bbf7150 100644 --- a/hram.asm +++ b/hram.asm @@ -90,6 +90,8 @@ hNPCSpriteOffset EQU $FF95 ; temp value used when swapping bytes hSwapTemp EQU $FF95 +hExperience EQU $FF96 ; 3 bytes, big endian + ; Multiplcation and division variables are meant ; to overlap for back-to-back usage. Big endian. @@ -261,6 +263,8 @@ hQuotient2 EQU $FFE7 hSpriteVRAMSlotAndFacing EQU $FFE9 +hCoordsInFrontOfPlayerMatch EQU $FFEA + hSpriteAnimFrameCounter EQU $FFEA H_WHOSETURN EQU $FFF3 ; 0 on player’s turn, 1 on enemy’s turn diff --git a/macros.asm b/macros.asm index 5f1deaf6..ba83e73a 100644 --- a/macros.asm +++ b/macros.asm @@ -14,7 +14,7 @@ dex EQUS "db $5f, $50" ; End a Pokedex entry. percent EQUS "* $ff / 100" lb: MACRO ; r, hi, lo - ld \1, (\2) << 8 + (\3) + ld \1, (\2) << 8 + ((\3) & $ff) ENDM diff --git a/main.asm b/main.asm index 08747a5a..c90f5436 100755 --- a/main.asm +++ b/main.asm @@ -3743,7 +3743,7 @@ _AddPartyMon: ; f2e5 (3:72e5) dec de dec de xor a - ld [wHPBarMaxHP], a + ld [wLearningMovesFromDayCare], a predef WriteMonMoves pop de ld a, [wPlayerID] ; set trainer ID to player ID @@ -3758,13 +3758,13 @@ _AddPartyMon: ; f2e5 (3:72e5) callab CalcExperience pop de inc de - ld a, [H_MULTIPLICAND] ; write experience + ld a, [hExperience] ; write experience ld [de], a inc de - ld a, [H_MULTIPLICAND+1] + ld a, [hExperience + 1] ld [de], a inc de - ld a, [H_MULTIPLICAND+2] + ld a, [hExperience + 2] ld [de], a xor a ld b, $a diff --git a/scripts/agatha.asm b/scripts/agatha.asm index e65b1fa2..850cc0bb 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -67,7 +67,7 @@ AgathaScript0: ; 76490 (1d:6490) ld [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr c, .asm_764b4 ld hl, wd865 diff --git a/scripts/bruno.asm b/scripts/bruno.asm index bd28917c..76a5919a 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -67,7 +67,7 @@ BrunoScript0: ; 76339 (1d:6339) ld [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr c, .asm_7635d ld hl, wd864 diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 20873a81..2c7bd449 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -42,7 +42,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld hl, CeruleanCityCoords1 call ArePlayerCoordsInArray jr nc, .asm_194f7 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 ld a, $8 ld b, SPRITE_FACING_DOWN diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 330f2234..794d681e 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -9,19 +9,19 @@ DayCareMText1: ; 56254 (15:6254) call SaveScreenTilesToBuffer2 ld a, [W_DAYCARE_IN_USE] and a - jp nz, DayCareMScript_562e1 - ld hl, DayCareMText_5640f + jp nz, .daycareInUse + ld hl, DayCareIntroText call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - ld hl, DayCareMText_5643b - jp nz, DayCareMScript_56409 + ld hl, DayCareComeAgainText + jp nz, .done ld a, [wPartyCount] dec a - ld hl, DayCareMText_56445 - jp z, DayCareMScript_56409 - ld hl, DayCareMText_56414 + ld hl, DayCareOnlyHaveOneMonText + jp z, .done + ld hl, DayCareWhichMonText call PrintText xor a ld [wUpdateSpritesEnabled], a @@ -33,17 +33,17 @@ DayCareMText1: ; 56254 (15:6254) call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal pop af - ld hl, DayCareMText_56437 - jp c, DayCareMScript_56409 + ld hl, DayCareAllRightThenText + jp c, .done callab KnowsHMMove - ld hl, DayCareMText_5644a - jp c, DayCareMScript_56409 + ld hl, DayCareCantAcceptMonWithHMText + jp c, .done xor a ld [wPartyAndBillsPCSavedMenuItem], a ld a, [wWhichPokemon] ld hl, wPartyMonNicks call GetPartyMonName - ld hl, DayCareMText_56419 + ld hl, DayCareWillLookAfterMonText call PrintText ld a, 1 ld [W_DAYCARE_IN_USE], a @@ -55,10 +55,10 @@ DayCareMText1: ; 56254 (15:6254) call RemovePokemon ld a, [wcf91] call PlayCry - ld hl, DayCareMText_5641e - jp DayCareMScript_56409 + ld hl, DayCareComeSeeMeInAWhileText + jp .done -DayCareMScript_562e1: ; 562e1 (15:62e1) +.daycareInUse xor a ld hl, W_DAYCAREMONNAME call GetPartyMonName @@ -68,40 +68,41 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) callab CalcLevelFromExperience ld a, d cp MAX_LEVEL - jr c, .asm_56315 + jr c, .skipCalcExp + ld d, MAX_LEVEL callab CalcExperience ld hl, wDayCareMonExp - ld a, [H_NUMTOPRINT] + ld a, [hExperience] ld [hli], a - ld a, [$ff97] + ld a, [hExperience + 1] ld [hli], a - ld a, [$ff98] + ld a, [hExperience + 2] ld [hl], a ld d, MAX_LEVEL -.asm_56315 +.skipCalcExp xor a - ld [wTrainerEngageDistance], a + ld [wDayCareNumLevelsGrown], a ld hl, wDayCareMonBoxLevel ld a, [hl] - ld [wTrainerSpriteOffset], a + ld [wDayCareStartLevel], a cp d ld [hl], d - ld hl, DayCareMText_56432 - jr z, .asm_56333 - ld a, [wTrainerSpriteOffset] + ld hl, DayCareMonNeedsMoreTimeText + jr z, .next + ld a, [wDayCareStartLevel] ld b, a ld a, d sub b - ld [wTrainerEngageDistance], a - ld hl, DayCareMText_56423 + ld [wDayCareNumLevelsGrown], a + ld hl, DayCareMonHasGrownText -.asm_56333 +.next call PrintText ld a, [wPartyCount] cp PARTY_LENGTH - ld hl, DayCareMText_56440 + ld hl, DayCareNoRoomForMonText jp z, .asm_56403 ld de, wTrainerFacingDirection xor a @@ -112,7 +113,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld a, $1 ld [hli], a ld [hl], $0 - ld a, [wTrainerEngageDistance] + ld a, [wDayCareNumLevelsGrown] inc a ld b, a ld c, $2 @@ -126,13 +127,13 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) pop hl dec b jr nz, .asm_56357 - ld hl, DayCareMText_56428 + ld hl, DayCareOweMoneyText call PrintText ld a, $13 ld [wTextBoxID], a call DisplayTextBoxID call YesNoChoice - ld hl, DayCareMText_56437 + ld hl, DayCareAllRightThenText ld a, [wCurrentMenuItem] and a jp nz, .asm_56403 @@ -144,13 +145,13 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld [hMoney + 2], a call HasEnoughMoney jr nc, .asm_56396 - ld hl, DayCareMText_56454 + ld hl, DayCareNotEnoughMoneyText jp .asm_56403 .asm_56396 xor a ld [W_DAYCARE_IN_USE], a - ld hl, wTrainerEngageDistance + ld hl, wDayCareNumLevelsGrown ld [hli], a inc hl ld de, wPlayerMoney + 2 @@ -161,7 +162,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID - ld hl, DayCareMText_5644f + ld hl, DayCareHeresYourMonText call PrintText ld a, DAYCARE_TO_PARTY ld [wMoveMonType], a @@ -178,10 +179,12 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) ld d, h ld e, l ld a, 1 - ld [wHPBarMaxHP], a + ld [wLearningMovesFromDayCare], a predef WriteMonMoves pop bc pop af + +; set mon's HP to max ld hl, wPartyMon1HP call AddNTimes ld d, h @@ -193,73 +196,74 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) inc de ld a, [hl] ld [de], a + ld a, [wcf91] call PlayCry - ld hl, DayCareMText_5642d - jr DayCareMScript_56409 + ld hl, DayCareGotMonBackText + jr .done .asm_56403 - ld a, [wTrainerSpriteOffset] + ld a, [wDayCareStartLevel] ld [wDayCareMonBoxLevel], a -DayCareMScript_56409: ; 56409 (15:6409) +.done call PrintText jp TextScriptEnd -DayCareMText_5640f: ; 5640f (15:640f) - TX_FAR _DayCareMText_5640f +DayCareIntroText: ; 5640f (15:640f) + TX_FAR _DayCareIntroText db "@" -DayCareMText_56414: ; 56414 (15:6414) - TX_FAR _DayCareMText_56414 +DayCareWhichMonText: ; 56414 (15:6414) + TX_FAR _DayCareWhichMonText db "@" -DayCareMText_56419: ; 56419 (15:6419) - TX_FAR _DayCareMText_56419 +DayCareWillLookAfterMonText: ; 56419 (15:6419) + TX_FAR _DayCareWillLookAfterMonText db "@" -DayCareMText_5641e: ; 5641e (15:641e) - TX_FAR _DayCareMText_5641e +DayCareComeSeeMeInAWhileText: ; 5641e (15:641e) + TX_FAR _DayCareComeSeeMeInAWhileText db "@" -DayCareMText_56423: ; 56423 (15:6423) - TX_FAR _DayCareMText_56423 +DayCareMonHasGrownText: ; 56423 (15:6423) + TX_FAR _DayCareMonHasGrownText db "@" -DayCareMText_56428: ; 56428 (15:6428) - TX_FAR _DayCareMText_56428 +DayCareOweMoneyText: ; 56428 (15:6428) + TX_FAR _DayCareOweMoneyText db "@" -DayCareMText_5642d: ; 5642d (15:642d) - TX_FAR _DayCareMText_5642d +DayCareGotMonBackText: ; 5642d (15:642d) + TX_FAR _DayCareGotMonBackText db "@" -DayCareMText_56432: ; 56432 (15:6432) - TX_FAR _DayCareMText_56432 +DayCareMonNeedsMoreTimeText: ; 56432 (15:6432) + TX_FAR _DayCareMonNeedsMoreTimeText db "@" -DayCareMText_56437: ; 56437 (15:6437) - TX_FAR _DayCareMText_56437 -DayCareMText_5643b: ; 5643b (15:643b) - TX_FAR _DayCareMText_5643b +DayCareAllRightThenText: ; 56437 (15:6437) + TX_FAR _DayCareAllRightThenText +DayCareComeAgainText: ; 5643b (15:643b) + TX_FAR _DayCareComeAgainText db "@" -DayCareMText_56440: ; 56440 (15:6440) - TX_FAR _DayCareMText_56440 +DayCareNoRoomForMonText: ; 56440 (15:6440) + TX_FAR _DayCareNoRoomForMonText db "@" -DayCareMText_56445: ; 56445 (15:6445) - TX_FAR _DayCareMText_56445 +DayCareOnlyHaveOneMonText: ; 56445 (15:6445) + TX_FAR _DayCareOnlyHaveOneMonText db "@" -DayCareMText_5644a: ; 5644a (15:644a) - TX_FAR _DayCareMText_5644a +DayCareCantAcceptMonWithHMText: ; 5644a (15:644a) + TX_FAR _DayCareCantAcceptMonWithHMText db "@" -DayCareMText_5644f: ; 5644f (15:644f) - TX_FAR _DayCareMText_5644f +DayCareHeresYourMonText: ; 5644f (15:644f) + TX_FAR _DayCareHeresYourMonText db "@" -DayCareMText_56454: ; 56454 (15:6454) - TX_FAR _DayCareMText_56454 +DayCareNotEnoughMoneyText: ; 56454 (15:6454) + TX_FAR _DayCareNotEnoughMoneyText db "@" diff --git a/scripts/lance.asm b/scripts/lance.asm index e335914b..a4089be4 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -60,7 +60,7 @@ LanceScript0: ; 5a305 (16:6305) jp nc, CheckFightingMapTrainers xor a ld [hJoyHeld], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr nc, .asm_5a325 ld a, $1 diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 1f1fcde0..eb6c3e7d 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -68,7 +68,7 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [hJoyHeld], a ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr c, .asm_76206 ld hl, wd863 diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index fa31718f..c22bf761 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -65,7 +65,7 @@ Mansion3Script_5225b: ; 5225b (14:625b) ret nz call ArePlayerCoordsInArray ret nc - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [wWhichDungeonWarp], a ld hl, wd72d set 4, [hl] diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index bba73dbd..d4996b4b 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -25,51 +25,51 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) TX_ASM ld a, [wd7c6] add a - jp c, .asm_49353 + jp c, .alreadyBoughtMagikarp ld hl, MtMoonPokecenterText_4935c call PrintText - ld a, $13 + ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID call YesNoChoice ld a, [wCurrentMenuItem] and a - jp nz, .asm_4934e + jp nz, .choseNo ld [hMoney], a ld [hMoney + 2], a ld a, $5 ld [hMoney + 1], a call HasEnoughMoney - jr nc, .asm_faa09 + jr nc, .enoughMoney ld hl, MtMoonPokecenterText_49366 - jr .asm_49356 -.asm_faa09 + jr .printText +.enoughMoney ld bc,(MAGIKARP << 8) | 5 call GivePokemon - jr nc, .asm_49359 + jr nc, .done xor a - ld [wWhichTrade], a - ld [wTrainerFacingDirection], a + ld [wPriceTemp], a + ld [wPriceTemp + 2], a ld a, $5 - ld [wTrainerEngageDistance], a - ld hl, wTrainerFacingDirection + ld [wPriceTemp + 1], a + ld hl, wPriceTemp + 2 ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef - ld a, $13 + ld a, MONEY_BOX ld [wTextBoxID], a call DisplayTextBoxID ld hl, wd7c6 set 7, [hl] - jr .asm_49359 -.asm_4934e + jr .done +.choseNo ld hl, MtMoonPokecenterText_49361 - jr .asm_49356 -.asm_49353 + jr .printText +.alreadyBoughtMagikarp ld hl, MtMoonPokecenterText_4936b -.asm_49356 +.printText call PrintText -.asm_49359 +.done jp TextScriptEnd MtMoonPokecenterText_4935c: ; 4935c (12:535c) diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 38c3f717..f4d7de10 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -96,11 +96,11 @@ Museum1FText1: ; 5c135 (17:4135) ld hl, wd754 set 0, [hl] xor a - ld [wMuseumPriceTemp], a - ld [wMuseumPriceTemp + 1], a + ld [wPriceTemp], a + ld [wPriceTemp + 1], a ld a, $50 - ld [wMuseumPriceTemp + 2], a - ld hl, wMuseumPriceTemp + 2 + ld [wPriceTemp + 2], a + ld hl, wPriceTemp + 2 ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 5463b879..226c2d2d 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -307,7 +307,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld a, $d ld [hSpriteIndexOrTextID], a call DisplayTextID - ld a, [wTrainerEngageDistance] + ld a, [wRivalStarterBallSpriteIndex] cp $2 jr nz, .asm_1cd28 ld a, HS_STARTER_BALL_1 @@ -323,7 +323,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld [wcc4d], a predef HideObject call Delay3 - ld a, [wWhichTrade] + ld a, [wRivalStarterTemp] ld [W_RIVALSTARTER], a ld [wcf91], a ld [wd11e], a @@ -806,9 +806,9 @@ OaksLabText29: ; 1d102 (7:5102) OaksLabText2: ; 1d102 (7:5102) TX_ASM ld a, STARTER2 - ld [wWhichTrade], a + ld [wRivalStarterTemp], a ld a, $3 - ld [wTrainerEngageDistance], a + ld [wRivalStarterBallSpriteIndex], a ld a, STARTER1 ld b, $2 jr OaksLabScript_1d133 @@ -817,9 +817,9 @@ OaksLabText30: ; 1d113 (7:5113) OaksLabText3: ; 1d113 (7:5113) TX_ASM ld a, STARTER3 - ld [wWhichTrade], a + ld [wRivalStarterTemp], a ld a, $4 - ld [wTrainerEngageDistance], a + ld [wRivalStarterBallSpriteIndex], a ld a, STARTER2 ld b, $3 jr OaksLabScript_1d133 @@ -828,9 +828,9 @@ OaksLabText31: ; 1d124 (7:5124) OaksLabText4: ; 1d124 (7:5124) TX_ASM ld a, STARTER1 - ld [wWhichTrade], a + ld [wRivalStarterTemp], a ld a, $2 - ld [wTrainerEngageDistance], a + ld [wRivalStarterBallSpriteIndex], a ld a, STARTER3 ld b, $4 @@ -858,13 +858,13 @@ OaksLabScript_1d157: ; 1d157 (7:5157) ld a, $9 ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 - ld [hl], $0 + ld [hl], SPRITE_FACING_DOWN ld a, $1 ld [H_SPRITEINDEX], a ld a, $9 ld [H_SPRITEDATAOFFSET], a call GetPointerWithinSpriteStateData1 - ld [hl], $c + ld [hl], SPRITE_FACING_RIGHT ld hl, wd730 set 6, [hl] predef StarterDex ; StarterDex diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 42bc3086..584878eb 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -26,39 +26,45 @@ PewterPokecenterText3: ; 5c59b (17:459b) ld c, 32 call DelayFrames ld hl, JigglypuffFacingDirections - ld de, wTrainerFacingDirection - ld bc, $0004 + ld de, wJigglypuffFacingDirections + ld bc, 4 call CopyData - ld a, [wSpriteStateData1 + $32] - ld hl, wTrainerFacingDirection -.asm_5c5c3 + + ld a, [wSpriteStateData1 + 3 * $10 + $2] + ld hl, wJigglypuffFacingDirections +.findMatchingFacingDirectionLoop cp [hl] inc hl - jr nz, .asm_5c5c3 + jr nz, .findMatchingFacingDirectionLoop dec hl push hl ld c, BANK(Music_JigglypuffSong) ld a, MUSIC_JIGGLYPUFF_SONG call PlayMusic pop hl -.asm_5c5d1 +.loop ld a, [hl] - ld [wSpriteStateData1 + $32], a + ld [wSpriteStateData1 + 3 * $10 + $2], a + +; rotate the array push hl - ld hl, wTrainerFacingDirection - ld de, wTrainerEngageDistance - ld bc, $0004 + ld hl, wJigglypuffFacingDirections + ld de, wJigglypuffFacingDirections - 1 + ld bc, 4 call CopyData - ld a, [wTrainerEngageDistance] - ld [wcd42], a + ld a, [wJigglypuffFacingDirections - 1] + ld [wJigglypuffFacingDirections + 3], a pop hl + ld c, 24 call DelayFrames + ld a, [wc026] ld b, a ld a, [wc027] or b - jr nz, .asm_5c5d1 + jr nz, .loop + ld c, 48 call DelayFrames call PlayDefaultMusic diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index e89630fc..2e5b55f7 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -26,7 +26,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld [hJoyHeld], a ld a, SPRITE_FACING_RIGHT ld [wSpriteStateData1 + 9], a - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr z, .asm_7520f ld a, $2 diff --git a/scripts/seafoamislands1.asm b/scripts/seafoamislands1.asm index 6a8b23ea..f71fc648 100755 --- a/scripts/seafoamislands1.asm +++ b/scripts/seafoamislands1.asm @@ -10,7 +10,7 @@ SeafoamIslands1Script: ; 447e9 (11:47e9) call CheckBoulderCoords ret nc ld hl, wd7e8 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_44819 set 6, [hl] @@ -36,7 +36,7 @@ SeafoamIslands1Script: ; 447e9 (11:47e9) ld a, $9f ld [wDungeonWarpDestinationMap], a ld hl, Seafoam1HolesCoords - jp Func_46981 + jp IsPlayerOnDungeonWarp Seafoam1HolesCoords: ; 44846 (11:4846) db $06,$11 diff --git a/scripts/seafoamislands2.asm b/scripts/seafoamislands2.asm index 44e92bd0..a62d6bda 100755 --- a/scripts/seafoamislands2.asm +++ b/scripts/seafoamislands2.asm @@ -8,7 +8,7 @@ SeafoamIslands2Script: ; 46315 (11:6315) call CheckBoulderCoords ret nc ld hl, wd87f - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_46340 set 0, [hl] @@ -34,7 +34,7 @@ SeafoamIslands2Script: ; 46315 (11:6315) ld a, $a0 ld [wDungeonWarpDestinationMap], a ld hl, Seafoam2HolesCoords - jp Func_46981 + jp IsPlayerOnDungeonWarp Seafoam2HolesCoords: ; 4636d (11:636d) db $06,$12 diff --git a/scripts/seafoamislands3.asm b/scripts/seafoamislands3.asm index 882553ab..0b650135 100755 --- a/scripts/seafoamislands3.asm +++ b/scripts/seafoamislands3.asm @@ -8,7 +8,7 @@ SeafoamIslands3Script: ; 46451 (11:6451) call CheckBoulderCoords ret nc ld hl, wd880 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_4647c set 0, [hl] @@ -34,7 +34,7 @@ SeafoamIslands3Script: ; 46451 (11:6451) ld a, $a1 ld [wDungeonWarpDestinationMap], a ld hl, Seafoam3HolesCoords - jp Func_46981 + jp IsPlayerOnDungeonWarp Seafoam3HolesCoords: ; 464a9 (11:64a9) db $06,$13 diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index 8009e221..f16ab2c6 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -8,7 +8,7 @@ SeafoamIslands4Script: ; 4658d (11:658d) call CheckBoulderCoords ret nc ld hl, wd881 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_465b8 set 0, [hl] @@ -35,7 +35,7 @@ SeafoamIslands4Script: ; 4658d (11:658d) ld a, $a2 ld [wDungeonWarpDestinationMap], a ld hl, Seafoam4HolesCoords - call Func_46981 + call IsPlayerOnDungeonWarp ld a, [wd732] bit 4, a ret nz diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index 47583600..ab303728 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -34,7 +34,7 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7) ld hl, CoordsData_467fe call ArePlayerCoordsInArray ret nc - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $3 jr nc, .asm_467e6 ld a, $40 @@ -81,7 +81,7 @@ SeafoamIslands5Script2: ; 46816 (11:6816) call ArePlayerCoordsInArray ld a, $0 jr nc, .asm_46849 - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_46837 ld de, RLEMovementData_46859 diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 8538d37f..5043b947 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -142,7 +142,7 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_51c7d - ld a, [wWhichTrade] + ld a, [wCoordIndex] ld [wcf0d], a cp $1 jr z, .asm_51c6c diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index a8cf3b8d..adae2e91 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -57,15 +57,15 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) ld bc, $0078 ld a, $14 call FillMemory - ld a, $1 - ld [$ffba], a + ld a, 1 + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 xor a - ld [$ffba], a - ld [wWhichTrade], a - ld [$ff49], a - ld a, $58 - ld [wTrainerEngageDistance], a + ld [H_AUTOBGTRANSFERENABLED], a + ld [wSSAnneSmokeDriftAmount], a + ld [rOBP1], a + ld a, 88 + ld [wSSAnneSmokeX], a ld hl, wMapViewVRAMPointer ld c, [hl] inc hl @@ -88,11 +88,11 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) push hl push de call ScheduleEastColumnRedraw - call VermilionDock_1dc59 + call VermilionDock_EmitSmokePuff pop de ld b, $10 .asm_1dc11 - call VermilionDock_1dc42 + call VermilionDock_AnimSmokePuffDriftRight ld c, $8 .asm_1dc16 call VermilionDock_1dc7c @@ -105,7 +105,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) dec e jr nz, .asm_1dbfa xor a - ld [$ff4a], a + ld [rWY], a ld [hWY], a call VermilionDock_1dc94 ld a, $90 @@ -122,33 +122,34 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) dec [hl] ret -VermilionDock_1dc42: ; 1dc42 (7:5c42) +VermilionDock_AnimSmokePuffDriftRight: ; 1dc42 (7:5c42) push bc push de ld hl, wOAMBuffer + $11 - ld a, [wWhichTrade] + ld a, [wSSAnneSmokeDriftAmount] swap a ld c, a - ld de, $0004 -.asm_1dc50 + ld de, 4 +.loop inc [hl] inc [hl] add hl, de dec c - jr nz, .asm_1dc50 + jr nz, .loop pop de pop bc ret -VermilionDock_1dc59: ; 1dc59 (7:5c59) - ld a, [wTrainerEngageDistance] - sub $10 - ld [wTrainerEngageDistance], a +VermilionDock_EmitSmokePuff: ; 1dc59 (7:5c59) +; new smoke puff above the S.S. Anne's front smokestack + ld a, [wSSAnneSmokeX] + sub 16 + ld [wSSAnneSmokeX], a ld c, a - ld b, $64 - ld a, [wWhichTrade] + ld b, 100 ; Y + ld a, [wSSAnneSmokeDriftAmount] inc a - ld [wWhichTrade], a + ld [wSSAnneSmokeDriftAmount], a ld a, $1 ld de, VermilionDockOAMBlock call WriteOAMBlock @@ -171,7 +172,7 @@ VermilionDock_1dc7c: ; 1dc7c (7:5c7c) cp l jr nz, .asm_1dc86 ld a, h - ld [$ff43], a + ld [rSCX], a .asm_1dc8e ld a, [rLY] cp h diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 51346032..fd095638 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -49,7 +49,7 @@ VictoryRoad2Script0: ; 517f1 (14:57f1) call CheckBoulderCoords jp nc, CheckFightingMapTrainers ld hl, wd7ee - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $2 jr z, .asm_5180b bit 0, [hl] diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 9aeb1d18..14b6895d 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -34,7 +34,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) ld hl, .coordsData_449f9 call CheckBoulderCoords jp nc, .asm_449fe - ld a, [wWhichTrade] + ld a, [wCoordIndex] cp $1 jr nz, .asm_449dc ld hl, wd126 @@ -60,11 +60,11 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) db $FF .asm_449fe - ld a, $c2 + ld a, VICTORY_ROAD_2 ld [wDungeonWarpDestinationMap], a ld hl, .coordsData_449f9 - call Func_46981 - ld a, [wWhichTrade] + call IsPlayerOnDungeonWarp + ld a, [wCoordIndex] cp $1 jr nz, .asm_44a1b ld hl, wd72d diff --git a/sram.asm b/sram.asm index 9d498df9..f0cf6fac 100644 --- a/sram.asm +++ b/sram.asm @@ -29,8 +29,8 @@ sBox3:: ds wBoxMonNicksEnd - W_NUMINBOX ; a8c4 sBox4:: ds wBoxMonNicksEnd - W_NUMINBOX ; ad26 sBox5:: ds wBoxMonNicksEnd - W_NUMINBOX ; b188 sBox6:: ds wBoxMonNicksEnd - W_NUMINBOX ; b5ea -sBoxes1CheckSum:: ds 1 ; ba4c -sBoxes1CheckSum2:: ds 6 ; ba4d +sBank2AllBoxesChecksum:: ds 1 ; ba4c +sBank2IndividualBoxChecksums:: ds 6 ; ba4d SECTION "Saved Boxes 2", SRAM, BANK[3] @@ -41,5 +41,5 @@ sBox9:: ds wBoxMonNicksEnd - W_NUMINBOX ; a8c4 sBox10:: ds wBoxMonNicksEnd - W_NUMINBOX ; ad26 sBox11:: ds wBoxMonNicksEnd - W_NUMINBOX ; b188 sBox12:: ds wBoxMonNicksEnd - W_NUMINBOX ; b5ea -sBoxes2CheckSum:: ds 1 ; ba4c -sBoxes2CheckSum2:: ds 6 ; ba4d +sBank3AllBoxesChecksum:: ds 1 ; ba4c +sBank3IndividualBoxChecksums:: ds 6 ; ba4d diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm index a4182351..a42e3cf2 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/daycare_1.asm @@ -1,16 +1,16 @@ -_DayCareMText_5640f:: ; 8ab95 (22:6b95) +_DayCareIntroText:: ; 8ab95 (22:6b95) text "I run a DAYCARE." line "Would you like me" cont "to raise one of" cont "your #MON?" done -_DayCareMText_56414:: ; 8abd4 (22:6bd4) +_DayCareWhichMonText:: ; 8abd4 (22:6bd4) text "Which #MON" line "should I raise?" prompt -_DayCareMText_56419:: ; 8abf0 (22:6bf0) +_DayCareWillLookAfterMonText:: ; 8abf0 (22:6bf0) text "Fine, I'll look" line "after @" TX_RAM wcd6d @@ -18,12 +18,12 @@ _DayCareMText_56419:: ; 8abf0 (22:6bf0) cont "for a while." prompt -_DayCareMText_5641e:: ; 8ac19 (22:6c19) +_DayCareComeSeeMeInAWhileText:: ; 8ac19 (22:6c19) text "Come see me in" line "a while." done -_DayCareMText_56423:: ; 8ac32 (22:6c32) +_DayCareMonHasGrownText:: ; 8ac32 (22:6c32) text "Your @" TX_RAM wcd6d db $0 @@ -31,15 +31,13 @@ _DayCareMText_56423:: ; 8ac32 (22:6c32) para "By level, it's" line "grown by @" - -DayCareMText_8ac67:: ; 8ac67 (22:6c67) - TX_NUM wTrainerEngageDistance,$1,$3 + TX_NUM wDayCareNumLevelsGrown,$1,$3 text "!" para "Aren't I great?" prompt -_DayCareMText_56428:: ; 8ac7d (22:6c7d) +_DayCareOweMoneyText:: ; 8ac7d (22:6c7d) text "You owe me ¥@" TX_BCD wcd3f, $c2 db $0 @@ -47,14 +45,14 @@ _DayCareMText_56428:: ; 8ac7d (22:6c7d) cont "of this #MON." done -_DayCareMText_5642d:: ; 8acae (22:6cae) +_DayCareGotMonBackText:: ; 8acae (22:6cae) text $52, " got" line "@" TX_RAM W_DAYCAREMONNAME text " back!" done -_DayCareMText_56432:: ; 8acc1 (22:6cc1) +_DayCareMonNeedsMoreTimeText:: ; 8acc1 (22:6cc1) text "Back already?" line "Your @" TX_RAM wcd6d diff --git a/text/maps/daycare_2.asm b/text/maps/daycare_2.asm index c6478a76..b5104e60 100644 --- a/text/maps/daycare_2.asm +++ b/text/maps/daycare_2.asm @@ -1,8 +1,8 @@ -_DayCareMText_56437:: ; 8c000 (23:4000) +_DayCareAllRightThenText:: ; 8c000 (23:4000) text "All right then," line "@@" -_DayCareMText_5643b:: ; 8c013 (23:4013) +_DayCareComeAgainText:: ; 8c013 (23:4013) IF DEF(_YELLOW) text "Come again." ELSE @@ -10,28 +10,28 @@ ELSE ENDC done -_DayCareMText_56440:: ; 8c020 (23:4020) +_DayCareNoRoomForMonText:: ; 8c020 (23:4020) text "You have no room" line "for this #MON!" done -_DayCareMText_56445:: ; 8c041 (23:4041) +_DayCareOnlyHaveOneMonText:: ; 8c041 (23:4041) text "You only have one" line "#MON with you." done -_DayCareMText_5644a:: ; 8c063 (23:4063) +_DayCareCantAcceptMonWithHMText:: ; 8c063 (23:4063) text "I can't accept a" line "#MON that" cont "knows an HM move." done -_DayCareMText_5644f:: ; 8c090 (23:4090) +_DayCareHeresYourMonText:: ; 8c090 (23:4090) text "Thank you! Here's" line "your #MON!" prompt -_DayCareMText_56454:: ; 8c0ad (23:40ad) +_DayCareNotEnoughMoneyText:: ; 8c0ad (23:40ad) text "Hey, you don't" line "have enough ¥!" done diff --git a/wram.asm b/wram.asm index 8633e732..f089352b 100755 --- a/wram.asm +++ b/wram.asm @@ -424,6 +424,10 @@ wNumStepsToTake:: ; cca1 wRLEByteCount:: ; ccd2 ds 1 +wAddedToParty:: ; ccd3 +; 0 = not added +; 1 = added + wSimulatedJoypadStatesEnd:: ; ccd3 ; this is the end of the joypad states ; the list starts above this address and extends downwards in memory until here @@ -431,7 +435,13 @@ wSimulatedJoypadStatesEnd:: ; ccd3 wParentMenuItem:: ; ccd3 -wccd3:: ds 1 ; used in battle, pokemon, PC and game corner stuff +wCanEvolveFlags:: ; ccd3 +; 1 flag for each party member indicating whether it can evolve +; The purpose of these flags is to track which mons levelled up during the +; current battle at the end of the battle when evolution occurs. +; Other methods of evolution simply set it by calling TryEvolvingMon. + ds 1 + wForceEvolution:: wccd4:: ds 1 ; has a direct reference for simulated joypad stuff in vermillion and seafoam @@ -634,9 +644,33 @@ wOverrideSimulatedJoypadStatesMask:: ; cd3b ds 1 +wHoFTeamIndex:: ; cd3d + +wSSAnneSmokeDriftAmount:: ; cd3d +; multiplied by 16 to get the number of times to go right by 2 pixels + +wRivalStarterTemp:: ; cd3d + +wBoxMonCounts:: ; cd3d +; 12 bytes +; array of the number of mons in each box + +wDexMaxSeenMon:: ; cd3d + +wPPRestoreItem:: ; cd3d + +wWereAnyMonsAsleep:: ; cd3d + +wCanPlaySlots:: ; cd3d + +wNumShakes:: ; cd3d + +wDayCareStartLevel:: ; cd3d +; the level of the mon at the time it entered day care + wWhichBadge:: ; cd3d -wMuseumPriceTemp:: ; cd3d +wPriceTemp:: ; cd3d ; 3-byte BCD number wTitleMonSpecies:: ; cd3d @@ -701,6 +735,12 @@ wWhichTrade:: ; cd3d wTrainerSpriteOffset:: ; cd3d ds 1 +wSSAnneSmokeX:: ; cd3e + +wRivalStarterBallSpriteIndex:: ; cd3e + +wDayCareNumLevelsGrown:: ; cd3e + wOptionsBattleAnimCursorX:: ; cd3e wTrainerInfoTextBoxWidth:: ; cd3e @@ -733,6 +773,8 @@ wHiddenObjectFunctionRomBank:: ; cd3e wTrainerEngageDistance:: ; cd3e ds 1 +wJigglypuffFacingDirections:: ; cd3f + wOptionsBattleStyleCursorX:: ; cd3f wTrainerInfoTextBoxNextRowOffset:: ; cd3f @@ -774,6 +816,10 @@ wHiddenObjectY:: ; cd40 wTrainerScreenY:: ; cd40 ds 1 +wHoFTeamIndex2:: ; cd41 + +wHiddenItemOrCoinsIndex:: ; cd41 + wTradedPlayerMonOT:: ; cd41 wHiddenObjectX:: ; cd41 @@ -962,16 +1008,32 @@ wTileMapBackup2:: ; cd81 ; second buffer for temporarily saving and restoring current screen's tiles (e.g. if menus are drawn on top) ds 20 * 18 +wEvoOldSpecies:: ; cee9 + wBuffer:: ; cee9 ; Temporary storage area of 30 bytes. wTownMapCoords:: ; cee9 ; lower nybble is x, upper nybble is y +wLearningMovesFromDayCare:: ; cee9 +; whether WriteMonMoves is being used to make a mon learn moves from day care +; non-zero if so + wHPBarMaxHP:: ; cee9 - ds 2 + ds 1 + +wEvoNewSpecies:: ; ceea + ds 1 + +wEvoMonTileOffset:: ; ceeb + wHPBarOldHP:: ; ceeb - ds 2 + ds 1 + +wEvoCancelled:: ; ceec + ds 1 + wHPBarNewHP:: ; ceed ds 2 wHPBarDelta:: ; ceef @@ -1453,7 +1515,10 @@ W_SUBANIMCOUNTER:: ; d087 ; counts the number of subentries left in the current subanimation ds 1 -wd088:: ds 1 ; savefile checksum (if file is corrupted) +wSaveFileStatus:: +; 1 = no save file or save file is corrupted +; 2 = save file exists and no corruption has been detected + ds 1 W_NUMFBTILES:: ; d089 ; number of tiles in current battle animation frame block @@ -1462,6 +1527,8 @@ W_NUMFBTILES:: ; d089 wTradedMonMovingRight:: ; d08a ; $01 if mon is moving from left gameboy to right gameboy; $00 if vice versa +wOptionsInitialized:: ; d08a + wd08a:: ds 1 ; used with sprites and displaying the option menu on the main menu screen? wAnimCounter:: ; d08b @@ -2079,6 +2146,8 @@ wBoxItems:: ; d53b ds 1 ; end wCurrentBoxNum:: ; d5a0 +; bits 0-6: box number +; bit 7: whether the player has changed boxes before ds 2 wNumHoFTeams:: ; d5a2 @@ -2319,8 +2388,11 @@ W_ROUTE18GATECURSCRIPT:: ; d669 ds 134 -wd6f0:: ds 14 ; flags for hidden items? -wd6fe:: ds 2 ; flags for hidden coins? +wObtainedHiddenItemsFlags:: + ds 14 + +wObtainedHiddenCoinsFlags:: + ds 2 wWalkBikeSurfState:: ; d700 ; $00 = walking -- cgit v1.3.1-sl0p From 02bd91b7076165653a900a8e39c12a92a9bd2976 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 19 Jul 2015 11:56:13 -0700 Subject: jpab/jpba macros --- engine/battle/core.asm | 76 ++++++----------------- engine/battle/init_battle_variables.asm | 4 +- engine/battle/moveEffects/focus_energy_effect.asm | 4 +- engine/battle/moveEffects/mist_effect.asm | 4 +- engine/battle/moveEffects/paralyze_effect.asm | 12 +--- engine/battle/moveEffects/substitute_effect.asm | 4 +- engine/hidden_object_functions3.asm | 4 +- engine/in_game_trades.asm | 4 +- engine/items/items.asm | 4 +- engine/menu/league_pc.asm | 4 +- engine/menu/naming_screen.asm | 4 +- engine/overworld/cable_club_npc.asm | 4 +- engine/overworld/saffron_guards.asm | 4 +- engine/titlescreen.asm | 4 +- engine/trade.asm | 4 +- home.asm | 48 ++++---------- home/overworld.asm | 12 +--- macros.asm | 12 ++++ scripts/celadonmartelevator.asm | 4 +- scripts/celadonmartroof.asm | 4 +- scripts/lab4.asm | 4 +- scripts/viridiangym.asm | 4 +- 22 files changed, 66 insertions(+), 162 deletions(-) (limited to 'macros.asm') diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 075bc179..93ccdef5 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -187,9 +187,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) ld b, $1 call GoPAL_SET call HideSprites - ld hl, PrintBeginningBattleText - ld b, BANK(PrintBeginningBattleText) - jp Bankswitch + jpab PrintBeginningBattleText ; when a battle is starting, silhouettes of the player's pic and the enemy's pic are slid onto the screen ; the lower of the player's pic (his body) is part of the background, but his head is a sprite @@ -359,9 +357,7 @@ EnemyRan: ; 3c202 (f:4202) call PlaySoundWaitForCurrent xor a ld [H_WHOSETURN], a - ld hl, AnimationSlideEnemyMonOut - ld b, BANK(AnimationSlideEnemyMonOut) - jp Bankswitch + jpab AnimationSlideEnemyMonOut WildRanText: ; 3c229 (f:4229) TX_FAR _WildRanText @@ -938,9 +934,7 @@ FaintEnemyPokemon: ; 0x3c567 jr nz, .gainExpFlagsLoop ld a, b ld [wPartyGainExpFlags], a - ld hl, GainExperience - ld b, BANK(GainExperience) - jp Bankswitch + jpab GainExperience EnemyMonFaintedText: ; 0x3c63e TX_FAR _EnemyMonFaintedText @@ -6462,14 +6456,10 @@ LoadPlayerBackPic: ; 3ec92 (f:6c92) ; does nothing since no stats are ever selected (barring glitches) DoubleOrHalveSelectedStats: ; 3ed02 (f:6d02) callab DoubleSelectedStats - ld hl, HalveSelectedStats - ld b, BANK(HalveSelectedStats) - jp Bankswitch + jpab HalveSelectedStats ScrollTrainerPicAfterBattle: ; 3ed12 (f:6d12) - ld hl, _ScrollTrainerPicAfterBattle - ld b, BANK(_ScrollTrainerPicAfterBattle) - jp Bankswitch + jpab _ScrollTrainerPicAfterBattle ApplyBurnAndParalysisPenaltiesToPlayer: ; 3ed1a (f:6d1a) ld a, $1 @@ -7372,9 +7362,7 @@ BadlyPoisonedText: ; 3f2e4 (f:72e4) db "@" DrainHPEffect: ; 3f2e9 (f:72e9) - ld hl, DrainHPEffect_ - ld b, BANK(DrainHPEffect_) - jp Bankswitch + jpab DrainHPEffect_ ExplodeEffect: ; 3f2f1 (f:72f1) ld hl, wBattleMonHP @@ -8209,9 +8197,7 @@ FlinchSideEffect: ; 3f85b (f:785b) ret OneHitKOEffect: ; 3f884 (f:7884) - ld hl, OneHitKOEffect_ - ld b, BANK(OneHitKOEffect_) - jp Bankswitch + jpab OneHitKOEffect_ ChargeEffect: ; 3f88c (f:788c) ld hl, W_PLAYERBATTSTATUS1 @@ -8321,19 +8307,13 @@ TrappingEffect: ; 3f917 (f:7917) ret MistEffect: ; 3f941 (f:7941) - ld hl, MistEffect_ - ld b, BANK(MistEffect_) - jp Bankswitch + jpab MistEffect_ FocusEnergyEffect: ; 3f949 (f:7949) - ld hl, FocusEnergyEffect_ - ld b, BANK(FocusEnergyEffect_) - jp Bankswitch + jpab FocusEnergyEffect_ RecoilEffect: ; 3f951 (f:7951) - ld hl, RecoilEffect_ - ld b, BANK(RecoilEffect_) - jp Bankswitch + jpab RecoilEffect_ ConfusionSideEffect: ; 3f959 (f:7959) call BattleRandom @@ -8387,14 +8367,10 @@ ConfusionEffectFailed: ; 3f9a6 (f:79a6) jp ConditionalPrintButItFailed ParalyzeEffect: ; 3f9b1 (f:79b1) - ld hl, ParalyzeEffect_ - ld b, BANK(ParalyzeEffect_) - jp Bankswitch + jpab ParalyzeEffect_ SubstituteEffect: ; 3f9b9 (f:79b9) - ld hl, SubstituteEffect_ - ld b, BANK(SubstituteEffect_) - jp Bankswitch + jpab SubstituteEffect_ HyperBeamEffect: ; 3f9c1 (f:79c1) ld hl, W_PLAYERBATTSTATUS2 @@ -8505,9 +8481,7 @@ MimicLearnedMoveText: ; 3fa77 (f:7a77) db "@" LeechSeedEffect: ; 3fa7c (f:7a7c) - ld hl, LeechSeedEffect_ - ld b, BANK(LeechSeedEffect_) - jp Bankswitch + jpab LeechSeedEffect_ SplashEffect: ; 3fa84 (f:7a84) call PlayCurrentMoveAnimation @@ -8601,34 +8575,22 @@ MoveWasDisabledText: ; 3fb09 (f:7b09) db "@" PayDayEffect: ; 3fb0e (f:7b0e) - ld hl, PayDayEffect_ - ld b, BANK(PayDayEffect_) - jp Bankswitch + jpab PayDayEffect_ ConversionEffect: ; 3fb16 (f:7b16) - ld hl, ConversionEffect_ - ld b, BANK(ConversionEffect_) - jp Bankswitch + jpab ConversionEffect_ HazeEffect: ; 3fb1e (f:7b1e) - ld hl, HazeEffect_ - ld b, BANK(HazeEffect_) - jp Bankswitch + jpab HazeEffect_ HealEffect: ; 3fb26 (f:7b26) - ld hl, HealEffect_ - ld b, BANK(HealEffect_) - jp Bankswitch + jpab HealEffect_ TransformEffect: ; 3fb2e (f:7b2e) - ld hl, TransformEffect_ - ld b, BANK(TransformEffect_) - jp Bankswitch + jpab TransformEffect_ ReflectLightScreenEffect: ; 3fb36 (f:7b36) - ld hl, ReflectLightScreenEffect_ - ld b, BANK(ReflectLightScreenEffect_) - jp Bankswitch + jpab ReflectLightScreenEffect_ NothingHappenedText: ; 3fb3e (f:7b3e) TX_FAR _NothingHappenedText diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index f10e9f5e..d5ee7816 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -35,6 +35,4 @@ InitBattleVariables: ; 525af (14:65af) ld a, $2 ; safari battle ld [W_BATTLETYPE], a .notSafariBattle - ld hl, PlayBattleMusic - ld b, BANK(PlayBattleMusic) - jp Bankswitch + jpab PlayBattleMusic diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm index 20a0c07e..b8a783e4 100644 --- a/engine/battle/moveEffects/focus_energy_effect.asm +++ b/engine/battle/moveEffects/focus_energy_effect.asm @@ -14,9 +14,7 @@ FocusEnergyEffect_: ; 27f86 (9:7f86) .alreadyUsing ld c, 50 call DelayFrames - ld hl, PrintButItFailedText_ - ld b, BANK(PrintButItFailedText_) - jp Bankswitch + jpab PrintButItFailedText_ GettingPumpedText: ; 27fb3 (9:7fb3) db $0a diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/moveEffects/mist_effect.asm index 8394eec1..1f8e40b0 100644 --- a/engine/battle/moveEffects/mist_effect.asm +++ b/engine/battle/moveEffects/mist_effect.asm @@ -12,9 +12,7 @@ MistEffect_: ; 33f2b (c:7f2b) ld hl, ShroudedInMistText jp PrintText .mistAlreadyInUse - ld hl, PrintButItFailedText_ - ld b, BANK(PrintButItFailedText_) - jp Bankswitch + jpab PrintButItFailedText_ ShroudedInMistText: ; 33f52 (c:7f52) TX_FAR _ShroudedInMistText diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm index b88e6479..658b0c50 100644 --- a/engine/battle/moveEffects/paralyze_effect.asm +++ b/engine/battle/moveEffects/paralyze_effect.asm @@ -36,18 +36,12 @@ ParalyzeEffect_: ; 52601 (14:6601) ld c, 30 call DelayFrames callab PlayCurrentMoveAnimation - ld hl, PrintMayNotAttackText - ld b, BANK(PrintMayNotAttackText) - jp Bankswitch + jpab PrintMayNotAttackText .didntAffect ld c, 50 call DelayFrames - ld hl, PrintDidntAffectText - ld b, BANK(PrintDidntAffectText) - jp Bankswitch + jpab PrintDidntAffectText .doesntAffect ld c, 50 call DelayFrames - ld hl, PrintDoesntAffectText - ld b, BANK(PrintDoesntAffectText) - jp Bankswitch + jpab PrintDoesntAffectText diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm index 444c755b..c72fffbe 100644 --- a/engine/battle/moveEffects/substitute_effect.asm +++ b/engine/battle/moveEffects/substitute_effect.asm @@ -55,9 +55,7 @@ SubstituteEffect_: ; 17dad (5:7dad) call Bankswitch ; jump to routine depending on animation setting ld hl, SubstituteText call PrintText - ld hl, DrawHUDsAndHPBars - ld b, BANK(DrawHUDsAndHPBars) - jp Bankswitch + jpab DrawHUDsAndHPBars .alreadyHasSubstitute ld hl, HasSubstituteText jr .printText diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm index 8502cea8..80251b94 100755 --- a/engine/hidden_object_functions3.asm +++ b/engine/hidden_object_functions3.asm @@ -34,9 +34,7 @@ PrintBookshelfText: ; fb50 (3:7b50) .noMatch ld a, $ff ld [$ffdb], a - ld b, BANK(PrintCardKeyText) - ld hl, PrintCardKeyText - jp Bankswitch + jpba PrintCardKeyText ; format: db tileset id, bookshelf tile id, text id BookshelfTileIDs: ; fb8b (3:7b8b) diff --git a/engine/in_game_trades.asm b/engine/in_game_trades.asm index 6f1167d0..fffaedcf 100755 --- a/engine/in_game_trades.asm +++ b/engine/in_game_trades.asm @@ -159,9 +159,7 @@ InGameTrade_RestoreScreen: ; 71ca2 (1c:5ca2) call LoadGBPal ld c, 10 call DelayFrames - ld b, BANK(LoadWildData) - ld hl, LoadWildData - jp Bankswitch + jpba LoadWildData InGameTrade_PrepareTradeData: ; 71cc1 (1c:5cc1) ld hl, wTradedPlayerMonSpecies diff --git a/engine/items/items.asm b/engine/items/items.asm index 704e6034..f9f76278 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -499,9 +499,7 @@ ItemUseTownMap: ; d968 (3:5968) ld a,[W_ISINBATTLE] and a jp nz,ItemUseNotTime - ld b, BANK(DisplayTownMap) - ld hl, DisplayTownMap - jp Bankswitch ; display Town Map + jpba DisplayTownMap ItemUseBicycle: ; d977 (3:5977) ld a,[W_ISINBATTLE] diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 06a7894c..1f5cf8e0 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -110,9 +110,7 @@ LeaguePCShowMon: ; 76610 (1d:6610) ld de, wHoFTeamNo ld bc, $0103 call PrintNumber - ld b, BANK(HoFDisplayMonInfo) - ld hl, HoFDisplayMonInfo - jp Bankswitch + jpba HoFDisplayMonInfo HallOfFameNoText: ; 76670 (1d:6670) db "HALL OF FAME No @" diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 9a608491..6037329e 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -172,9 +172,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld a, [W_ISINBATTLE] and a jp z, LoadTextBoxTilePatterns - ld hl, LoadHudTilePatterns - ld b, BANK(LoadHudTilePatterns) - jp Bankswitch + jpab LoadHudTilePatterns .namingScreenButtonFunctions dw .dPadReturnPoint diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm index b9e3102a..2a9b19fe 100755 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/overworld/cable_club_npc.asm @@ -111,9 +111,7 @@ Func_72a8: ; 72a8 (1:72a8) xor a ld [hld], a ld [hl], a - ld hl, LinkMenu - ld b, BANK(LinkMenu) - jp Bankswitch + jpab LinkMenu CableClubNPCAreaReservedFor2FriendsLinkedByCableText: ; 72b3 (1:72b3) TX_FAR _CableClubNPCAreaReservedFor2FriendsLinkedByCableText diff --git a/engine/overworld/saffron_guards.asm b/engine/overworld/saffron_guards.asm index 8e584a2d..c0d6a985 100755 --- a/engine/overworld/saffron_guards.asm +++ b/engine/overworld/saffron_guards.asm @@ -10,9 +10,7 @@ RemoveGuardDrink: ; 5a59f (16:659f) call IsItemInBag pop hl jr z, .drinkLoop - ld b, BANK(RemoveItemByID) - ld hl, RemoveItemByID - jp Bankswitch + jpba RemoveItemByID GuardDrinksList: ; 5a5b7 (16:65b7) db FRESH_WATER, SODA_POP, LEMONADE, $00 diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 729e16bb..84c0cdf7 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -262,9 +262,7 @@ ENDC jp MainMenu .doClearSaveDialogue - ld b, BANK(DoClearSaveDialogue) - ld hl, DoClearSaveDialogue - jp Bankswitch + jpba DoClearSaveDialogue TitleScreenPickNewMon: ; 4496 (1:4496) ld a, vBGMap0 / $100 diff --git a/engine/trade.asm b/engine/trade.asm index 68baaa16..ba8de4ff 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -199,9 +199,7 @@ LoadTradingGFXAndMonNames: ; 411a1 (10:51a1) Trade_LoadMonPartySpriteGfx: ; 4120b (10:520b) ld a, %11010000 ld [rOBP1], a - ld b, BANK(LoadMonPartySpriteGfx) - ld hl, LoadMonPartySpriteGfx - jp Bankswitch + jpba LoadMonPartySpriteGfx Trade_SwapNames: ; 41217 (10:5217) ld hl, wPlayerName diff --git a/home.asm b/home.asm index 69634a7c..b5165ebf 100644 --- a/home.asm +++ b/home.asm @@ -253,9 +253,7 @@ DrawHPBar:: ; 1336 (0:1336) ; wLoadedMon = base address of pokemon data ; W_MONHDEXNUM = base address of base stats LoadMonData:: ; 1372 (0:1372) - ld hl, LoadMonData_ - ld b, BANK(LoadMonData_) - jp Bankswitch + jpab LoadMonData_ OverwritewMoves:: ; 137a (0:137a) @@ -1317,9 +1315,7 @@ CountSetBits:: ; 2b7f (0:2b7f) ; subtracts the amount the player paid from their money ; sets carry flag if there is enough money and unsets carry flag if not SubtractAmountPaidFromMoney:: ; 2b96 (0:2b96) - ld b,BANK(SubtractAmountPaidFromMoney_) - ld hl,SubtractAmountPaidFromMoney_ - jp Bankswitch + jpba SubtractAmountPaidFromMoney_ ; adds the amount the player sold to their money AddAmountSoldToMoney:: ; 2b9e (0:2b9e) @@ -2077,9 +2073,7 @@ ReloadTilesetTilePatterns:: ; 3090 (0:3090) ChooseFlyDestination:: ; 30a9 (0:30a9) ld hl,wd72e res 4,[hl] - ld b, BANK(LoadTownMap_Fly) - ld hl, LoadTownMap_Fly - jp Bankswitch + jpba LoadTownMap_Fly ; causes the text box to close without waiting for a button press after displaying text DisableWaitingAfterTextDisplay:: ; 30b6 (0:30b6) @@ -2097,9 +2091,7 @@ DisableWaitingAfterTextDisplay:: ; 30b6 (0:30b6) ; 01: successful ; 02: not able to be used right now, no extra menu displayed (only certain items use this) UseItem:: ; 30bc (0:30bc) - ld b,BANK(UseItem_) - ld hl,UseItem_ - jp Bankswitch + jpba UseItem_ ; confirms the item toss and then tosses the item ; INPUT: @@ -2201,14 +2193,10 @@ RunNPCMovementScript:: ; 310e (0:310e) dw PewterMuseumGuyMovementScriptPointerTable dw PewterGymGuyMovementScriptPointerTable .playerStepOutFromDoor - ld b, BANK(PlayerStepOutFromDoor) - ld hl, PlayerStepOutFromDoor - jp Bankswitch + jpba PlayerStepOutFromDoor EndNPCMovementScript:: ; 314e (0:314e) - ld b, BANK(_EndNPCMovementScript) - ld hl, _EndNPCMovementScript - jp Bankswitch + jpba _EndNPCMovementScript EmptyFunc2:: ; 3156 (0:3156) ret @@ -2434,9 +2422,7 @@ ResetButtonPressedAndMapScript:: ; 32c1 (0:32c1) ; calls TrainerWalkUpToPlayer TrainerWalkUpToPlayer_Bank0:: ; 32cf (0:32cf) - ld b, BANK(TrainerWalkUpToPlayer) - ld hl, TrainerWalkUpToPlayer - jp Bankswitch + jpba TrainerWalkUpToPlayer ; sets opponent type and mon set/lvl based on the engaging trainer data InitBattleEnemyParameters:: ; 32d7 (0:32d7) @@ -2726,9 +2712,7 @@ IsItemInBag:: ; 3493 (0:3493) DisplayPokedex:: ; 349b (0:349b) ld [wd11e], a - ld b, BANK(_DisplayPokedex) - ld hl, _DisplayPokedex - jp Bankswitch + jpba _DisplayPokedex SetSpriteFacingDirectionAndDelay:: ; 34a6 (0:34a6) call SetSpriteFacingDirection @@ -2937,9 +2921,7 @@ GetTrainerInformation:: ; 3566 (0:3566) ret GetTrainerName:: ; 359e (0:359e) - ld b, BANK(GetTrainerName_) - ld hl, GetTrainerName_ - jp Bankswitch + jpba GetTrainerName_ HasEnoughMoney:: @@ -3604,9 +3586,7 @@ CopyDataUntil:: ; 3913 (0:3913) ; [wRemoveMonFromBox] == 0 specifies the party. ; [wRemoveMonFromBox] != 0 specifies the current box. RemovePokemon:: ; 391f (0:391f) - ld hl, _RemovePokemon - ld b, BANK(_RemovePokemon) - jp Bankswitch + jpab _RemovePokemon AddPartyMon:: ; 3927 (0:3927) push hl @@ -4590,9 +4570,7 @@ GivePokemon:: ld [W_CURENEMYLVL], a xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation], a - ld b, BANK(_GivePokemon) - ld hl, _GivePokemon - jp Bankswitch + jpba _GivePokemon Random:: @@ -4613,9 +4591,7 @@ INCLUDE "home/predef.asm" Func_3ead:: ; 3ead (0:3ead) - ld b, BANK(CinnabarGymQuiz_1eb0a) - ld hl, CinnabarGymQuiz_1eb0a - jp Bankswitch + jpba CinnabarGymQuiz_1eb0a CheckForHiddenObjectOrBookshelfOrCardKeyDoor:: ; 3eb5 (0:3eb5) ld a, [H_LOADEDROMBANK] diff --git a/home/overworld.asm b/home/overworld.asm index 13cce7ee..5b8759dd 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1,9 +1,7 @@ HandleMidJump:: ; Handle the player jumping down ; a ledge in the overworld. - ld b, BANK(_HandleMidJump) - ld hl, _HandleMidJump - jp Bankswitch + jpba _HandleMidJump EnterMap:: ; Load a new map. @@ -355,9 +353,7 @@ NewBattle:: ; 0683 (0:0683) ld a,[wd72e] bit 4,a jr nz,.noBattle - ld b, BANK(InitBattle) - ld hl, InitBattle - jp Bankswitch + jpba InitBattle .noBattle and a ret @@ -783,9 +779,7 @@ HandleFlyWarpOrDungeonWarp:: jp SpecialEnterMap LeaveMapAnim:: - ld b, BANK(_LeaveMapAnim) - ld hl, _LeaveMapAnim - jp Bankswitch + jpba _LeaveMapAnim LoadPlayerSpriteGraphics:: ; Load sprite graphics based on whether the player is standing, biking, or surfing. diff --git a/macros.asm b/macros.asm index ba83e73a..659b0722 100644 --- a/macros.asm +++ b/macros.asm @@ -53,6 +53,18 @@ callab: MACRO call Bankswitch ENDM +jpba: MACRO + ld b, BANK(\1) + ld hl, \1 + jp Bankswitch + ENDM + +jpab: MACRO + ld hl, \1 + ld b, BANK(\1) + jp Bankswitch + ENDM + bcd2: MACRO dn ((\1) / 1000) % 10, ((\1) / 100) % 10 dn ((\1) / 10) % 10, (\1) % 10 diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm index a0aa576d..c8ff1a6d 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/celadonmartelevator.asm @@ -55,9 +55,7 @@ CeldaonMartElevatorWarpMaps: ; 4864a (12:464a) db $02, CELADON_MART_5 CeladonMartElevatorScript_48654: ; 48654 (12:4654) - ld b, BANK(ShakeElevator) - ld hl, ShakeElevator - jp Bankswitch + jpba ShakeElevator CeladonMartElevatorTextPointers: ; 4865c (12:465c) dw CeladonMartElevatorText1 diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index b0afbee0..f83e466d 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -135,9 +135,7 @@ CeladonMartRoofScript_4840c: ; 4840c (12:440c) jp PrintText RemoveItemByIDBank12: ; 484e6 (12:44e6) - ld b, BANK(RemoveItemByID) - ld hl, RemoveItemByID - jp Bankswitch + jpba RemoveItemByID CeladonMartRoofText_484ee: ; 484ee (12:44ee) TX_FAR _CeladonMartRoofText_484ee diff --git a/scripts/lab4.asm b/scripts/lab4.asm index 6d4bd923..21fee0c6 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -112,6 +112,4 @@ Lab4Text2: ; 75dda (1d:5dda) jp TextScriptEnd LoadFossilItemAndMonNameBank1D: ; 75de8 (1d:5de8) - ld b, BANK(LoadFossilItemAndMonName) - ld hl, LoadFossilItemAndMonName - jp Bankswitch + jpba LoadFossilItemAndMonName diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 7a577095..40484d21 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -128,9 +128,7 @@ ViridianGymScript4: ; 7496b (1d:496b) ld [W_CURMAPSCRIPT], a ret .asm_74980 - ld b, BANK(LoadSpinnerArrowTiles) - ld hl, LoadSpinnerArrowTiles - jp Bankswitch + jpba LoadSpinnerArrowTiles ViridianGymScript3: ; 74988 (1d:4988) ld a, [W_ISINBATTLE] -- cgit v1.3.1-sl0p From 4d88812f40c4165e4b893a0631fa658e72d17874 Mon Sep 17 00:00:00 2001 From: dannye Date: Tue, 21 Jul 2015 20:58:19 -0500 Subject: Name some battle sound effects --- audio.asm | 6 +- constants/music_constants.asm | 324 +++++++++++++++++++-------------------- engine/HoF_room_pc.asm | 4 +- engine/battle/animations.asm | 346 +++++++++++++++++++++--------------------- engine/battle/common_text.asm | 2 +- engine/battle/core.asm | 10 +- engine/evos_moves.asm | 4 +- home.asm | 2 +- home/text.asm | 4 +- macros.asm | 16 +- 10 files changed, 360 insertions(+), 358 deletions(-) (limited to 'macros.asm') diff --git a/audio.asm b/audio.asm index 27570b93..563aee14 100644 --- a/audio.asm +++ b/audio.asm @@ -538,8 +538,10 @@ INCLUDE "audio/engine_2.asm" Music_PokeFluteInBattle:: ; 22306 (8:6306) - ld a, SFX_BATTLE_06 ; PokeFlute outside of battle + ; begin playing the "caught mon" sound effect + ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent + ; then immediately overwrtie the channel pointers ld hl, wc00e ld de, SFX_08_PokeFlute_Ch1 call Music8_OverwriteChannelPointer @@ -586,7 +588,7 @@ PokedexRatingSfxPointers: ; 7d162 (1f:5162) db SFX_DENIED, BANK(SFX_1f_51) db SFX_POKEDEX_RATING, BANK(SFX_02_41) db SFX_GET_ITEM_1, BANK(SFX_02_3a) - db SFX_BATTLE_06, BANK(SFX_08_46) + db SFX_CAUGHT_MON, BANK(SFX_08_46) db SFX_LEVEL_UP, BANK(SFX_08_3a) db SFX_GET_KEY_ITEM, BANK(SFX_02_42) db SFX_GET_ITEM_2, BANK(SFX_02_3b) diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 260ccd39..6812e312 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -56,175 +56,175 @@ ENDM music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer ; AUDIO_1 AUDIO_2 AUDIO_3 - music_const SFX_SNARE_1, SFX_02_01 - music_const SFX_SNARE_2, SFX_02_02 - music_const SFX_SNARE_3, SFX_02_03 - music_const SFX_SNARE_4, SFX_02_04 - music_const SFX_SNARE_5, SFX_02_05 - music_const SFX_TRIANGLE_1, SFX_02_06 - music_const SFX_TRIANGLE_2, SFX_02_07 - music_const SFX_SNARE_6, SFX_02_08 - music_const SFX_SNARE_7, SFX_02_09 - music_const SFX_SNARE_8, SFX_02_0a - music_const SFX_SNARE_9, SFX_02_0b - music_const SFX_CYMBAL_1, SFX_02_0c - music_const SFX_CYMBAL_2, SFX_02_0d - music_const SFX_CYMBAL_3, SFX_02_0e - music_const SFX_MUTED_SNARE_1, SFX_02_0f - music_const SFX_TRIANGLE_3, SFX_02_10 - music_const SFX_MUTED_SNARE_2, SFX_02_11 - music_const SFX_MUTED_SNARE_3, SFX_02_12 - music_const SFX_MUTED_SNARE_4, SFX_02_13 - music_const SFX_CRY_00, SFX_02_14 - music_const SFX_CRY_01, SFX_02_15 - music_const SFX_CRY_02, SFX_02_16 - music_const SFX_CRY_03, SFX_02_17 - music_const SFX_CRY_04, SFX_02_18 - music_const SFX_CRY_05, SFX_02_19 - music_const SFX_CRY_06, SFX_02_1a - music_const SFX_CRY_07, SFX_02_1b - music_const SFX_CRY_08, SFX_02_1c - music_const SFX_CRY_09, SFX_02_1d - music_const SFX_CRY_0A, SFX_02_1e - music_const SFX_CRY_0B, SFX_02_1f - music_const SFX_CRY_0C, SFX_02_20 - music_const SFX_CRY_0D, SFX_02_21 - music_const SFX_CRY_0E, SFX_02_22 - music_const SFX_CRY_0F, SFX_02_23 - music_const SFX_CRY_10, SFX_02_24 - music_const SFX_CRY_11, SFX_02_25 - music_const SFX_CRY_12, SFX_02_26 - music_const SFX_CRY_13, SFX_02_27 - music_const SFX_CRY_14, SFX_02_28 - music_const SFX_CRY_15, SFX_02_29 - music_const SFX_CRY_16, SFX_02_2a - music_const SFX_CRY_17, SFX_02_2b - music_const SFX_CRY_18, SFX_02_2c - music_const SFX_CRY_19, SFX_02_2d - music_const SFX_CRY_1A, SFX_02_2e - music_const SFX_CRY_1B, SFX_02_2f - music_const SFX_CRY_1C, SFX_02_30 - music_const SFX_CRY_1D, SFX_02_31 - music_const SFX_CRY_1E, SFX_02_32 - music_const SFX_CRY_1F, SFX_02_33 - music_const SFX_CRY_20, SFX_02_34 - music_const SFX_CRY_21, SFX_02_35 - music_const SFX_CRY_22, SFX_02_36 - music_const SFX_CRY_23, SFX_02_37 - music_const SFX_CRY_24, SFX_02_38 - music_const SFX_CRY_25, SFX_02_39 + music_const SFX_SNARE_1, SFX_02_01 + music_const SFX_SNARE_2, SFX_02_02 + music_const SFX_SNARE_3, SFX_02_03 + music_const SFX_SNARE_4, SFX_02_04 + music_const SFX_SNARE_5, SFX_02_05 + music_const SFX_TRIANGLE_1, SFX_02_06 + music_const SFX_TRIANGLE_2, SFX_02_07 + music_const SFX_SNARE_6, SFX_02_08 + music_const SFX_SNARE_7, SFX_02_09 + music_const SFX_SNARE_8, SFX_02_0a + music_const SFX_SNARE_9, SFX_02_0b + music_const SFX_CYMBAL_1, SFX_02_0c + music_const SFX_CYMBAL_2, SFX_02_0d + music_const SFX_CYMBAL_3, SFX_02_0e + music_const SFX_MUTED_SNARE_1, SFX_02_0f + music_const SFX_TRIANGLE_3, SFX_02_10 + music_const SFX_MUTED_SNARE_2, SFX_02_11 + music_const SFX_MUTED_SNARE_3, SFX_02_12 + music_const SFX_MUTED_SNARE_4, SFX_02_13 + music_const SFX_CRY_00, SFX_02_14 + music_const SFX_CRY_01, SFX_02_15 + music_const SFX_CRY_02, SFX_02_16 + music_const SFX_CRY_03, SFX_02_17 + music_const SFX_CRY_04, SFX_02_18 + music_const SFX_CRY_05, SFX_02_19 + music_const SFX_CRY_06, SFX_02_1a + music_const SFX_CRY_07, SFX_02_1b + music_const SFX_CRY_08, SFX_02_1c + music_const SFX_CRY_09, SFX_02_1d + music_const SFX_CRY_0A, SFX_02_1e + music_const SFX_CRY_0B, SFX_02_1f + music_const SFX_CRY_0C, SFX_02_20 + music_const SFX_CRY_0D, SFX_02_21 + music_const SFX_CRY_0E, SFX_02_22 + music_const SFX_CRY_0F, SFX_02_23 + music_const SFX_CRY_10, SFX_02_24 + music_const SFX_CRY_11, SFX_02_25 + music_const SFX_CRY_12, SFX_02_26 + music_const SFX_CRY_13, SFX_02_27 + music_const SFX_CRY_14, SFX_02_28 + music_const SFX_CRY_15, SFX_02_29 + music_const SFX_CRY_16, SFX_02_2a + music_const SFX_CRY_17, SFX_02_2b + music_const SFX_CRY_18, SFX_02_2c + music_const SFX_CRY_19, SFX_02_2d + music_const SFX_CRY_1A, SFX_02_2e + music_const SFX_CRY_1B, SFX_02_2f + music_const SFX_CRY_1C, SFX_02_30 + music_const SFX_CRY_1D, SFX_02_31 + music_const SFX_CRY_1E, SFX_02_32 + music_const SFX_CRY_1F, SFX_02_33 + music_const SFX_CRY_20, SFX_02_34 + music_const SFX_CRY_21, SFX_02_35 + music_const SFX_CRY_22, SFX_02_36 + music_const SFX_CRY_23, SFX_02_37 + music_const SFX_CRY_24, SFX_02_38 + music_const SFX_CRY_25, SFX_02_39 - music_const SFX_GET_ITEM_2, SFX_02_3b - music_const SFX_TINK, SFX_02_3c - music_const SFX_HEAL_HP, SFX_02_3d - music_const SFX_HEAL_AILMENT, SFX_02_3e - music_const SFX_START_MENU, SFX_02_3f - music_const SFX_PRESS_AB, SFX_02_40 + music_const SFX_GET_ITEM_2, SFX_02_3b + music_const SFX_TINK, SFX_02_3c + music_const SFX_HEAL_HP, SFX_02_3d + music_const SFX_HEAL_AILMENT, SFX_02_3e + music_const SFX_START_MENU, SFX_02_3f + music_const SFX_PRESS_AB, SFX_02_40 ; AUDIO_1 AUDIO_3 - music_const SFX_GET_ITEM_1, SFX_02_3a + music_const SFX_GET_ITEM_1, SFX_02_3a - music_const SFX_POKEDEX_RATING, SFX_02_41 - music_const SFX_GET_KEY_ITEM, SFX_02_42 - music_const SFX_POISONED, SFX_02_43 - music_const SFX_TRADE_MACHINE, SFX_02_44 - music_const SFX_TURN_ON_PC, SFX_02_45 - music_const SFX_TURN_OFF_PC, SFX_02_46 - music_const SFX_ENTER_PC, SFX_02_47 - music_const SFX_SHRINK, SFX_02_48 - music_const SFX_SWITCH, SFX_02_49 - music_const SFX_HEALING_MACHINE, SFX_02_4a - music_const SFX_TELEPORT_1, SFX_02_4b - music_const SFX_TELEPORT_2, SFX_02_4c - music_const SFX_TELEPORT_3, SFX_02_4d - music_const SFX_LEDGE, SFX_02_4e - music_const SFX_FLY_1, SFX_02_4f - music_const SFX_FLY_2, SFX_02_50 - music_const SFX_DENIED, SFX_02_51 - music_const SFX_ARROW_TILES, SFX_02_52 - music_const SFX_PUSH_BOULDER, SFX_02_53 - music_const SFX_SS_ANNE_HORN, SFX_02_54 - music_const SFX_WITHDRAW_DEPOSIT, SFX_02_55 - music_const SFX_CUT, SFX_02_56 - music_const SFX_GO_INSIDE, SFX_02_57 - music_const SFX_SWAP, SFX_02_58 - music_const SFX_59, SFX_02_59 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL - music_const SFX_PURCHASE, SFX_02_5a - music_const SFX_COLLISION, SFX_02_5b - music_const SFX_GO_OUTSIDE, SFX_02_5c - music_const SFX_SAVE, SFX_02_5d + music_const SFX_POKEDEX_RATING, SFX_02_41 + music_const SFX_GET_KEY_ITEM, SFX_02_42 + music_const SFX_POISONED, SFX_02_43 + music_const SFX_TRADE_MACHINE, SFX_02_44 + music_const SFX_TURN_ON_PC, SFX_02_45 + music_const SFX_TURN_OFF_PC, SFX_02_46 + music_const SFX_ENTER_PC, SFX_02_47 + music_const SFX_SHRINK, SFX_02_48 + music_const SFX_SWITCH, SFX_02_49 + music_const SFX_HEALING_MACHINE, SFX_02_4a + music_const SFX_TELEPORT_1, SFX_02_4b + music_const SFX_TELEPORT_2, SFX_02_4c + music_const SFX_TELEPORT_3, SFX_02_4d + music_const SFX_LEDGE, SFX_02_4e + music_const SFX_FLY_1, SFX_02_4f + music_const SFX_FLY_2, SFX_02_50 + music_const SFX_DENIED, SFX_02_51 + music_const SFX_ARROW_TILES, SFX_02_52 + music_const SFX_PUSH_BOULDER, SFX_02_53 + music_const SFX_SS_ANNE_HORN, SFX_02_54 + music_const SFX_WITHDRAW_DEPOSIT, SFX_02_55 + music_const SFX_CUT, SFX_02_56 + music_const SFX_GO_INSIDE, SFX_02_57 + music_const SFX_SWAP, SFX_02_58 + music_const SFX_59, SFX_02_59 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL + music_const SFX_PURCHASE, SFX_02_5a + music_const SFX_COLLISION, SFX_02_5b + music_const SFX_GO_OUTSIDE, SFX_02_5c + music_const SFX_SAVE, SFX_02_5d ; AUDIO_1 - music_const SFX_POKEFLUE, SFX_02_5e - music_const SFX_SAFARI_ZONE_PA, SFX_02_5f + music_const SFX_POKEFLUE, SFX_02_5e + music_const SFX_SAFARI_ZONE_PA, SFX_02_5f ; AUDIO_2 - music_const SFX_LEVEL_UP, SFX_08_3a - - music_const SFX_BATTLE_01, SFX_08_41 - music_const SFX_BATTLE_02, SFX_08_42 - music_const SFX_BATTLE_03, SFX_08_43 - music_const SFX_BATTLE_04, SFX_08_44 - music_const SFX_BATTLE_05, SFX_08_45 - music_const SFX_BATTLE_06, SFX_08_46 - music_const SFX_BATTLE_07, SFX_08_47 - music_const SFX_BATTLE_08, SFX_08_48 - music_const SFX_BATTLE_09, SFX_08_49 - music_const SFX_BATTLE_0A, SFX_08_4a - music_const SFX_BATTLE_0B, SFX_08_4b - music_const SFX_BATTLE_0C, SFX_08_4c - music_const SFX_BATTLE_0D, SFX_08_4d - music_const SFX_BATTLE_0E, SFX_08_4e - music_const SFX_BATTLE_0F, SFX_08_4f - music_const SFX_BATTLE_10, SFX_08_50 - music_const SFX_BATTLE_11, SFX_08_51 - music_const SFX_BATTLE_12, SFX_08_52 - music_const SFX_BATTLE_13, SFX_08_53 - music_const SFX_BATTLE_14, SFX_08_54 - music_const SFX_BATTLE_15, SFX_08_55 - music_const SFX_BATTLE_16, SFX_08_56 ; unused? - music_const SFX_BATTLE_17, SFX_08_57 - music_const SFX_BATTLE_18, SFX_08_58 - music_const SFX_BATTLE_19, SFX_08_59 - music_const SFX_BATTLE_1A, SFX_08_5a - music_const SFX_BATTLE_1B, SFX_08_5b - music_const SFX_BATTLE_1C, SFX_08_5c - music_const SFX_BATTLE_1D, SFX_08_5d - music_const SFX_BATTLE_1E, SFX_08_5e - music_const SFX_BATTLE_1F, SFX_08_5f - music_const SFX_BATTLE_20, SFX_08_60 - music_const SFX_BATTLE_21, SFX_08_61 - music_const SFX_BATTLE_22, SFX_08_62 - music_const SFX_BATTLE_23, SFX_08_63 - music_const SFX_BATTLE_24, SFX_08_64 - music_const SFX_BATTLE_25, SFX_08_65 - music_const SFX_BATTLE_26, SFX_08_66 - music_const SFX_BATTLE_27, SFX_08_67 - music_const SFX_BATTLE_28, SFX_08_68 - music_const SFX_BATTLE_29, SFX_08_69 - music_const SFX_BATTLE_2A, SFX_08_6a - music_const SFX_BATTLE_2B, SFX_08_6b - music_const SFX_BATTLE_2C, SFX_08_6c - music_const SFX_BATTLE_2D, SFX_08_6d - music_const SFX_BATTLE_2E, SFX_08_6e - music_const SFX_BATTLE_2F, SFX_08_6f - music_const SFX_BATTLE_30, SFX_08_70 - music_const SFX_BATTLE_31, SFX_08_71 - music_const SFX_BATTLE_32, SFX_08_72 - music_const SFX_BATTLE_33, SFX_08_73 - music_const SFX_BATTLE_34, SFX_08_74 - music_const SFX_BATTLE_35, SFX_08_75 - music_const SFX_BATTLE_36, SFX_08_76 - music_const SFX_BATTLE_37, SFX_08_77 + music_const SFX_LEVEL_UP, SFX_08_3a + + music_const SFX_BALL_TOSS, SFX_08_41 + music_const SFX_BALL_POOF, SFX_08_42 + music_const SFX_FAINT_THUD, SFX_08_43 + music_const SFX_RUN, SFX_08_44 + music_const SFX_DEX_PAGE_ADDED, SFX_08_45 + music_const SFX_CAUGHT_MON, SFX_08_46 + music_const SFX_PECK, SFX_08_47 + music_const SFX_FAINT_FALL, SFX_08_48 + music_const SFX_BATTLE_09, SFX_08_49 + music_const SFX_POUND, SFX_08_4a + music_const SFX_BATTLE_0B, SFX_08_4b + music_const SFX_BATTLE_0C, SFX_08_4c + music_const SFX_BATTLE_0D, SFX_08_4d + music_const SFX_BATTLE_0E, SFX_08_4e + music_const SFX_BATTLE_0F, SFX_08_4f + music_const SFX_DAMAGE, SFX_08_50 + music_const SFX_NOT_VERY_EFFECTIVE, SFX_08_51 + music_const SFX_BATTLE_12, SFX_08_52 + music_const SFX_BATTLE_13, SFX_08_53 + music_const SFX_BATTLE_14, SFX_08_54 + music_const SFX_VINE_WHIP, SFX_08_55 + music_const SFX_BATTLE_16, SFX_08_56 ; unused? + music_const SFX_BATTLE_17, SFX_08_57 + music_const SFX_BATTLE_18, SFX_08_58 + music_const SFX_BATTLE_19, SFX_08_59 + music_const SFX_SUPER_EFFECTIVE, SFX_08_5a + music_const SFX_BATTLE_1B, SFX_08_5b + music_const SFX_BATTLE_1C, SFX_08_5c + music_const SFX_DOUBLESLAP, SFX_08_5d + music_const SFX_BATTLE_1E, SFX_08_5e + music_const SFX_HORN_DRILL, SFX_08_5f + music_const SFX_BATTLE_20, SFX_08_60 + music_const SFX_BATTLE_21, SFX_08_61 + music_const SFX_BATTLE_22, SFX_08_62 + music_const SFX_BATTLE_23, SFX_08_63 + music_const SFX_BATTLE_24, SFX_08_64 + music_const SFX_BATTLE_25, SFX_08_65 + music_const SFX_BATTLE_26, SFX_08_66 + music_const SFX_BATTLE_27, SFX_08_67 + music_const SFX_BATTLE_28, SFX_08_68 + music_const SFX_BATTLE_29, SFX_08_69 + music_const SFX_BATTLE_2A, SFX_08_6a + music_const SFX_BATTLE_2B, SFX_08_6b + music_const SFX_BATTLE_2C, SFX_08_6c + music_const SFX_PSYBEAM, SFX_08_6d + music_const SFX_BATTLE_2E, SFX_08_6e + music_const SFX_BATTLE_2F, SFX_08_6f + music_const SFX_PSYCHIC_M, SFX_08_70 + music_const SFX_BATTLE_31, SFX_08_71 + music_const SFX_BATTLE_32, SFX_08_72 + music_const SFX_BATTLE_33, SFX_08_73 + music_const SFX_BATTLE_34, SFX_08_74 + music_const SFX_BATTLE_35, SFX_08_75 + music_const SFX_BATTLE_36, SFX_08_76 + music_const SFX_SILPH_SCOPE, SFX_08_77 ; AUDIO_3 - music_const SFX_INTRO_LUNGE, SFX_1f_5e - music_const SFX_INTRO_HIP, SFX_1f_5f - music_const SFX_INTRO_HOP, SFX_1f_60 - music_const SFX_INTRO_RAISE, SFX_1f_61 - music_const SFX_INTRO_CRASH, SFX_1f_62 - music_const SFX_INTRO_WHOOSH, SFX_1f_63 - music_const SFX_SLOTS_STOP_WHEEL, SFX_1f_64 - music_const SFX_SLOTS_REWARD, SFX_1f_65 - music_const SFX_SLOTS_NEW_SPIN, SFX_1f_66 - music_const SFX_SHOOTING_STAR, SFX_1f_67 + music_const SFX_INTRO_LUNGE, SFX_1f_5e + music_const SFX_INTRO_HIP, SFX_1f_5f + music_const SFX_INTRO_HOP, SFX_1f_60 + music_const SFX_INTRO_RAISE, SFX_1f_61 + music_const SFX_INTRO_CRASH, SFX_1f_62 + music_const SFX_INTRO_WHOOSH, SFX_1f_63 + music_const SFX_SLOTS_STOP_WHEEL, SFX_1f_64 + music_const SFX_SLOTS_REWARD, SFX_1f_65 + music_const SFX_SLOTS_NEW_SPIN, SFX_1f_66 + music_const SFX_SHOOTING_STAR, SFX_1f_67 diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 5e3ff37b..104d32ff 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -76,7 +76,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb) ld hl,vBGMap1 call CopyTileMapToVRAM call FillMiddleOfScreenWithWhite - ld a,%11111100 ; make the mon a black silhouette + ld a,%11111100 ; make the mon a black silhouette ld [rBGP],a ; scroll the mon left by one tile 7 times @@ -88,7 +88,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb) ; scroll the mon left by one tile 20 times ; This time, we have to move the window left too in order to hide the text that -; is wrapping around to the right side of the screen. +; is wrapping around to the right side of the screen. ld c,20 .scrollLoop2 call ScrollCreditsMonLeft diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index d9406257..73d152b8 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -741,7 +741,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e) cp a,11 ; is it the beginning of the subanimation? jr nz,.skipPlayingSound ; if it is the beginning of the subanimation, play a sound - ld a,SFX_BATTLE_01 + ld a,SFX_BALL_TOSS call PlaySound .skipPlayingSound ld a,[W_ISINBATTLE] @@ -820,7 +820,7 @@ DoPoofSpecialEffects: ; 78fce (1e:4fce) ld a,[W_SUBANIMCOUNTER] cp a,5 ret nz - ld a,SFX_BATTLE_02 + ld a,SFX_BALL_POOF jp PlaySound DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9) @@ -2274,7 +2274,7 @@ GetMoveSoundB: ; 79869 (1e:5869) ld b, a ret -; get the sound of the move id in a +; get the sound of the (move id - 1) in a GetMoveSound: ; 7986f (1e:586f) ld hl,MoveSoundTable ld e,a @@ -2329,172 +2329,172 @@ IsCryMove: ; 798ad (1e:58ad) ret MoveSoundTable: ; 798bc (1e:58bc) - db SFX_BATTLE_0A,$00,$80 - db SFX_BATTLE_0C,$10,$80 - db SFX_BATTLE_1D,$00,$80 - db SFX_BATTLE_0B,$01,$80 - db SFX_BATTLE_0D,$00,$40 - db SFX_BATTLE_37,$00,$ff - db SFX_BATTLE_0D,$10,$60 - db SFX_BATTLE_0D,$20,$80 - db SFX_BATTLE_0D,$00,$a0 - db SFX_BATTLE_10,$00,$80 - db SFX_BATTLE_0F,$20,$40 - db SFX_BATTLE_0F,$00,$80 - db SFX_BATTLE_0E,$00,$a0 - db SFX_BATTLE_11,$10,$c0 - db SFX_BATTLE_11,$00,$a0 - db SFX_BATTLE_12,$00,$c0 - db SFX_BATTLE_12,$10,$a0 - db SFX_BATTLE_13,$00,$e0 - db SFX_BATTLE_11,$20,$c0 - db SFX_BATTLE_14,$00,$80 - db SFX_BATTLE_22,$00,$80 - db SFX_BATTLE_15,$01,$80 - db SFX_BATTLE_20,$00,$80 - db SFX_BATTLE_17,$f0,$40 - db SFX_BATTLE_1A,$00,$80 - db SFX_BATTLE_17,$00,$80 - db SFX_BATTLE_21,$10,$80 - db SFX_BATTLE_1B,$01,$a0 - db SFX_BATTLE_18,$00,$80 - db SFX_BATTLE_1E,$00,$60 - db SFX_BATTLE_1E,$01,$40 - db SFX_BATTLE_1F,$00,$a0 - db SFX_BATTLE_1A,$10,$a0 - db SFX_BATTLE_20,$00,$c0 - db SFX_BATTLE_14,$10,$60 - db SFX_BATTLE_1A,$00,$a0 - db SFX_BATTLE_22,$11,$c0 - db SFX_BATTLE_1A,$20,$c0 - db SFX_BATTLE_21,$00,$80 - db SFX_BATTLE_1B,$00,$80 - db SFX_BATTLE_1B,$20,$c0 - db SFX_BATTLE_19,$00,$80 - db SFX_BATTLE_31,$ff,$40 - db SFX_BATTLE_1E,$00,$80 - db SFX_BATTLE_0B,$00,$c0 - db SFX_BATTLE_0B,$00,$40 - db SFX_BATTLE_35,$00,$80 - db SFX_BATTLE_27,$40,$60 - db SFX_BATTLE_27,$00,$80 - db SFX_BATTLE_27,$ff,$40 - db SFX_BATTLE_2A,$80,$c0 - db SFX_BATTLE_19,$10,$a0 - db SFX_BATTLE_19,$21,$e0 - db SFX_BATTLE_29,$00,$80 - db SFX_BATTLE_24,$20,$60 - db SFX_BATTLE_2A,$00,$80 - db SFX_BATTLE_2C,$00,$80 - db SFX_BATTLE_28,$40,$80 - db SFX_BATTLE_29,$f0,$e0 - db SFX_BATTLE_2D,$00,$80 - db SFX_BATTLE_2A,$f0,$60 - db SFX_BATTLE_28,$00,$80 - db SFX_BATTLE_36,$00,$80 - db SFX_BATTLE_07,$01,$a0 - db SFX_BATTLE_13,$f0,$20 - db SFX_BATTLE_23,$01,$c0 - db SFX_BATTLE_23,$00,$80 - db SFX_BATTLE_1A,$00,$e0 - db SFX_BATTLE_26,$01,$60 - db SFX_BATTLE_26,$20,$40 - db SFX_BATTLE_24,$00,$80 - db SFX_BATTLE_24,$40,$c0 - db SFX_BATTLE_1B,$03,$60 - db SFX_BATTLE_25,$11,$e0 - db SFX_BATTLE_12,$20,$e0 - db SFX_BATTLE_2E,$00,$80 - db SFX_BATTLE_1C,$00,$80 - db SFX_BATTLE_1C,$11,$a0 - db SFX_BATTLE_1C,$01,$c0 - db SFX_BATTLE_13,$14,$c0 - db SFX_BATTLE_1B,$02,$a0 - db SFX_BATTLE_29,$f0,$80 - db SFX_BATTLE_29,$20,$c0 - db SFX_BATTLE_2F,$00,$20 - db SFX_BATTLE_2F,$20,$80 - db SFX_BATTLE_2E,$12,$60 - db SFX_BATTLE_26,$00,$80 - db SFX_BATTLE_14,$01,$e0 - db SFX_BATTLE_29,$0f,$e0 - db SFX_BATTLE_29,$11,$20 - db SFX_BATTLE_10,$10,$40 - db SFX_BATTLE_0F,$10,$c0 - db SFX_BATTLE_14,$00,$20 - db SFX_BATTLE_30,$00,$80 - db SFX_BATTLE_35,$11,$18 - db SFX_BATTLE_09,$20,$c0 - db SFX_BATTLE_08,$20,$c0 - db SFX_BATTLE_25,$00,$10 - db SFX_BATTLE_26,$f0,$20 - db SFX_BATTLE_33,$f0,$c0 - db SFX_BATTLE_11,$f0,$e0 - db SFX_BATTLE_09,$f0,$40 - db SFX_BATTLE_31,$00,$80 - db SFX_BATTLE_33,$80,$40 - db SFX_BATTLE_33,$00,$80 - db SFX_BATTLE_14,$11,$20 - db SFX_BATTLE_14,$22,$10 - db SFX_BATTLE_1B,$f1,$ff - db SFX_BATTLE_13,$f1,$ff - db SFX_BATTLE_14,$33,$30 - db SFX_BATTLE_32,$40,$c0 - db SFX_BATTLE_0E,$20,$20 - db SFX_BATTLE_0E,$f0,$10 - db SFX_BATTLE_0F,$f8,$10 - db SFX_BATTLE_11,$f0,$10 - db SFX_BATTLE_25,$00,$80 - db SFX_BATTLE_18,$00,$c0 - db SFX_BATTLE_32,$c0,$ff - db SFX_BATTLE_09,$f2,$20 - db SFX_BATTLE_34,$00,$80 - db SFX_BATTLE_34,$00,$40 - db SFX_BATTLE_09,$00,$40 - db SFX_BATTLE_11,$10,$ff - db SFX_BATTLE_2A,$20,$20 - db SFX_BATTLE_32,$00,$80 - db SFX_BATTLE_29,$1f,$20 - db SFX_BATTLE_25,$2f,$80 - db SFX_BATTLE_0F,$1f,$ff - db SFX_BATTLE_2B,$1f,$60 - db SFX_BATTLE_26,$1e,$20 - db SFX_BATTLE_26,$1f,$18 - db SFX_BATTLE_14,$0f,$80 - db SFX_BATTLE_09,$f8,$10 - db SFX_BATTLE_08,$18,$20 - db SFX_BATTLE_32,$08,$40 - db SFX_BATTLE_17,$01,$e0 - db SFX_BATTLE_11,$09,$ff - db SFX_BATTLE_35,$42,$01 - db SFX_BATTLE_1C,$00,$ff - db SFX_BATTLE_32,$08,$e0 - db SFX_BATTLE_24,$00,$80 - db SFX_BATTLE_09,$88,$10 - db SFX_BATTLE_25,$48,$ff - db SFX_BATTLE_08,$ff,$ff - db SFX_BATTLE_24,$ff,$10 - db SFX_BATTLE_08,$ff,$04 - db SFX_BATTLE_1C,$01,$ff - db SFX_BATTLE_13,$f8,$ff - db SFX_BATTLE_0C,$f0,$f0 - db SFX_BATTLE_0F,$08,$10 - db SFX_BATTLE_0D,$f0,$ff - db SFX_BATTLE_1A,$f0,$ff - db SFX_BATTLE_34,$10,$ff - db SFX_BATTLE_0E,$f0,$20 - db SFX_BATTLE_2B,$f0,$60 - db SFX_BATTLE_21,$12,$10 - db SFX_BATTLE_36,$f0,$20 - db SFX_BATTLE_1E,$12,$ff - db SFX_BATTLE_31,$80,$04 - db SFX_BATTLE_33,$f0,$10 - db SFX_BATTLE_29,$f8,$ff - db SFX_BATTLE_26,$f0,$ff - db SFX_BATTLE_11,$01,$ff - db SFX_BATTLE_2C,$d8,$04 - db SFX_BATTLE_0B,$00,$80 - db SFX_BATTLE_0B,$00,$80 + db SFX_POUND, $00,$80 ; POUND + db SFX_BATTLE_0C, $10,$80 ; KARATE_CHOP + db SFX_DOUBLESLAP, $00,$80 ; DOUBLESLAP + db SFX_BATTLE_0B, $01,$80 ; COMET_PUNCH + db SFX_BATTLE_0D, $00,$40 ; MEGA_PUNCH + db SFX_SILPH_SCOPE, $00,$ff ; PAY_DAY + db SFX_BATTLE_0D, $10,$60 ; FIRE_PUNCH + db SFX_BATTLE_0D, $20,$80 ; ICE_PUNCH + db SFX_BATTLE_0D, $00,$a0 ; THUNDERPUNCH + db SFX_DAMAGE, $00,$80 ; SCRATCH + db SFX_BATTLE_0F, $20,$40 ; VICEGRIP + db SFX_BATTLE_0F, $00,$80 ; GUILLOTINE + db SFX_BATTLE_0E, $00,$a0 ; RAZOR_WIND + db SFX_NOT_VERY_EFFECTIVE,$10,$c0 ; SWORDS_DANCE + db SFX_NOT_VERY_EFFECTIVE,$00,$a0 ; CUT + db SFX_BATTLE_12, $00,$c0 ; GUST + db SFX_BATTLE_12, $10,$a0 ; WING_ATTACK + db SFX_BATTLE_13, $00,$e0 ; WHIRLWIND + db SFX_NOT_VERY_EFFECTIVE,$20,$c0 ; FLY + db SFX_BATTLE_14, $00,$80 ; BIND + db SFX_BATTLE_22, $00,$80 ; SLAM + db SFX_VINE_WHIP, $01,$80 ; VINE_WHIP + db SFX_BATTLE_20, $00,$80 ; STOMP + db SFX_BATTLE_17, $f0,$40 ; DOUBLE_KICK + db SFX_SUPER_EFFECTIVE, $00,$80 ; MEGA_KICK + db SFX_BATTLE_17, $00,$80 ; JUMP_KICK + db SFX_BATTLE_21, $10,$80 ; ROLLING_KICK + db SFX_BATTLE_1B, $01,$a0 ; SAND_ATTACK + db SFX_BATTLE_18, $00,$80 ; HEADBUTT + db SFX_BATTLE_1E, $00,$60 ; HORN_ATTACK + db SFX_BATTLE_1E, $01,$40 ; FURY_ATTACK + db SFX_HORN_DRILL, $00,$a0 ; HORN_DRILL + db SFX_SUPER_EFFECTIVE, $10,$a0 ; TACKLE + db SFX_BATTLE_20, $00,$c0 ; BODY_SLAM + db SFX_BATTLE_14, $10,$60 ; WRAP + db SFX_SUPER_EFFECTIVE, $00,$a0 ; TAKE_DOWN + db SFX_BATTLE_22, $11,$c0 ; THRASH + db SFX_SUPER_EFFECTIVE, $20,$c0 ; DOUBLE_EDGE + db SFX_BATTLE_21, $00,$80 ; TAIL_WHIP + db SFX_BATTLE_1B, $00,$80 ; POISON_STING + db SFX_BATTLE_1B, $20,$c0 ; TWINEEDLE + db SFX_BATTLE_19, $00,$80 ; PIN_MISSILE + db SFX_BATTLE_31, $ff,$40 ; LEER + db SFX_BATTLE_1E, $00,$80 ; BITE + db SFX_BATTLE_0B, $00,$c0 ; GROWL + db SFX_BATTLE_0B, $00,$40 ; ROAR + db SFX_BATTLE_35, $00,$80 ; SING + db SFX_BATTLE_27, $40,$60 ; SUPERSONIC + db SFX_BATTLE_27, $00,$80 ; SONICBOOM + db SFX_BATTLE_27, $ff,$40 ; DISABLE + db SFX_BATTLE_2A, $80,$c0 ; ACID + db SFX_BATTLE_19, $10,$a0 ; EMBER + db SFX_BATTLE_19, $21,$e0 ; FLAMETHROWER + db SFX_BATTLE_29, $00,$80 ; MIST + db SFX_BATTLE_24, $20,$60 ; WATER_GUN + db SFX_BATTLE_2A, $00,$80 ; HYDRO_PUMP + db SFX_BATTLE_2C, $00,$80 ; SURF + db SFX_BATTLE_28, $40,$80 ; ICE_BEAM + db SFX_BATTLE_29, $f0,$e0 ; BLIZZARD + db SFX_PSYBEAM, $00,$80 ; PSYBEAM + db SFX_BATTLE_2A, $f0,$60 ; BUBBLEBEAM + db SFX_BATTLE_28, $00,$80 ; AURORA_BEAM + db SFX_BATTLE_36, $00,$80 ; HYPER_BEAM + db SFX_PECK,$01, $a0 ; PECK + db SFX_BATTLE_13, $f0,$20 ; DRILL_PECK + db SFX_BATTLE_23, $01,$c0 ; SUBMISSION + db SFX_BATTLE_23, $00,$80 ; LOW_KICK + db SFX_SUPER_EFFECTIVE, $00,$e0 ; COUNTER + db SFX_BATTLE_26, $01,$60 ; SEISMIC_TOSS + db SFX_BATTLE_26, $20,$40 ; STRENGTH + db SFX_BATTLE_24, $00,$80 ; ABSORB + db SFX_BATTLE_24, $40,$c0 ; MEGA_DRAIN + db SFX_BATTLE_1B, $03,$60 ; LEECH_SEED + db SFX_BATTLE_25, $11,$e0 ; GROWTH + db SFX_BATTLE_12, $20,$e0 ; RAZOR_LEAF + db SFX_BATTLE_2E, $00,$80 ; SOLARBEAM + db SFX_BATTLE_1C, $00,$80 ; POISONPOWDER + db SFX_BATTLE_1C, $11,$a0 ; STUN_SPORE + db SFX_BATTLE_1C, $01,$c0 ; SLEEP_POWDER + db SFX_BATTLE_13, $14,$c0 ; PETAL_DANCE + db SFX_BATTLE_1B, $02,$a0 ; STRING_SHOT + db SFX_BATTLE_29, $f0,$80 ; DRAGON_RAGE + db SFX_BATTLE_29, $20,$c0 ; FIRE_SPIN + db SFX_BATTLE_2F, $00,$20 ; THUNDERSHOCK + db SFX_BATTLE_2F, $20,$80 ; THUNDERBOLT + db SFX_BATTLE_2E, $12,$60 ; THUNDER_WAVE + db SFX_BATTLE_26, $00,$80 ; THUNDER + db SFX_BATTLE_14, $01,$e0 ; ROCK_THROW + db SFX_BATTLE_29, $0f,$e0 ; EARTHQUAKE + db SFX_BATTLE_29, $11,$20 ; FISSURE + db SFX_DAMAGE, $10,$40 ; DIG + db SFX_BATTLE_0F, $10,$c0 ; TOXIC + db SFX_BATTLE_14, $00,$20 ; CONFUSION + db SFX_PSYCHIC_M, $00,$80 ; PSYCHIC_M + db SFX_BATTLE_35, $11,$18 ; HYPNOSIS + db SFX_BATTLE_09, $20,$c0 ; MEDITATE + db SFX_FAINT_FALL, $20,$c0 ; AGILITY + db SFX_BATTLE_25, $00,$10 ; QUICK_ATTACK + db SFX_BATTLE_26, $f0,$20 ; RAGE + db SFX_BATTLE_33, $f0,$c0 ; TELEPORT + db SFX_NOT_VERY_EFFECTIVE,$f0,$e0 ; NIGHT_SHADE + db SFX_BATTLE_09, $f0,$40 ; MIMIC + db SFX_BATTLE_31, $00,$80 ; SCREECH + db SFX_BATTLE_33, $80,$40 ; DOUBLE_TEAM + db SFX_BATTLE_33, $00,$80 ; RECOVER + db SFX_BATTLE_14, $11,$20 ; HARDEN + db SFX_BATTLE_14, $22,$10 ; MINIMIZE + db SFX_BATTLE_1B, $f1,$ff ; SMOKESCREEN + db SFX_BATTLE_13, $f1,$ff ; CONFUSE_RAY + db SFX_BATTLE_14, $33,$30 ; WITHDRAW + db SFX_BATTLE_32, $40,$c0 ; DEFENSE_CURL + db SFX_BATTLE_0E, $20,$20 ; BARRIER + db SFX_BATTLE_0E, $f0,$10 ; LIGHT_SCREEN + db SFX_BATTLE_0F, $f8,$10 ; HAZE + db SFX_NOT_VERY_EFFECTIVE,$f0,$10 ; REFLECT + db SFX_BATTLE_25, $00,$80 ; FOCUS_ENERGY + db SFX_BATTLE_18, $00,$c0 ; BIDE + db SFX_BATTLE_32, $c0,$ff ; METRONOME + db SFX_BATTLE_09, $f2,$20 ; MIRROR_MOVE + db SFX_BATTLE_34, $00,$80 ; SELFDESTRUCT + db SFX_BATTLE_34, $00,$40 ; EGG_BOMB + db SFX_BATTLE_09, $00,$40 ; LICK + db SFX_NOT_VERY_EFFECTIVE,$10,$ff ; SMOG + db SFX_BATTLE_2A, $20,$20 ; SLUDGE + db SFX_BATTLE_32, $00,$80 ; BONE_CLUB + db SFX_BATTLE_29, $1f,$20 ; FIRE_BLAST + db SFX_BATTLE_25, $2f,$80 ; WATERFALL + db SFX_BATTLE_0F, $1f,$ff ; CLAMP + db SFX_BATTLE_2B, $1f,$60 ; SWIFT + db SFX_BATTLE_26, $1e,$20 ; SKULL_BASH + db SFX_BATTLE_26, $1f,$18 ; SPIKE_CANNON + db SFX_BATTLE_14, $0f,$80 ; CONSTRICT + db SFX_BATTLE_09, $f8,$10 ; AMNESIA + db SFX_FAINT_FALL, $18,$20 ; KINESIS + db SFX_BATTLE_32, $08,$40 ; SOFTBOILED + db SFX_BATTLE_17, $01,$e0 ; HI_JUMP_KICK + db SFX_NOT_VERY_EFFECTIVE,$09,$ff ; GLARE + db SFX_BATTLE_35, $42,$01 ; DREAM_EATER + db SFX_BATTLE_1C, $00,$ff ; POISON_GAS + db SFX_BATTLE_32, $08,$e0 ; BARRAGE + db SFX_BATTLE_24, $00,$80 ; LEECH_LIFE + db SFX_BATTLE_09, $88,$10 ; LOVELY_KISS + db SFX_BATTLE_25, $48,$ff ; SKY_ATTACK + db SFX_FAINT_FALL, $ff,$ff ; TRANSFORM + db SFX_BATTLE_24, $ff,$10 ; BUBBLE + db SFX_FAINT_FALL, $ff,$04 ; DIZZY_PUNCH + db SFX_BATTLE_1C, $01,$ff ; SPORE + db SFX_BATTLE_13, $f8,$ff ; FLASH + db SFX_BATTLE_0C, $f0,$f0 ; PSYWAVE + db SFX_BATTLE_0F, $08,$10 ; SPLASH + db SFX_BATTLE_0D, $f0,$ff ; ACID_ARMOR + db SFX_SUPER_EFFECTIVE, $f0,$ff ; CRABHAMMER + db SFX_BATTLE_34, $10,$ff ; EXPLOSION + db SFX_BATTLE_0E, $f0,$20 ; FURY_SWIPES + db SFX_BATTLE_2B, $f0,$60 ; BONEMERANG + db SFX_BATTLE_21, $12,$10 ; REST + db SFX_BATTLE_36, $f0,$20 ; ROCK_SLIDE + db SFX_BATTLE_1E, $12,$ff ; HYPER_FANG + db SFX_BATTLE_31, $80,$04 ; SHARPEN + db SFX_BATTLE_33, $f0,$10 ; CONVERSION + db SFX_BATTLE_29, $f8,$ff ; TRI_ATTACK + db SFX_BATTLE_26, $f0,$ff ; SUPER_FANG + db SFX_NOT_VERY_EFFECTIVE,$01,$ff ; SLASH + db SFX_BATTLE_2C, $d8,$04 ; SUBSTITUTE + db SFX_BATTLE_0B, $00,$80 ; STRUGGLE + db SFX_BATTLE_0B, $00,$80 CopyPicTiles: ; 79aae (1e:5aae) ld a, [H_WHOSETURN] @@ -2929,7 +2929,7 @@ TossBallAnimation: ; 79e16 (1e:5e16) ld a,TOSS_ANIM ld [W_ANIMATIONID],a call PlayAnimation - ld a,SFX_BATTLE_03 + ld a,SFX_FAINT_THUD call PlaySound ld a,BLOCKBALL_ANIM ld [W_ANIMATIONID],a @@ -2945,15 +2945,15 @@ PlayApplyingAttackSound: ; 79e6a (1e:5e6a) cp $a ld a, $20 ld b, $30 - ld c, SFX_BATTLE_10 + ld c, SFX_DAMAGE jr z, .asm_79e8b ld a, $e0 ld b, $ff - ld c, SFX_BATTLE_1A + ld c, SFX_SUPER_EFFECTIVE jr nc, .asm_79e8b ld a, $50 ld b, $1 - ld c, SFX_BATTLE_11 + ld c, SFX_NOT_VERY_EFFECTIVE .asm_79e8b ld [wc0f1], a ld a, b diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 41e402f3..1acef280 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -64,7 +64,7 @@ PrintBeginningBattleText: ; 58d99 (16:4d99) ld [wc0f1], a ld a, $80 ld [wc0f2], a - ld a, SFX_BATTLE_37 + ld a, SFX_SILPH_SCOPE call PlaySound jp WaitForSoundToFinish .done diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a74e0a27..4c29e003 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -353,7 +353,7 @@ EnemyRan: ; 3c202 (f:4202) ld hl, EnemyRanText .printText call PrintText - ld a, SFX_BATTLE_04 + ld a, SFX_RUN call PlaySoundWaitForCurrent xor a ld [H_WHOSETURN], a @@ -860,13 +860,13 @@ FaintEnemyPokemon: ; 0x3c567 xor a ld [wc0f1], a ld [wc0f2], a - ld a, SFX_BATTLE_08 ; SFX_FALL? + ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent .sfxwait ld a, [wc02a] - cp SFX_BATTLE_08 + cp SFX_FAINT_FALL jr z, .sfxwait - ld a, SFX_BATTLE_03 ; SFX_DROP + ld a, SFX_FAINT_THUD call PlaySound call WaitForSoundToFinish jr .sfxplayed @@ -1672,7 +1672,7 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9) dec a .playSound ld [wBattleResult], a - ld a, SFX_BATTLE_04 + ld a, SFX_RUN call PlaySoundWaitForCurrent ld hl, GotAwayText call PrintText diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 2c668d63..b9b4bb0f 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -443,7 +443,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8) jr nz, .findEmptySlotLoop ; no empty move slots found - pop de + pop de push de push hl ld h, d @@ -472,7 +472,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8) jr z, .nextMove ; write move PP value if learning moves from day care - push hl + push hl ld a, [hl] ld hl, wPartyMon1PP - wPartyMon1Moves add hl, de diff --git a/home.asm b/home.asm index 6bb54df2..a9fc70e6 100644 --- a/home.asm +++ b/home.asm @@ -1463,7 +1463,7 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53) ; pointless because both values are overwritten before they are read ld a,$01 ld [wMenuExitMethod],a - ld [wChosenMenuItem],a + ld [wChosenMenuItem],a xor a ld [wMenuWatchMovingOutOfBounds],a diff --git a/home/text.asm b/home/text.asm index 89708306..d57fc03f 100644 --- a/home/text.asm +++ b/home/text.asm @@ -627,12 +627,12 @@ TextCommand0B:: ; 1c31 (0:1c31) ; format: text command ID, sound ID or cry ID TextCommandSounds:: ; 1c64 (0:1c64) db $0B,SFX_GET_ITEM_1 - db $12,SFX_BATTLE_06 + db $12,SFX_CAUGHT_MON db $0E,SFX_POKEDEX_RATING db $0F,SFX_GET_ITEM_1 db $10,SFX_GET_ITEM_2 db $11,SFX_GET_KEY_ITEM - db $13,SFX_BATTLE_05 + db $13,SFX_DEX_PAGE_ADDED db $14,NIDORINA ; used in OakSpeech db $15,PIDGEOT ; used in SaffronCityText12 db $16,DEWGONG ; unused? diff --git a/macros.asm b/macros.asm index 659b0722..5223b9d8 100644 --- a/macros.asm +++ b/macros.asm @@ -66,15 +66,15 @@ jpab: MACRO ENDM bcd2: MACRO - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 10) % 10, (\1) % 10 - ENDM + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 10) % 10, (\1) % 10 + ENDM bcd3: MACRO - dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 - dn ((\1) / 1000) % 10, ((\1) / 100) % 10 - dn ((\1) / 10) % 10, (\1) % 10 - ENDM + dn ((\1) / 100000) % 10, ((\1) / 10000) % 10 + dn ((\1) / 1000) % 10, ((\1) / 100) % 10 + dn ((\1) / 10) % 10, (\1) % 10 + ENDM coins equs "bcd2" money equs "bcd3" @@ -263,7 +263,7 @@ NONE EQU $FF ;\7 trainers only: trainer class/pokemon id ;\8 trainers only: trainer number/pokemon level object: MACRO - db \1 + db \1 db \3 + 4 db \2 + 4 db \4 -- cgit v1.3.1-sl0p From 222afb247d592201dc228108232e3347c762db87 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Sun, 26 Jul 2015 17:04:24 -0400 Subject: tmlearn macro. Also multiple_divide documentation and fix improper wram comment. --- data/baseStats/abra.asm | 14 ++-- data/baseStats/aerodactyl.asm | 14 ++-- data/baseStats/alakazam.asm | 14 ++-- data/baseStats/arbok.asm | 14 ++-- data/baseStats/arcanine.asm | 14 ++-- data/baseStats/articuno.asm | 14 ++-- data/baseStats/beedrill.asm | 14 ++-- data/baseStats/bellsprout.asm | 14 ++-- data/baseStats/blastoise.asm | 14 ++-- data/baseStats/bulbasaur.asm | 14 ++-- data/baseStats/butterfree.asm | 16 ++-- data/baseStats/caterpie.asm | 15 ++-- data/baseStats/chansey.asm | 14 ++-- data/baseStats/charizard.asm | 16 ++-- data/baseStats/charmander.asm | 14 ++-- data/baseStats/charmeleon.asm | 14 ++-- data/baseStats/clefable.asm | 14 ++-- data/baseStats/clefairy.asm | 14 ++-- data/baseStats/cloyster.asm | 14 ++-- data/baseStats/cubone.asm | 14 ++-- data/baseStats/dewgong.asm | 14 ++-- data/baseStats/diglett.asm | 16 ++-- data/baseStats/ditto.asm | 15 ++-- data/baseStats/dodrio.asm | 14 ++-- data/baseStats/doduo.asm | 14 ++-- data/baseStats/dragonair.asm | 14 ++-- data/baseStats/dragonite.asm | 14 ++-- data/baseStats/dratini.asm | 14 ++-- data/baseStats/drowzee.asm | 14 ++-- data/baseStats/dugtrio.asm | 16 ++-- data/baseStats/eevee.asm | 14 ++-- data/baseStats/ekans.asm | 14 ++-- data/baseStats/electabuzz.asm | 14 ++-- data/baseStats/electrode.asm | 14 ++-- data/baseStats/exeggcute.asm | 14 ++-- data/baseStats/exeggutor.asm | 14 ++-- data/baseStats/farfetchd.asm | 14 ++-- data/baseStats/fearow.asm | 14 ++-- data/baseStats/flareon.asm | 14 ++-- data/baseStats/gastly.asm | 14 ++-- data/baseStats/gengar.asm | 14 ++-- data/baseStats/geodude.asm | 14 ++-- data/baseStats/gloom.asm | 14 ++-- data/baseStats/golbat.asm | 14 ++-- data/baseStats/goldeen.asm | 14 ++-- data/baseStats/golduck.asm | 14 ++-- data/baseStats/golem.asm | 14 ++-- data/baseStats/graveler.asm | 14 ++-- data/baseStats/grimer.asm | 14 ++-- data/baseStats/growlithe.asm | 14 ++-- data/baseStats/gyarados.asm | 14 ++-- data/baseStats/haunter.asm | 14 ++-- data/baseStats/hitmonchan.asm | 14 ++-- data/baseStats/hitmonlee.asm | 14 ++-- data/baseStats/horsea.asm | 14 ++-- data/baseStats/hypno.asm | 14 ++-- data/baseStats/ivysaur.asm | 14 ++-- data/baseStats/jigglypuff.asm | 14 ++-- data/baseStats/jolteon.asm | 14 ++-- data/baseStats/jynx.asm | 14 ++-- data/baseStats/kabuto.asm | 14 ++-- data/baseStats/kabutops.asm | 14 ++-- data/baseStats/kadabra.asm | 14 ++-- data/baseStats/kakuna.asm | 15 ++-- data/baseStats/kangaskhan.asm | 14 ++-- data/baseStats/kingler.asm | 14 ++-- data/baseStats/koffing.asm | 14 ++-- data/baseStats/krabby.asm | 14 ++-- data/baseStats/lapras.asm | 14 ++-- data/baseStats/lickitung.asm | 14 ++-- data/baseStats/machamp.asm | 14 ++-- data/baseStats/machoke.asm | 14 ++-- data/baseStats/machop.asm | 14 ++-- data/baseStats/magikarp.asm | 15 ++-- data/baseStats/magmar.asm | 14 ++-- data/baseStats/magnemite.asm | 14 ++-- data/baseStats/magneton.asm | 14 ++-- data/baseStats/mankey.asm | 14 ++-- data/baseStats/marowak.asm | 14 ++-- data/baseStats/meowth.asm | 14 ++-- data/baseStats/metapod.asm | 15 ++-- data/baseStats/mew.asm | 16 ++-- data/baseStats/mewtwo.asm | 14 ++-- data/baseStats/moltres.asm | 14 ++-- data/baseStats/mrmime.asm | 14 ++-- data/baseStats/muk.asm | 14 ++-- data/baseStats/nidoking.asm | 14 ++-- data/baseStats/nidoqueen.asm | 14 ++-- data/baseStats/nidoranf.asm | 14 ++-- data/baseStats/nidoranm.asm | 14 ++-- data/baseStats/nidorina.asm | 14 ++-- data/baseStats/nidorino.asm | 14 ++-- data/baseStats/ninetails.asm | 14 ++-- data/baseStats/oddish.asm | 14 ++-- data/baseStats/omanyte.asm | 14 ++-- data/baseStats/omastar.asm | 14 ++-- data/baseStats/onix.asm | 14 ++-- data/baseStats/paras.asm | 14 ++-- data/baseStats/parasect.asm | 14 ++-- data/baseStats/persian.asm | 14 ++-- data/baseStats/pidgeot.asm | 14 ++-- data/baseStats/pidgeotto.asm | 14 ++-- data/baseStats/pidgey.asm | 14 ++-- data/baseStats/pikachu.asm | 14 ++-- data/baseStats/pinsir.asm | 14 ++-- data/baseStats/poliwag.asm | 14 ++-- data/baseStats/poliwhirl.asm | 14 ++-- data/baseStats/poliwrath.asm | 14 ++-- data/baseStats/ponyta.asm | 14 ++-- data/baseStats/porygon.asm | 14 ++-- data/baseStats/primeape.asm | 14 ++-- data/baseStats/psyduck.asm | 14 ++-- data/baseStats/raichu.asm | 14 ++-- data/baseStats/rapidash.asm | 14 ++-- data/baseStats/raticate.asm | 14 ++-- data/baseStats/rattata.asm | 14 ++-- data/baseStats/rhydon.asm | 14 ++-- data/baseStats/rhyhorn.asm | 14 ++-- data/baseStats/sandshrew.asm | 14 ++-- data/baseStats/sandslash.asm | 14 ++-- data/baseStats/scyther.asm | 14 ++-- data/baseStats/seadra.asm | 14 ++-- data/baseStats/seaking.asm | 14 ++-- data/baseStats/seel.asm | 14 ++-- data/baseStats/shellder.asm | 14 ++-- data/baseStats/slowbro.asm | 14 ++-- data/baseStats/slowpoke.asm | 14 ++-- data/baseStats/snorlax.asm | 14 ++-- data/baseStats/spearow.asm | 14 ++-- data/baseStats/squirtle.asm | 14 ++-- data/baseStats/starmie.asm | 14 ++-- data/baseStats/staryu.asm | 14 ++-- data/baseStats/tangela.asm | 14 ++-- data/baseStats/tauros.asm | 14 ++-- data/baseStats/tentacool.asm | 14 ++-- data/baseStats/tentacruel.asm | 14 ++-- data/baseStats/vaporeon.asm | 14 ++-- data/baseStats/venomoth.asm | 14 ++-- data/baseStats/venonat.asm | 23 +++--- data/baseStats/venusaur.asm | 14 ++-- data/baseStats/victreebel.asm | 14 ++-- data/baseStats/vileplume.asm | 14 ++-- data/baseStats/voltorb.asm | 14 ++-- data/baseStats/vulpix.asm | 14 ++-- data/baseStats/wartortle.asm | 14 ++-- data/baseStats/weedle.asm | 15 ++-- data/baseStats/weepinbell.asm | 14 ++-- data/baseStats/weezing.asm | 14 ++-- data/baseStats/wigglytuff.asm | 14 ++-- data/baseStats/zapdos.asm | 14 ++-- data/baseStats/zubat.asm | 14 ++-- engine/multiply_divide.asm | 176 +++++++++++++++++++++--------------------- hram.asm | 4 + macros.asm | 60 ++++++++++++++ wram.asm | 2 +- 155 files changed, 1225 insertions(+), 1156 deletions(-) (limited to 'macros.asm') diff --git a/data/baseStats/abra.asm b/data/baseStats/abra.asm index 80ee9e06..bb5b15e5 100755 --- a/data/baseStats/abra.asm +++ b/data/baseStats/abra.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11110000 -db %10000111 -db %00111000 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/aerodactyl.asm b/data/baseStats/aerodactyl.asm index 75067ad3..949d39dc 100755 --- a/data/baseStats/aerodactyl.asm +++ b/data/baseStats/aerodactyl.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01000011 -db %01001000 -db %11000000 -db %01100011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,23 + tmlearn 31,32 + tmlearn 33,34,38,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/alakazam.asm b/data/baseStats/alakazam.asm index 2ee79e6f..f61e5a48 100755 --- a/data/baseStats/alakazam.asm +++ b/data/baseStats/alakazam.asm @@ -24,11 +24,11 @@ ENDC db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11111000 -db %10000111 -db %00111000 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 28,29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/arbok.asm b/data/baseStats/arbok.asm index bddcab5b..34a73933 100755 --- a/data/baseStats/arbok.asm +++ b/data/baseStats/arbok.asm @@ -19,11 +19,11 @@ db POISON_STING db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00011000 -db %11001110 -db %10000010 -db %10001000 -db %00100010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20,21 + tmlearn 26,27,28,31,32 + tmlearn 34,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/arcanine.asm b/data/baseStats/arcanine.asm index 065edb6d..4d4e8f77 100755 --- a/data/baseStats/arcanine.asm +++ b/data/baseStats/arcanine.asm @@ -19,11 +19,11 @@ db LEER db TAKE_DOWN db 5 ; growth rate ; learnset -db %10100000 -db %01000011 -db %01001000 -db %11101000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20,23 + tmlearn 28,30,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/articuno.asm b/data/baseStats/articuno.asm index 811bb884..31c328ed 100755 --- a/data/baseStats/articuno.asm +++ b/data/baseStats/articuno.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01111111 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/beedrill.asm b/data/baseStats/beedrill.asm index 9381a63a..b3c85f3d 100755 --- a/data/baseStats/beedrill.asm +++ b/data/baseStats/beedrill.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100100 -db %01000011 -db %00011000 -db %11000000 -db %11000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10,15 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/bellsprout.asm b/data/baseStats/bellsprout.asm index e8b7d97a..d6297826 100755 --- a/data/baseStats/bellsprout.asm +++ b/data/baseStats/bellsprout.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/blastoise.asm b/data/baseStats/blastoise.asm index 1ab81327..e5ccd2db 100755 --- a/data/baseStats/blastoise.asm +++ b/data/baseStats/blastoise.asm @@ -19,11 +19,11 @@ db BUBBLE db WATER_GUN db 3 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11001110 -db %10000011 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/bulbasaur.asm b/data/baseStats/bulbasaur.asm index 5bf8a184..261b28ee 100755 --- a/data/baseStats/bulbasaur.asm +++ b/data/baseStats/bulbasaur.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/butterfree.asm b/data/baseStats/butterfree.asm index 593d5f78..748b826b 100755 --- a/data/baseStats/butterfree.asm +++ b/data/baseStats/butterfree.asm @@ -19,15 +19,15 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00111000 -db %11110000 -db %01000011 -db %00101000 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 29,30,31,32 + tmlearn 33,34,39 + tmlearn 44,46 IF DEF(_YELLOW) - db %01000010 + tmlearn 49,54 ELSE - db %00000010 + tmlearn 49 ENDC db 0 ; padding diff --git a/data/baseStats/caterpie.asm b/data/baseStats/caterpie.asm index 0dab990b..22e613ec 100755 --- a/data/baseStats/caterpie.asm +++ b/data/baseStats/caterpie.asm @@ -19,11 +19,12 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding +b 0 ; padding diff --git a/data/baseStats/chansey.asm b/data/baseStats/chansey.asm index 130a3d00..a830ae1e 100755 --- a/data/baseStats/chansey.asm +++ b/data/baseStats/chansey.asm @@ -23,11 +23,11 @@ db 0 db 0 db 4 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10101111 -db %11110001 -db %10110111 -db %00111001 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,37,38,40 + tmlearn 41,44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/charizard.asm b/data/baseStats/charizard.asm index 5cbecb91..b8c684b3 100755 --- a/data/baseStats/charizard.asm +++ b/data/baseStats/charizard.asm @@ -19,15 +19,15 @@ db EMBER db LEER db 3 ; growth rate ; learnset -db %10110101 -db %01000011 -db %01001111 -db %11001110 -db %11100011 -db %00001000 + tmlearn 1,3,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,23 + tmlearn 26,27,28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 IF DEF(_YELLOW) - db %00101110 + tmlearn 49,50,51,53 ELSE - db %00100110 + tmlearn 49,50,53 ENDC db 0 ; padding diff --git a/data/baseStats/charmander.asm b/data/baseStats/charmander.asm index c9deed08..936befa4 100755 --- a/data/baseStats/charmander.asm +++ b/data/baseStats/charmander.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110101 -db %00000011 -db %01001111 -db %11001000 -db %11100011 -db %00001000 -db %00100110 + tmlearn 1,3,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20,23 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/charmeleon.asm b/data/baseStats/charmeleon.asm index 6b2b9ba9..8e2675f0 100755 --- a/data/baseStats/charmeleon.asm +++ b/data/baseStats/charmeleon.asm @@ -19,11 +19,11 @@ db EMBER db 0 db 3 ; growth rate ; learnset -db %10110101 -db %00000011 -db %01001111 -db %11001000 -db %11100011 -db %00001000 -db %00100110 + tmlearn 1,3,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20,23 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/clefable.asm b/data/baseStats/clefable.asm index 8fee3ec6..e26f1445 100755 --- a/data/baseStats/clefable.asm +++ b/data/baseStats/clefable.asm @@ -19,11 +19,11 @@ db MINIMIZE db METRONOME db 4 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10101111 -db %11110001 -db %10100111 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/clefairy.asm b/data/baseStats/clefairy.asm index bea2ffec..cc47df10 100755 --- a/data/baseStats/clefairy.asm +++ b/data/baseStats/clefairy.asm @@ -19,11 +19,11 @@ db 0 db 0 db 4 ; growth rate ; learnset -db %10110001 -db %00111111 -db %10101111 -db %11110001 -db %10100111 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/cloyster.asm b/data/baseStats/cloyster.asm index d57b651a..aa09d48a 100755 --- a/data/baseStats/cloyster.asm +++ b/data/baseStats/cloyster.asm @@ -19,11 +19,11 @@ db CLAMP db AURORA_BEAM db 5 ; growth rate ; learnset -db %00100000 -db %01111111 -db %00001000 -db %11100000 -db %01001011 -db %01001000 -db %00010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 30,31,32 + tmlearn 33,34,36,39 + tmlearn 44,47 + tmlearn 49,50,53 db 0 ; padding diff --git a/data/baseStats/cubone.asm b/data/baseStats/cubone.asm index 42bb717c..74584844 100755 --- a/data/baseStats/cubone.asm +++ b/data/baseStats/cubone.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11001110 -db %10100010 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/dewgong.asm b/data/baseStats/dewgong.asm index 5246189e..e7efc42b 100755 --- a/data/baseStats/dewgong.asm +++ b/data/baseStats/dewgong.asm @@ -19,11 +19,11 @@ db AURORA_BEAM db 0 db 0 ; growth rate ; learnset -db %11100000 -db %11111111 -db %00001000 -db %11000000 -db %10000010 -db %00001000 -db %00110010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/diglett.asm b/data/baseStats/diglett.asm index 4944572b..b4e803bf 100755 --- a/data/baseStats/diglett.asm +++ b/data/baseStats/diglett.asm @@ -19,15 +19,15 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11001110 -db %00000010 -db %10001000 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 26,27,28,31,32 + tmlearn 34 + tmlearn 44,48 IF DEF(_YELLOW) - db %00000110 + tmlearn 49,50 ELSE - db %00000010 + tmlearn 49 ENDC db 0 ; padding diff --git a/data/baseStats/ditto.asm b/data/baseStats/ditto.asm index 0a35bf55..b40e4b17 100755 --- a/data/baseStats/ditto.asm +++ b/data/baseStats/ditto.asm @@ -19,11 +19,12 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding +b 0 ; padding diff --git a/data/baseStats/dodrio.asm b/data/baseStats/dodrio.asm index b872ba47..025204fb 100755 --- a/data/baseStats/dodrio.asm +++ b/data/baseStats/dodrio.asm @@ -19,11 +19,11 @@ db FURY_ATTACK db 0 db 0 ; growth rate ; learnset -db %10101000 -db %01000011 -db %00001000 -db %11000000 -db %10000011 -db %00001100 -db %00001011 + tmlearn 4,6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 43,44 + tmlearn 49,50,52 db 0 ; padding diff --git a/data/baseStats/doduo.asm b/data/baseStats/doduo.asm index 8070ba33..091152dd 100755 --- a/data/baseStats/doduo.asm +++ b/data/baseStats/doduo.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10101000 -db %00000011 -db %00001000 -db %11000000 -db %10000011 -db %00001100 -db %00001011 + tmlearn 4,6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 43,44 + tmlearn 49,50,52 db 0 ; padding diff --git a/data/baseStats/dragonair.asm b/data/baseStats/dragonair.asm index 89ff2eef..b8f0a606 100755 --- a/data/baseStats/dragonair.asm +++ b/data/baseStats/dragonair.asm @@ -19,11 +19,11 @@ db THUNDER_WAVE db 0 db 5 ; growth rate ; learnset -db %11100000 -db %00111111 -db %11001000 -db %11000001 -db %11100011 -db %00011000 -db %00010010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/dragonite.asm b/data/baseStats/dragonite.asm index 3699955b..1000e384 100755 --- a/data/baseStats/dragonite.asm +++ b/data/baseStats/dragonite.asm @@ -19,11 +19,11 @@ db THUNDER_WAVE db AGILITY db 5 ; growth rate ; learnset -db %11100010 -db %01111111 -db %11001000 -db %11000001 -db %11100011 -db %00011000 -db %00110010 + tmlearn 2,6,7,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/dratini.asm b/data/baseStats/dratini.asm index 4837e4a5..37ed8f09 100755 --- a/data/baseStats/dratini.asm +++ b/data/baseStats/dratini.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %10100000 -db %00111111 -db %11001000 -db %11000001 -db %11100011 -db %00011000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/drowzee.asm b/data/baseStats/drowzee.asm index dfa591bd..6397eeaf 100755 --- a/data/baseStats/drowzee.asm +++ b/data/baseStats/drowzee.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11110000 -db %10000111 -db %00111010 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 42,44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/dugtrio.asm b/data/baseStats/dugtrio.asm index 0c4bad3b..4b4d9d8b 100755 --- a/data/baseStats/dugtrio.asm +++ b/data/baseStats/dugtrio.asm @@ -19,15 +19,15 @@ db DIG db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00001000 -db %11001110 -db %00000010 -db %10001000 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 26,27,28,31,32 + tmlearn 34 + tmlearn 44,48 IF DEF(_YELLOW) - db %00000110 + tmlearn 49,50 ELSE - db %00000010 + tmlearn 49 ENDC db 0 ; padding diff --git a/data/baseStats/eevee.asm b/data/baseStats/eevee.asm index 978aa4bb..2c2114fb 100755 --- a/data/baseStats/eevee.asm +++ b/data/baseStats/eevee.asm @@ -23,11 +23,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11000000 -db %11000011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/ekans.asm b/data/baseStats/ekans.asm index 79dbcbf5..26e75eeb 100755 --- a/data/baseStats/ekans.asm +++ b/data/baseStats/ekans.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00011000 -db %11001110 -db %10000010 -db %10001000 -db %00100010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20,21 + tmlearn 26,27,28,31,32 + tmlearn 34,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/electabuzz.asm b/data/baseStats/electabuzz.asm index ac692436..5dc76c37 100755 --- a/data/baseStats/electabuzz.asm +++ b/data/baseStats/electabuzz.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %10001111 -db %11110001 -db %11000111 -db %00111000 -db %01100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,39,40 + tmlearn 44,45,46 + tmlearn 50,54,55 db 0 ; padding diff --git a/data/baseStats/electrode.asm b/data/baseStats/electrode.asm index 7ce93e8d..dc9da8d3 100755 --- a/data/baseStats/electrode.asm +++ b/data/baseStats/electrode.asm @@ -19,11 +19,11 @@ db SONICBOOM db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01000001 -db %10001000 -db %11100001 -db %11001011 -db %01011000 -db %01000010 + tmlearn 6 + tmlearn 9,15 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,36,39,40 + tmlearn 44,45,47 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/exeggcute.asm b/data/baseStats/exeggcute.asm index ded05789..4c77db2a 100755 --- a/data/baseStats/exeggcute.asm +++ b/data/baseStats/exeggcute.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %00000011 -db %00001000 -db %11110000 -db %00011011 -db %01101000 -db %00000010 + tmlearn 6 + tmlearn 9,10 + tmlearn 20 + tmlearn 29,30,31,32 + tmlearn 33,34,36,37 + tmlearn 44,46,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/exeggutor.asm b/data/baseStats/exeggutor.asm index e28fb8c8..f67857e2 100755 --- a/data/baseStats/exeggutor.asm +++ b/data/baseStats/exeggutor.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %01000011 -db %00111000 -db %11110000 -db %00011011 -db %01101000 -db %00100010 + tmlearn 6 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 29,30,31,32 + tmlearn 33,34,36,37 + tmlearn 44,46,47 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/farfetchd.asm b/data/baseStats/farfetchd.asm index 51648c46..015e9ff8 100755 --- a/data/baseStats/farfetchd.asm +++ b/data/baseStats/farfetchd.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10101110 -db %00000011 -db %00001000 -db %11000000 -db %11000011 -db %00001000 -db %00001110 + tmlearn 2,3,4,6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50,51,52 db 0 ; padding diff --git a/data/baseStats/fearow.asm b/data/baseStats/fearow.asm index 0a5d0c48..8d3059db 100755 --- a/data/baseStats/fearow.asm +++ b/data/baseStats/fearow.asm @@ -19,11 +19,11 @@ db LEER db 0 db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00001000 -db %11000000 -db %01000010 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/flareon.asm b/data/baseStats/flareon.asm index ce4a8f0a..48c4b702 100755 --- a/data/baseStats/flareon.asm +++ b/data/baseStats/flareon.asm @@ -23,11 +23,11 @@ db QUICK_ATTACK db EMBER db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00001000 -db %11000000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/gastly.asm b/data/baseStats/gastly.asm index ca6c2285..c6e69bd2 100755 --- a/data/baseStats/gastly.asm +++ b/data/baseStats/gastly.asm @@ -19,11 +19,11 @@ db NIGHT_SHADE db 0 db 3 ; growth rate ; learnset -db %00100000 -db %00000000 -db %10011000 -db %11010001 -db %00001010 -db %01101010 -db %00000010 + tmlearn 6 + tmlearn 0 + tmlearn 20,21,24 + tmlearn 25,29,31,32 + tmlearn 34,36 + tmlearn 42,44,46,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/gengar.asm b/data/baseStats/gengar.asm index a5881476..910903d0 100755 --- a/data/baseStats/gengar.asm +++ b/data/baseStats/gengar.asm @@ -19,11 +19,11 @@ db NIGHT_SHADE db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %10011111 -db %11010001 -db %10001110 -db %01101010 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,21,24 + tmlearn 25,29,31,32 + tmlearn 34,35,36,40 + tmlearn 42,44,46,47 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/geodude.asm b/data/baseStats/geodude.asm index 52d3553d..e185e3c0 100755 --- a/data/baseStats/geodude.asm +++ b/data/baseStats/geodude.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100001 -db %00000011 -db %00001111 -db %11001110 -db %00101110 -db %11001000 -db %00100010 + tmlearn 1,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,36,38 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/gloom.asm b/data/baseStats/gloom.asm index e2c854d4..efee0dae 100755 --- a/data/baseStats/gloom.asm +++ b/data/baseStats/gloom.asm @@ -19,11 +19,11 @@ db STUN_SPORE db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/golbat.asm b/data/baseStats/golbat.asm index d89dcb1e..e6a22f70 100755 --- a/data/baseStats/golbat.asm +++ b/data/baseStats/golbat.asm @@ -19,11 +19,11 @@ db BITE db 0 db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00011000 -db %11000000 -db %01000010 -db %00001000 -db %00000010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/goldeen.asm b/data/baseStats/goldeen.asm index 17afd3c2..36cf0d96 100755 --- a/data/baseStats/goldeen.asm +++ b/data/baseStats/goldeen.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %01100000 -db %00111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6,7 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/golduck.asm b/data/baseStats/golduck.asm index f3797f73..e063ae47 100755 --- a/data/baseStats/golduck.asm +++ b/data/baseStats/golduck.asm @@ -19,11 +19,11 @@ db DISABLE db 0 db 0 ; growth rate ; learnset -db %10110001 -db %11111111 -db %00001111 -db %11001000 -db %11000010 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/golem.asm b/data/baseStats/golem.asm index deebb1d1..1308bc78 100755 --- a/data/baseStats/golem.asm +++ b/data/baseStats/golem.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11001110 -db %00101110 -db %11001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,36,38 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/graveler.asm b/data/baseStats/graveler.asm index 586afc2c..8cc740dd 100755 --- a/data/baseStats/graveler.asm +++ b/data/baseStats/graveler.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100001 -db %00000011 -db %00001111 -db %11001110 -db %00101110 -db %11001000 -db %00100010 + tmlearn 1,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,36,38 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/grimer.asm b/data/baseStats/grimer.asm index dd17fb05..55aedc95 100755 --- a/data/baseStats/grimer.asm +++ b/data/baseStats/grimer.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000000 -db %10011000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6,8 + tmlearn 0 + tmlearn 20,21,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/growlithe.asm b/data/baseStats/growlithe.asm index ec48b605..cc4d1ff7 100755 --- a/data/baseStats/growlithe.asm +++ b/data/baseStats/growlithe.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %10100000 -db %00000011 -db %01001000 -db %11001000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20,23 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/gyarados.asm b/data/baseStats/gyarados.asm index c9e6dc31..1b374f08 100755 --- a/data/baseStats/gyarados.asm +++ b/data/baseStats/gyarados.asm @@ -26,11 +26,11 @@ db HYDRO_PUMP ENDC db 5 ; growth rate ; learnset -db %10100000 -db %01111111 -db %11001000 -db %11000001 -db %10100011 -db %00001000 -db %00110010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,23,24 + tmlearn 25,31,32 + tmlearn 33,34,38,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/haunter.asm b/data/baseStats/haunter.asm index 6ac7db99..a530108a 100755 --- a/data/baseStats/haunter.asm +++ b/data/baseStats/haunter.asm @@ -19,11 +19,11 @@ db NIGHT_SHADE db 0 db 3 ; growth rate ; learnset -db %00100000 -db %00000000 -db %10011000 -db %11010001 -db %00001010 -db %01101010 -db %00000010 + tmlearn 6 + tmlearn 0 + tmlearn 20,21,24 + tmlearn 25,29,31,32 + tmlearn 34,36 + tmlearn 42,44,46,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/hitmonchan.asm b/data/baseStats/hitmonchan.asm index 9cb0d566..4a717248 100755 --- a/data/baseStats/hitmonchan.asm +++ b/data/baseStats/hitmonchan.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11000000 -db %11000110 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 31,32 + tmlearn 34,35,39,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/hitmonlee.asm b/data/baseStats/hitmonlee.asm index 126f528b..e25bb725 100755 --- a/data/baseStats/hitmonlee.asm +++ b/data/baseStats/hitmonlee.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11000000 -db %11000110 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 31,32 + tmlearn 34,35,39,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/horsea.asm b/data/baseStats/horsea.asm index f59bee0c..b754f425 100755 --- a/data/baseStats/horsea.asm +++ b/data/baseStats/horsea.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/hypno.asm b/data/baseStats/hypno.asm index 022e3134..3ba1ad30 100755 --- a/data/baseStats/hypno.asm +++ b/data/baseStats/hypno.asm @@ -19,11 +19,11 @@ db DISABLE db CONFUSION db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11110000 -db %10000111 -db %00111010 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 42,44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/ivysaur.asm b/data/baseStats/ivysaur.asm index 78aec210..9672935e 100755 --- a/data/baseStats/ivysaur.asm +++ b/data/baseStats/ivysaur.asm @@ -19,11 +19,11 @@ db LEECH_SEED db 0 db 3 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/jigglypuff.asm b/data/baseStats/jigglypuff.asm index 0252880f..5111e9c8 100755 --- a/data/baseStats/jigglypuff.asm +++ b/data/baseStats/jigglypuff.asm @@ -19,11 +19,11 @@ db 0 db 0 db 4 ; growth rate ; learnset -db %10110001 -db %00111111 -db %10101111 -db %11110001 -db %10100011 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/jolteon.asm b/data/baseStats/jolteon.asm index 5dc3532a..8ade6544 100755 --- a/data/baseStats/jolteon.asm +++ b/data/baseStats/jolteon.asm @@ -23,11 +23,11 @@ db QUICK_ATTACK db THUNDERSHOCK db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %10001000 -db %11000001 -db %11000011 -db %00011000 -db %01000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/jynx.asm b/data/baseStats/jynx.asm index 6299f545..82778775 100755 --- a/data/baseStats/jynx.asm +++ b/data/baseStats/jynx.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11110000 -db %10000111 -db %00101000 -db %00000010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,46 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/kabuto.asm b/data/baseStats/kabuto.asm index 8a9899c7..1fde7156 100755 --- a/data/baseStats/kabuto.asm +++ b/data/baseStats/kabuto.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00111111 -db %00001000 -db %11000000 -db %00000011 -db %00001000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/kabutops.asm b/data/baseStats/kabutops.asm index 7c80a8c0..170fee9b 100755 --- a/data/baseStats/kabutops.asm +++ b/data/baseStats/kabutops.asm @@ -19,11 +19,11 @@ db ABSORB db 0 db 0 ; growth rate ; learnset -db %10110110 -db %01111111 -db %00001101 -db %11000000 -db %10000011 -db %00001000 -db %00010010 + tmlearn 2,3,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,19,20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/kadabra.asm b/data/baseStats/kadabra.asm index 85ee8a35..5fa0e466 100755 --- a/data/baseStats/kadabra.asm +++ b/data/baseStats/kadabra.asm @@ -24,11 +24,11 @@ ENDC db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11111000 -db %10000111 -db %00111000 -db %01000011 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 28,29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/kakuna.asm b/data/baseStats/kakuna.asm index 62e9c225..c6b90ed8 100755 --- a/data/baseStats/kakuna.asm +++ b/data/baseStats/kakuna.asm @@ -19,11 +19,12 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding +b 0 ; padding diff --git a/data/baseStats/kangaskhan.asm b/data/baseStats/kangaskhan.asm index 3d30b78a..a17cb653 100755 --- a/data/baseStats/kangaskhan.asm +++ b/data/baseStats/kangaskhan.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10001111 -db %11000111 -db %10100010 -db %10001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/kingler.asm b/data/baseStats/kingler.asm index 8a5b0f98..7604bf80 100755 --- a/data/baseStats/kingler.asm +++ b/data/baseStats/kingler.asm @@ -19,11 +19,11 @@ db VICEGRIP db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01111111 -db %00001000 -db %11000000 -db %00000010 -db %00001000 -db %00110110 + tmlearn 3,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34 + tmlearn 44 + tmlearn 50,51,53,54 db 0 ; padding diff --git a/data/baseStats/koffing.asm b/data/baseStats/koffing.asm index d50e5bcf..24f47d17 100755 --- a/data/baseStats/koffing.asm +++ b/data/baseStats/koffing.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000000 -db %10001000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6 + tmlearn 0 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/krabby.asm b/data/baseStats/krabby.asm index 37bbaa0b..3d901041 100755 --- a/data/baseStats/krabby.asm +++ b/data/baseStats/krabby.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %00111111 -db %00001000 -db %11000000 -db %00000010 -db %00001000 -db %00110110 + tmlearn 3,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 34 + tmlearn 44 + tmlearn 50,51,53,54 db 0 ; padding diff --git a/data/baseStats/lapras.asm b/data/baseStats/lapras.asm index cd4ea5b1..71555c5e 100755 --- a/data/baseStats/lapras.asm +++ b/data/baseStats/lapras.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %11100000 -db %01111111 -db %11101000 -db %11010001 -db %10000011 -db %00101000 -db %00110010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,22,23,24 + tmlearn 25,29,31,32 + tmlearn 33,34,40 + tmlearn 44,46 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/lickitung.asm b/data/baseStats/lickitung.asm index 8ada934e..eec9d2f3 100755 --- a/data/baseStats/lickitung.asm +++ b/data/baseStats/lickitung.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110101 -db %01111111 -db %10001111 -db %11000111 -db %10100010 -db %00001000 -db %00110110 + tmlearn 1,3,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,51,53,54 db 0 ; padding diff --git a/data/baseStats/machamp.asm b/data/baseStats/machamp.asm index 1c10c96e..c9ca26dd 100755 --- a/data/baseStats/machamp.asm +++ b/data/baseStats/machamp.asm @@ -19,11 +19,11 @@ db LEER db 0 db 3 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11001110 -db %10100110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/machoke.asm b/data/baseStats/machoke.asm index 7b491641..6e2a977e 100755 --- a/data/baseStats/machoke.asm +++ b/data/baseStats/machoke.asm @@ -19,11 +19,11 @@ db LEER db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11001110 -db %10100110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/machop.asm b/data/baseStats/machop.asm index c951163f..6e9f5ca0 100755 --- a/data/baseStats/machop.asm +++ b/data/baseStats/machop.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00000011 -db %00001111 -db %11001110 -db %10100110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,35,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/magikarp.asm b/data/baseStats/magikarp.asm index 606bf755..b5f6018b 100755 --- a/data/baseStats/magikarp.asm +++ b/data/baseStats/magikarp.asm @@ -19,11 +19,12 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding +b 0 ; padding diff --git a/data/baseStats/magmar.asm b/data/baseStats/magmar.asm index a360fe9d..781c9edc 100755 --- a/data/baseStats/magmar.asm +++ b/data/baseStats/magmar.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %00001111 -db %11110000 -db %10100110 -db %00101000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20 + tmlearn 29,30,31,32 + tmlearn 34,35,38,40 + tmlearn 44,46 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/magnemite.asm b/data/baseStats/magnemite.asm index 166e2fb0..79f84923 100755 --- a/data/baseStats/magnemite.asm +++ b/data/baseStats/magnemite.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000011 -db %10001000 -db %11100001 -db %01000011 -db %00011000 -db %01000010 + tmlearn 6 + tmlearn 9,10 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,39 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/magneton.asm b/data/baseStats/magneton.asm index 92ae9760..c8606619 100755 --- a/data/baseStats/magneton.asm +++ b/data/baseStats/magneton.asm @@ -19,11 +19,11 @@ db THUNDERSHOCK db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01000011 -db %10001000 -db %11100001 -db %01000011 -db %00011000 -db %01000010 + tmlearn 6 + tmlearn 9,10,15 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,39 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/mankey.asm b/data/baseStats/mankey.asm index 13e77c5c..759fe599 100755 --- a/data/baseStats/mankey.asm +++ b/data/baseStats/mankey.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %10000011 -db %10001111 -db %11001001 -db %11000110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,16 + tmlearn 17,18,19,20,24 + tmlearn 25,28,31,32 + tmlearn 34,35,39,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/marowak.asm b/data/baseStats/marowak.asm index 64bfb0d6..714a45d9 100755 --- a/data/baseStats/marowak.asm +++ b/data/baseStats/marowak.asm @@ -25,11 +25,11 @@ ELSE ENDC db 0 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11001110 -db %10100010 -db %00001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/meowth.asm b/data/baseStats/meowth.asm index dc404d20..14f82ca4 100755 --- a/data/baseStats/meowth.asm +++ b/data/baseStats/meowth.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %10001111 -db %10001000 -db %11000001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,16 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/metapod.asm b/data/baseStats/metapod.asm index 71a2be28..1e773a0f 100755 --- a/data/baseStats/metapod.asm +++ b/data/baseStats/metapod.asm @@ -19,11 +19,12 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding +b 0 ; padding diff --git a/data/baseStats/mew.asm b/data/baseStats/mew.asm index 16634430..1af20fa4 100755 --- a/data/baseStats/mew.asm +++ b/data/baseStats/mew.asm @@ -18,12 +18,12 @@ db 0 db 0 db 0 db 3 ; growth rate -; include learnset directly -db %11111111 -db %11111111 -db %11111111 -db %11111111 -db %11111111 -db %11111111 -db %11111111 +; learnset + tmlearn 1,2,3,4,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,21,22,23,24 + tmlearn 25,26,27,28,29,30,31,32 + tmlearn 33,34,35,36,37,38,39,40 + tmlearn 41,42,43,44,45,46,47,48 + tmlearn 49,50,51,52,53,54,55,56 db %11111111 ; usually spacing diff --git a/data/baseStats/mewtwo.asm b/data/baseStats/mewtwo.asm index 29b0b61b..95127645 100755 --- a/data/baseStats/mewtwo.asm +++ b/data/baseStats/mewtwo.asm @@ -19,11 +19,11 @@ db SWIFT db PSYCHIC_M db 5 ; growth rate ; learnset -db %10110001 -db %11111111 -db %10101111 -db %11110001 -db %10101111 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,36,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/moltres.asm b/data/baseStats/moltres.asm index eeeb5367..646d9a49 100755 --- a/data/baseStats/moltres.asm +++ b/data/baseStats/moltres.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00001000 -db %11000000 -db %01100011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/mrmime.asm b/data/baseStats/mrmime.asm index 93a6fcf7..3182eca0 100755 --- a/data/baseStats/mrmime.asm +++ b/data/baseStats/mrmime.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %01000011 -db %10101111 -db %11110001 -db %10000111 -db %00111000 -db %01000010 + tmlearn 1,5,6,8 + tmlearn 9,10,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,35,40 + tmlearn 44,45,46 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/muk.asm b/data/baseStats/muk.asm index 465c6012..7ef711c3 100755 --- a/data/baseStats/muk.asm +++ b/data/baseStats/muk.asm @@ -19,11 +19,11 @@ db POISON_GAS db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01000000 -db %10011000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6,8 + tmlearn 15 + tmlearn 20,21,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidoking.asm b/data/baseStats/nidoking.asm index c283821b..8802f52a 100755 --- a/data/baseStats/nidoking.asm +++ b/data/baseStats/nidoking.asm @@ -19,11 +19,11 @@ db POISON_STING db THRASH db 3 ; growth rate ; learnset -db %11110001 -db %11111111 -db %10001111 -db %11000111 -db %10100011 -db %10001000 -db %00110010 + tmlearn 1,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 33,34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/nidoqueen.asm b/data/baseStats/nidoqueen.asm index 5f3f91a3..5e6ab97b 100755 --- a/data/baseStats/nidoqueen.asm +++ b/data/baseStats/nidoqueen.asm @@ -19,11 +19,11 @@ db TAIL_WHIP db BODY_SLAM db 3 ; growth rate ; learnset -db %11110001 -db %11111111 -db %10001111 -db %11000111 -db %10100011 -db %10001000 -db %00110010 + tmlearn 1,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,31,32 + tmlearn 33,34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/nidoranf.asm b/data/baseStats/nidoranf.asm index 24caa7ab..c3f9a6e3 100755 --- a/data/baseStats/nidoranf.asm +++ b/data/baseStats/nidoranf.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100000 -db %00100011 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidoranm.asm b/data/baseStats/nidoranm.asm index 1b33b61c..14e9bc9f 100755 --- a/data/baseStats/nidoranm.asm +++ b/data/baseStats/nidoranm.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %11100000 -db %00100011 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidorina.asm b/data/baseStats/nidorina.asm index b2ab3ce8..902286c5 100755 --- a/data/baseStats/nidorina.asm +++ b/data/baseStats/nidorina.asm @@ -19,11 +19,11 @@ db SCRATCH db 0 db 3 ; growth rate ; learnset -db %11100000 -db %00111111 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/nidorino.asm b/data/baseStats/nidorino.asm index 06957afd..db5844a9 100755 --- a/data/baseStats/nidorino.asm +++ b/data/baseStats/nidorino.asm @@ -19,11 +19,11 @@ db HORN_ATTACK db 0 db 3 ; growth rate ; learnset -db %11100000 -db %00111111 -db %10001000 -db %11000001 -db %10000011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetails.asm index 8141b627..f5339b35 100755 --- a/data/baseStats/ninetails.asm +++ b/data/baseStats/ninetails.asm @@ -19,11 +19,11 @@ db QUICK_ATTACK db ROAR db 0 ; growth rate ; learnset -db %10100000 -db %01000011 -db %00001000 -db %11001000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/oddish.asm b/data/baseStats/oddish.asm index 31e376a6..895ccbe1 100755 --- a/data/baseStats/oddish.asm +++ b/data/baseStats/oddish.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/omanyte.asm b/data/baseStats/omanyte.asm index d4b5f534..9246a325 100755 --- a/data/baseStats/omanyte.asm +++ b/data/baseStats/omanyte.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00111111 -db %00001000 -db %11000000 -db %00000011 -db %00001000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/omastar.asm b/data/baseStats/omastar.asm index f39c8f2d..17b45efe 100755 --- a/data/baseStats/omastar.asm +++ b/data/baseStats/omastar.asm @@ -19,11 +19,11 @@ db HORN_ATTACK db 0 db 0 ; growth rate ; learnset -db %11100000 -db %01111111 -db %00001101 -db %11000000 -db %10000011 -db %00001000 -db %00010010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,19,20 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/onix.asm b/data/baseStats/onix.asm index ce4375f7..4f2f8e6b 100755 --- a/data/baseStats/onix.asm +++ b/data/baseStats/onix.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11001110 -db %10001010 -db %11001000 -db %00100010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 26,27,28,31,32 + tmlearn 34,36,40 + tmlearn 44,47,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/paras.asm b/data/baseStats/paras.asm index c1f9dbdd..daf1aaa9 100755 --- a/data/baseStats/paras.asm +++ b/data/baseStats/paras.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00111000 -db %11001000 -db %10000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/parasect.asm b/data/baseStats/parasect.asm index e53fec0e..cacf8e4b 100755 --- a/data/baseStats/parasect.asm +++ b/data/baseStats/parasect.asm @@ -19,11 +19,11 @@ db LEECH_LIFE db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11001000 -db %10000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/persian.asm b/data/baseStats/persian.asm index c72ac802..69429830 100755 --- a/data/baseStats/persian.asm +++ b/data/baseStats/persian.asm @@ -19,11 +19,11 @@ db BITE db SCREECH db 0 ; growth rate ; learnset -db %10100000 -db %11001111 -db %10001000 -db %11000001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,15,16 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/pidgeot.asm b/data/baseStats/pidgeot.asm index 47fafc3e..19c9f2b4 100755 --- a/data/baseStats/pidgeot.asm +++ b/data/baseStats/pidgeot.asm @@ -19,11 +19,11 @@ db QUICK_ATTACK db 0 db 3 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/pidgeotto.asm b/data/baseStats/pidgeotto.asm index c996b671..96a58cc3 100755 --- a/data/baseStats/pidgeotto.asm +++ b/data/baseStats/pidgeotto.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/pidgey.asm b/data/baseStats/pidgey.asm index 21259582..6d5e238d 100755 --- a/data/baseStats/pidgey.asm +++ b/data/baseStats/pidgey.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00001000 -db %11000000 -db %01000011 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/pikachu.asm b/data/baseStats/pikachu.asm index f3b224c8..1cd96200 100755 --- a/data/baseStats/pikachu.asm +++ b/data/baseStats/pikachu.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %10000011 -db %10001101 -db %11000001 -db %11000011 -db %00011000 -db %01000010 + tmlearn 1,5,6,8 + tmlearn 9,10,16 + tmlearn 17,19,20,24 + tmlearn 25,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/pinsir.asm b/data/baseStats/pinsir.asm index d9c73ea0..8f36d87d 100755 --- a/data/baseStats/pinsir.asm +++ b/data/baseStats/pinsir.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00001101 -db %11000000 -db %00000010 -db %00001000 -db %00100110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 17,19,20 + tmlearn 31,32 + tmlearn 34 + tmlearn 44 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/poliwag.asm b/data/baseStats/poliwag.asm index 6be8587d..7df20056 100755 --- a/data/baseStats/poliwag.asm +++ b/data/baseStats/poliwag.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10100000 -db %00111111 -db %00001000 -db %11010000 -db %10000010 -db %00101000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 29,31,32 + tmlearn 34,40 + tmlearn 44,46 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/poliwhirl.asm b/data/baseStats/poliwhirl.asm index b59d6415..a93d2674 100755 --- a/data/baseStats/poliwhirl.asm +++ b/data/baseStats/poliwhirl.asm @@ -19,11 +19,11 @@ db WATER_GUN db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11010110 -db %10000110 -db %00101000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 26,27,29,31,32 + tmlearn 34,35,40 + tmlearn 44,46 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/poliwrath.asm b/data/baseStats/poliwrath.asm index d326a909..4d35c2cc 100755 --- a/data/baseStats/poliwrath.asm +++ b/data/baseStats/poliwrath.asm @@ -19,11 +19,11 @@ db DOUBLESLAP db BODY_SLAM db 3 ; growth rate ; learnset -db %10110001 -db %01111111 -db %00001111 -db %11010110 -db %10000110 -db %00101000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20 + tmlearn 26,27,29,31,32 + tmlearn 34,35,40 + tmlearn 44,46 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/ponyta.asm b/data/baseStats/ponyta.asm index 3f22d6dd..9856ecbd 100755 --- a/data/baseStats/ponyta.asm +++ b/data/baseStats/ponyta.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %11100000 -db %00000011 -db %00001000 -db %11000000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/porygon.asm b/data/baseStats/porygon.asm index 0c8a6b33..7ccee3c8 100755 --- a/data/baseStats/porygon.asm +++ b/data/baseStats/porygon.asm @@ -19,11 +19,11 @@ db CONVERSION db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01110011 -db %10001000 -db %11110001 -db %11000011 -db %00111000 -db %01000011 + tmlearn 6 + tmlearn 9,10,13,14,15 + tmlearn 20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45,46 + tmlearn 49,50,55 db 0 ; padding diff --git a/data/baseStats/primeape.asm b/data/baseStats/primeape.asm index eeab800b..e5ef5cc5 100755 --- a/data/baseStats/primeape.asm +++ b/data/baseStats/primeape.asm @@ -24,11 +24,11 @@ IF DEF(_YELLOW) ENDC db 0 ; growth rate ; learnset -db %10110001 -db %11000011 -db %10001111 -db %11001001 -db %11000110 -db %10001000 -db %00100010 + tmlearn 1,5,6,8 + tmlearn 9,10,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,28,31,32 + tmlearn 34,35,39,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/psyduck.asm b/data/baseStats/psyduck.asm index bc435c57..469097fe 100755 --- a/data/baseStats/psyduck.asm +++ b/data/baseStats/psyduck.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10110001 -db %10111111 -db %00001111 -db %11001000 -db %11000010 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,16 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/raichu.asm b/data/baseStats/raichu.asm index 6324d57d..c6757b0b 100755 --- a/data/baseStats/raichu.asm +++ b/data/baseStats/raichu.asm @@ -19,11 +19,11 @@ db THUNDER_WAVE db 0 db 0 ; growth rate ; learnset -db %10110001 -db %11000011 -db %10001101 -db %11000001 -db %11000011 -db %00011000 -db %01000010 + tmlearn 1,5,6,8 + tmlearn 9,10,15,16 + tmlearn 17,19,20,24 + tmlearn 25,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/rapidash.asm b/data/baseStats/rapidash.asm index f5088b6e..097b95bd 100755 --- a/data/baseStats/rapidash.asm +++ b/data/baseStats/rapidash.asm @@ -19,11 +19,11 @@ db STOMP db GROWL db 0 ; growth rate ; learnset -db %11100000 -db %01000011 -db %00001000 -db %11000000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,7,8 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/raticate.asm b/data/baseStats/raticate.asm index 1bc92090..5fac0f1b 100755 --- a/data/baseStats/raticate.asm +++ b/data/baseStats/raticate.asm @@ -19,11 +19,11 @@ db QUICK_ATTACK db 0 db 0 ; growth rate ; learnset -db %10100000 -db %01111111 -db %10001000 -db %11001001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,24 + tmlearn 25,28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/rattata.asm b/data/baseStats/rattata.asm index 192f8f26..dada06bc 100755 --- a/data/baseStats/rattata.asm +++ b/data/baseStats/rattata.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00101111 -db %10001000 -db %11001001 -db %11000010 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10,11,12,14 + tmlearn 20,24 + tmlearn 25,28,31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/rhydon.asm b/data/baseStats/rhydon.asm index 9f005b84..b3354e59 100755 --- a/data/baseStats/rhydon.asm +++ b/data/baseStats/rhydon.asm @@ -19,11 +19,11 @@ db TAIL_WHIP db FURY_ATTACK db 5 ; growth rate ; learnset -db %11110001 -db %11111111 -db %10001111 -db %11001111 -db %10100010 -db %10001000 -db %00110010 + tmlearn 1,5,6,7,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,24 + tmlearn 25,26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/rhyhorn.asm b/data/baseStats/rhyhorn.asm index 5521f37a..4e292406 100755 --- a/data/baseStats/rhyhorn.asm +++ b/data/baseStats/rhyhorn.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %11100000 -db %00000011 -db %10001000 -db %11001111 -db %10100010 -db %10001000 -db %00100010 + tmlearn 6,7,8 + tmlearn 9,10 + tmlearn 20,24 + tmlearn 25,26,27,28,31,32 + tmlearn 34,38,40 + tmlearn 44,48 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/sandshrew.asm b/data/baseStats/sandshrew.asm index 28016ab9..ff12e24f 100755 --- a/data/baseStats/sandshrew.asm +++ b/data/baseStats/sandshrew.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %00000011 -db %00001101 -db %11001110 -db %11000010 -db %10001000 -db %00100110 + tmlearn 3,6,8 + tmlearn 9,10 + tmlearn 17,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,39,40 + tmlearn 44,48 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/sandslash.asm b/data/baseStats/sandslash.asm index f613a517..2975b20f 100755 --- a/data/baseStats/sandslash.asm +++ b/data/baseStats/sandslash.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00001101 -db %11001110 -db %11000010 -db %10001000 -db %00100110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 17,19,20 + tmlearn 26,27,28,31,32 + tmlearn 34,39,40 + tmlearn 44,48 + tmlearn 50,51,54 db 0 ; padding diff --git a/data/baseStats/scyther.asm b/data/baseStats/scyther.asm index 6e20cddc..f91327f4 100755 --- a/data/baseStats/scyther.asm +++ b/data/baseStats/scyther.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100100 -db %01000011 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/seadra.asm b/data/baseStats/seadra.asm index 67cc26e1..4d28e2a3 100755 --- a/data/baseStats/seadra.asm +++ b/data/baseStats/seadra.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/seaking.asm b/data/baseStats/seaking.asm index c122d946..d1087618 100755 --- a/data/baseStats/seaking.asm +++ b/data/baseStats/seaking.asm @@ -19,11 +19,11 @@ db SUPERSONIC db 0 db 0 ; growth rate ; learnset -db %01100000 -db %01111111 -db %00001000 -db %11000000 -db %11000010 -db %00001000 -db %00010010 + tmlearn 6,7 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/seel.asm b/data/baseStats/seel.asm index 63a57b98..b6546b6f 100755 --- a/data/baseStats/seel.asm +++ b/data/baseStats/seel.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %11100000 -db %10111111 -db %00001000 -db %11000000 -db %10000010 -db %00001000 -db %00110010 + tmlearn 6,7,8 + tmlearn 9,10,11,12,13,14,16 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/shellder.asm b/data/baseStats/shellder.asm index 06525091..fcb87404 100755 --- a/data/baseStats/shellder.asm +++ b/data/baseStats/shellder.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %00111111 -db %00001000 -db %11100000 -db %01001011 -db %01001000 -db %00010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14 + tmlearn 20 + tmlearn 30,31,32 + tmlearn 33,34,36,39 + tmlearn 44,47 + tmlearn 49,50,53 db 0 ; padding diff --git a/data/baseStats/slowbro.asm b/data/baseStats/slowbro.asm index dd271485..2d1f8444 100755 --- a/data/baseStats/slowbro.asm +++ b/data/baseStats/slowbro.asm @@ -19,11 +19,11 @@ db HEADBUTT db 0 db 0 ; growth rate ; learnset -db %10110001 -db %11111111 -db %00001111 -db %11111110 -db %11100011 -db %00111000 -db %01110011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20 + tmlearn 26,27,28,29,30,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,54,55 db 0 ; padding diff --git a/data/baseStats/slowpoke.asm b/data/baseStats/slowpoke.asm index 41e0a586..e5edcdb9 100755 --- a/data/baseStats/slowpoke.asm +++ b/data/baseStats/slowpoke.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %10111111 -db %00001000 -db %11111110 -db %11100011 -db %00111000 -db %01110011 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,16 + tmlearn 20 + tmlearn 26,27,28,29,30,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,54,55 db 0 ; padding diff --git a/data/baseStats/snorlax.asm b/data/baseStats/snorlax.asm index 0ada7fa3..0a91f37e 100755 --- a/data/baseStats/snorlax.asm +++ b/data/baseStats/snorlax.asm @@ -19,11 +19,11 @@ db REST db 0 db 5 ; growth rate ; learnset -db %10110001 -db %11111111 -db %10101111 -db %11010111 -db %10101111 -db %10101000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15,16 + tmlearn 17,18,19,20,22,24 + tmlearn 25,26,27,29,31,32 + tmlearn 33,34,35,36,38,40 + tmlearn 44,46,48 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/spearow.asm b/data/baseStats/spearow.asm index 818ec039..4e90e749 100755 --- a/data/baseStats/spearow.asm +++ b/data/baseStats/spearow.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00001000 -db %11000000 -db %01000010 -db %00001100 -db %00001010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 43,44 + tmlearn 50,52 db 0 ; padding diff --git a/data/baseStats/squirtle.asm b/data/baseStats/squirtle.asm index d79a79e3..1257a3f0 100755 --- a/data/baseStats/squirtle.asm +++ b/data/baseStats/squirtle.asm @@ -19,11 +19,11 @@ db 0 db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11001000 -db %10000011 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/starmie.asm b/data/baseStats/starmie.asm index 671666cc..94c8f2d9 100755 --- a/data/baseStats/starmie.asm +++ b/data/baseStats/starmie.asm @@ -19,11 +19,11 @@ db HARDEN db 0 db 5 ; growth rate ; learnset -db %00100000 -db %01111111 -db %10001000 -db %11110001 -db %11000011 -db %00111000 -db %01010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,55 db 0 ; padding diff --git a/data/baseStats/staryu.asm b/data/baseStats/staryu.asm index 031fe9f5..3afbb7a5 100755 --- a/data/baseStats/staryu.asm +++ b/data/baseStats/staryu.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100000 -db %00111111 -db %10001000 -db %11110001 -db %11000011 -db %00111000 -db %01010011 + tmlearn 6 + tmlearn 9,10,11,12,13,14 + tmlearn 20,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,39,40 + tmlearn 44,45,46 + tmlearn 49,50,53,55 db 0 ; padding diff --git a/data/baseStats/tangela.asm b/data/baseStats/tangela.asm index 3e899c05..a9cab332 100755 --- a/data/baseStats/tangela.asm +++ b/data/baseStats/tangela.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %10000010 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 34,40 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/tauros.asm b/data/baseStats/tauros.asm index 16020b09..39844f76 100755 --- a/data/baseStats/tauros.asm +++ b/data/baseStats/tauros.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %11100000 -db %01110011 -db %10001000 -db %11000111 -db %10100010 -db %00001000 -db %00100010 + tmlearn 6,7,8 + tmlearn 9,10,13,14,15 + tmlearn 20,24 + tmlearn 25,26,27,31,32 + tmlearn 34,38,40 + tmlearn 44 + tmlearn 50,54 db 0 ; padding diff --git a/data/baseStats/tentacool.asm b/data/baseStats/tentacool.asm index f7569d65..12ff9e0d 100755 --- a/data/baseStats/tentacool.asm +++ b/data/baseStats/tentacool.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00100100 -db %00111111 -db %00011000 -db %11000000 -db %10000011 -db %00001000 -db %00010110 + tmlearn 3,6 + tmlearn 9,10,11,12,13,14 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51,53 db 0 ; padding diff --git a/data/baseStats/tentacruel.asm b/data/baseStats/tentacruel.asm index d7115059..01a2f685 100755 --- a/data/baseStats/tentacruel.asm +++ b/data/baseStats/tentacruel.asm @@ -19,11 +19,11 @@ db WRAP db 0 db 5 ; growth rate ; learnset -db %00100100 -db %01111111 -db %00011000 -db %11000000 -db %10000011 -db %00001000 -db %00010110 + tmlearn 3,6 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,51,53 db 0 ; padding diff --git a/data/baseStats/vaporeon.asm b/data/baseStats/vaporeon.asm index ed4b7a1e..21651202 100755 --- a/data/baseStats/vaporeon.asm +++ b/data/baseStats/vaporeon.asm @@ -23,11 +23,11 @@ db QUICK_ATTACK db WATER_GUN db 0 ; growth rate ; learnset -db %10100000 -db %01111111 -db %00001000 -db %11000000 -db %11000011 -db %00001000 -db %00010010 + tmlearn 6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 20 + tmlearn 31,32 + tmlearn 33,34,39,40 + tmlearn 44 + tmlearn 50,53 db 0 ; padding diff --git a/data/baseStats/venomoth.asm b/data/baseStats/venomoth.asm index f38be71c..e4a86f5b 100755 --- a/data/baseStats/venomoth.asm +++ b/data/baseStats/venomoth.asm @@ -24,11 +24,11 @@ ELSE ENDC db 0 ; growth rate ; learnset -db %00101010 -db %01000011 -db %00111000 -db %11110000 -db %01000011 -db %00101000 -db %00000010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 29,30,31,32 + tmlearn 33,34,39 + tmlearn 44,46 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/venonat.asm b/data/baseStats/venonat.asm index 62e8aaef..8de52309 100755 --- a/data/baseStats/venonat.asm +++ b/data/baseStats/venonat.asm @@ -19,19 +19,18 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000011 -db %00111000 + tmlearn 6 + tmlearn 9,10 + tmlearn 20,21,22 IF DEF(_YELLOW) - db %11110000 - db %01000011 - db %00101000 - db %00100010 + tmlearn 28,29,30,31 + tmlearn 32,33,38 + tmlearn 43,45 + tmlearn 49,53 ELSE - db %11010000 - db %00000011 - db %00101000 - db %00000010 + tmlearn 28,30,31 + tmlearn 32,33 + tmlearn 43,45 + tmlearn 49 ENDC - db 0 ; padding diff --git a/data/baseStats/venusaur.asm b/data/baseStats/venusaur.asm index 426d18ac..5052e9d0 100755 --- a/data/baseStats/venusaur.asm +++ b/data/baseStats/venusaur.asm @@ -19,11 +19,11 @@ db LEECH_SEED db VINE_WHIP db 3 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/victreebel.asm b/data/baseStats/victreebel.asm index 4f544b8d..0df7e22c 100755 --- a/data/baseStats/victreebel.asm +++ b/data/baseStats/victreebel.asm @@ -19,11 +19,11 @@ db ACID db RAZOR_LEAF db 3 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/vileplume.asm b/data/baseStats/vileplume.asm index df44be35..20d1b4e4 100755 --- a/data/baseStats/vileplume.asm +++ b/data/baseStats/vileplume.asm @@ -19,11 +19,11 @@ db ACID db PETAL_DANCE db 3 ; growth rate ; learnset -db %10100100 -db %01000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6,8 + tmlearn 9,10,15 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/voltorb.asm b/data/baseStats/voltorb.asm index f85fc165..4267990f 100755 --- a/data/baseStats/voltorb.asm +++ b/data/baseStats/voltorb.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00100000 -db %00000001 -db %10001000 -db %11100001 -db %01001011 -db %01011000 -db %01000010 + tmlearn 6 + tmlearn 9 + tmlearn 20,24 + tmlearn 25,30,31,32 + tmlearn 33,34,36,39 + tmlearn 44,45,47 + tmlearn 50,55 db 0 ; padding diff --git a/data/baseStats/vulpix.asm b/data/baseStats/vulpix.asm index 5b9bc47c..80a25853 100755 --- a/data/baseStats/vulpix.asm +++ b/data/baseStats/vulpix.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %10100000 -db %00000011 -db %00001000 -db %11001000 -db %11100011 -db %00001000 -db %00000010 + tmlearn 6,8 + tmlearn 9,10 + tmlearn 20 + tmlearn 28,31,32 + tmlearn 33,34,38,39,40 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/wartortle.asm b/data/baseStats/wartortle.asm index 4d77ea7b..b8d1f84f 100755 --- a/data/baseStats/wartortle.asm +++ b/data/baseStats/wartortle.asm @@ -19,11 +19,11 @@ db BUBBLE db 0 db 3 ; growth rate ; learnset -db %10110001 -db %00111111 -db %00001111 -db %11001000 -db %10000011 -db %00001000 -db %00110010 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14 + tmlearn 17,18,19,20 + tmlearn 28,31,32 + tmlearn 33,34,40 + tmlearn 44 + tmlearn 50,53,54 db 0 ; padding diff --git a/data/baseStats/weedle.asm b/data/baseStats/weedle.asm index 8e501f0b..04a7c74e 100755 --- a/data/baseStats/weedle.asm +++ b/data/baseStats/weedle.asm @@ -19,11 +19,12 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 -db %00000000 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 + tmlearn 0 db 0 ; padding +b 0 ; padding diff --git a/data/baseStats/weepinbell.asm b/data/baseStats/weepinbell.asm index 1a974e20..22c6a40b 100755 --- a/data/baseStats/weepinbell.asm +++ b/data/baseStats/weepinbell.asm @@ -19,11 +19,11 @@ db WRAP db 0 db 3 ; growth rate ; learnset -db %00100100 -db %00000011 -db %00111000 -db %11000000 -db %00000011 -db %00001000 -db %00000110 + tmlearn 3,6 + tmlearn 9,10 + tmlearn 20,21,22 + tmlearn 31,32 + tmlearn 33,34 + tmlearn 44 + tmlearn 50,51 db 0 ; padding diff --git a/data/baseStats/weezing.asm b/data/baseStats/weezing.asm index bd526ecb..265ed3c8 100755 --- a/data/baseStats/weezing.asm +++ b/data/baseStats/weezing.asm @@ -19,11 +19,11 @@ db SLUDGE db 0 db 0 ; growth rate ; learnset -db %00100000 -db %01000000 -db %10001000 -db %11000001 -db %00101010 -db %01001000 -db %00000010 + tmlearn 6 + tmlearn 15 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 34,36,38 + tmlearn 44,47 + tmlearn 50 db 0 ; padding diff --git a/data/baseStats/wigglytuff.asm b/data/baseStats/wigglytuff.asm index 1a403c3e..13bf9b3a 100755 --- a/data/baseStats/wigglytuff.asm +++ b/data/baseStats/wigglytuff.asm @@ -19,11 +19,11 @@ db DEFENSE_CURL db DOUBLESLAP db 4 ; growth rate ; learnset -db %10110001 -db %01111111 -db %10101111 -db %11110001 -db %10100011 -db %00111000 -db %01100011 + tmlearn 1,5,6,8 + tmlearn 9,10,11,12,13,14,15 + tmlearn 17,18,19,20,22,24 + tmlearn 25,29,30,31,32 + tmlearn 33,34,38,40 + tmlearn 44,45,46 + tmlearn 49,50,54,55 db 0 ; padding diff --git a/data/baseStats/zapdos.asm b/data/baseStats/zapdos.asm index 257bb859..5ae1f25f 100755 --- a/data/baseStats/zapdos.asm +++ b/data/baseStats/zapdos.asm @@ -19,11 +19,11 @@ db 0 db 0 db 5 ; growth rate ; learnset -db %00101010 -db %01000011 -db %10001000 -db %11000001 -db %01000011 -db %00011100 -db %01001010 + tmlearn 2,4,6 + tmlearn 9,10,15 + tmlearn 20,24 + tmlearn 25,31,32 + tmlearn 33,34,39 + tmlearn 43,44,45 + tmlearn 50,52,55 db 0 ; padding diff --git a/data/baseStats/zubat.asm b/data/baseStats/zubat.asm index b2197c13..bafac885 100755 --- a/data/baseStats/zubat.asm +++ b/data/baseStats/zubat.asm @@ -19,11 +19,11 @@ db 0 db 0 db 0 ; growth rate ; learnset -db %00101010 -db %00000011 -db %00011000 -db %11000000 -db %01000010 -db %00001000 -db %00000010 + tmlearn 2,4,6 + tmlearn 9,10 + tmlearn 20,21 + tmlearn 31,32 + tmlearn 34,39 + tmlearn 44 + tmlearn 50 db 0 ; padding diff --git a/engine/multiply_divide.asm b/engine/multiply_divide.asm index e55ab430..7726a2db 100755 --- a/engine/multiply_divide.asm +++ b/engine/multiply_divide.asm @@ -2,142 +2,142 @@ _Multiply: ; 37d41 (d:7d41) ld a, $8 ld b, a xor a - ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) - ld [$ff9b], a - ld [H_SAVEDNUMTOPRINT], a - ld [$ff9d], a - ld [$ff9e], a -.asm_37d4f - ld a, [H_REMAINDER] ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld [H_PRODUCT], a ; $ff95 + ld [H_MULTIPLYBUFFER], a ; $ff9b + ld [H_MULTIPLYBUFFER+1], a ; $ff9c + ld [H_MULTIPLYBUFFER+2], a ; $ff9d + ld [H_MULTIPLYBUFFER+3], a ; $ff9e +.multiplyLoop + ld a, [H_MULTIPLIER] ; $ff99 srl a - ld [H_REMAINDER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) - jr nc, .asm_37d77 - ld a, [$ff9e] + ld [H_MULTIPLIER], a ; $ff99 + jr nc, .smallMultiplier ; less than $80 +; code to possibly multiply the multiplicand by 2 and divide the multiplier by 2? + ld a, [H_MULTIPLYBUFFER+3] ld c, a - ld a, [$ff98] + ld a, [H_MULTIPLICAND+2] add c - ld [$ff9e], a - ld a, [$ff9d] + ld [H_MULTIPLYBUFFER+3], a + ld a, [H_MULTIPLYBUFFER+2] ld c, a - ld a, [$ff97] + ld a, [H_MULTIPLICAND+1] adc c - ld [$ff9d], a - ld a, [H_SAVEDNUMTOPRINT] + ld [H_MULTIPLYBUFFER+2], a + ld a, [H_MULTIPLYBUFFER+1] ; $ff9c ld c, a - ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) + ld a, [H_MULTIPLICAND] ; $ff96 adc c - ld [H_SAVEDNUMTOPRINT], a - ld a, [$ff9b] + ld [H_MULTIPLYDBUFFER+1], a ; $ff9c + ld a, [H_MULTIPLYBUFFER] ld c, a - ld a, [H_DIVIDEND] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld a, [H_PRODUCT] ; $ff95 adc c - ld [$ff9b], a -.asm_37d77 + ld [H_MULTIPLYBUFFER], a +.smallMultiplier dec b - jr z, .asm_37d94 - ld a, [$ff98] + jr z, .done + ld a, [H_MULTIPLICAND] sla a - ld [$ff98], a - ld a, [$ff97] + ld [H_MULTIPLICAND+2], a + ld a, [H_MULTIPLICAND+1] rl a - ld [$ff97], a - ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) + ld [H_MULTIPLICAND+1], a + ld a, [H_MULTIPLICAND] ; $ff96 rl a - ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) - ld a, [H_DIVIDEND] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld [H_MULTIPLICAND], a ; $ff96 + ld a, [H_PRODUCT] ; $ff95 rl a - ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) - jr .asm_37d4f -.asm_37d94 - ld a, [$ff9e] - ld [$ff98], a - ld a, [$ff9d] - ld [$ff97], a - ld a, [H_SAVEDNUMTOPRINT] - ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) - ld a, [$ff9b] - ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld [H_PRODUCT], a ; $ff95 + jr .multiplyLoop +.done + ld a, [H_MULTIPLYBUFFER+3] + ld [H_PRODUCT+3], a + ld a, [H_MULTIPLYBUFFER+2] + ld [H_PRODUCT+2], a + ld a, [H_MULTIPLYBUFFER+1] ; $ff9c + ld [H_PRODUCT+1], a ; $ff96 + ld [H_PRODUCT], a ; $ff95 ret _Divide: ; 37da5 (d:7da5) xor a - ld [$ff9a], a - ld [$ff9b], a - ld [H_SAVEDNUMTOPRINT], a - ld [$ff9d], a - ld [$ff9e], a + ld [H_DIVIDEBUFFER], a ; ff9a + ld [H_DIVIDEBUFFER+1], a ; ff9b + ld [H_DIVIDEBUFFER+2], a ; ff9c + ld [H_DIVIDEBUFFER+3], a ; ff9d + ld [H_DIVIDEBUFFER+4], a ; ff9e ld a, $9 ld e, a .asm_37db3 - ld a, [$ff9a] + ld a, [H_DIVIDEBUFFER] ld c, a - ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) + ld a, [H_DIVIDEND+1] ; $ff96 sub c ld d, a - ld a, [H_REMAINDER] ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld a, [H_DIVISOR] ; $ff99 ld c, a - ld a, [H_DIVIDEND] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld a, [H_DIVIDEND] ; $ff95 sbc c jr c, .asm_37dce - ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) + ld [H_DIVIDEND], a ; $ff95 ld a, d - ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) - ld a, [$ff9e] + ld [H_DIVIDEND+1], a ; $ff96 + ld a, [H_DIVIDEBUFFER+4] inc a - ld [$ff9e], a + ld [H_DIVIDEBUFFER+4], a jr .asm_37db3 .asm_37dce - ld a, b + ld a, b cp $1 - jr z, .asm_37e18 - ld a, [$ff9e] + jr z, .done + ld a, [H_DIVIDEBUFFER+4] sla a - ld [$ff9e], a - ld a, [$ff9d] + ld [H_DIVIDEBUFFER+4], a + ld a, [H_DIVIDEBUFFER+3] rl a - ld [$ff9d], a - ld a, [H_SAVEDNUMTOPRINT] + ld [H_DIVIDEBUFFER+3], a + ld a, [H_DIVIDEBUFFER+2] ; $ff9c rl a - ld [H_SAVEDNUMTOPRINT], a - ld a, [$ff9b] + ld [H_DIVIDEBUFFER+2], a ; $ff9c + ld a, [H_DIVIDEBUFFER+1] rl a - ld [$ff9b], a + ld [H_DIVIDEBUFFER+1], a dec e jr nz, .asm_37e04 ld a, $8 ld e, a - ld a, [$ff9a] - ld [H_REMAINDER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld a, [H_DIVIDEBUFFER] + ld [H_DIVISOR], a ; $ff99 xor a - ld [$ff9a], a - ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) - ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) - ld a, [$ff97] - ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) - ld a, [$ff98] - ld [$ff97], a + ld [H_DIVIDEBUFFER], a + ld a, [H_DIVIDEND+1] ; $ff96 + ld [H_DIVIDEND], a ; $ff95 + ld a, [H_DIVIDEND+2] + ld [H_DIVIDEND+1], a ; $ff96 + ld a, [H_DIVIDEND+3] + ld [H_DIVIDEND+2], a .asm_37e04 ld a, e cp $1 jr nz, .asm_37e0a dec b .asm_37e0a - ld a, [H_REMAINDER] ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) + ld a, [H_DIVIDEND+4] ; $ff99 srl a - ld [H_REMAINDER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) - ld a, [$ff9a] + ld [H_REMAINDER], a ; $ff99 + ld a, [H_DIVIDEBUFFER] rr a - ld [$ff9a], a + ld [H_DIVIDEBUFFER], a jr .asm_37db3 -.asm_37e18 - ld a, [H_NUMTOPRINT] ; (aliases: H_MULTIPLICAND) - ld [H_REMAINDER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN) - ld a, [$ff9e] - ld [$ff98], a - ld a, [$ff9d] - ld [$ff97], a - ld a, [H_SAVEDNUMTOPRINT] - ld [H_NUMTOPRINT], a ; (aliases: H_MULTIPLICAND) - ld a, [$ff9b] - ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT) +.done + ld a, [H_DIVIDEND+1] ; $ff96 + ld [H_REMAINDER], a ; $ff99 + ld a, [H_DIVIDEBUFFER+4] + ld [H_QUOTIENT+3], a + ld a, [H_DIVIDEBUFFER+3] + ld [H_QUOTIENT+2], a + ld a, [H_DIVIDEBUFFER+2] ; $ff9c + ld [H_QUOTIENT+1], a ; $ff96 + ld a, [H_DIVIDEBUFFER+1] + ld [H_QUOTIENT], a ; $ff95 ret diff --git a/hram.asm b/hram.asm index 0b7274ad..1f5e53fa 100644 --- a/hram.asm +++ b/hram.asm @@ -107,6 +107,10 @@ H_DIVISOR EQU $FF99 ; 1 byte H_QUOTIENT EQU $FF95 ; 4 bytes H_REMAINDER EQU $FF99 ; 1 byte +H_DIVIDEBUFFER EQU $FF9A + +H_MULTIPLYBUFFER EQU $FF9B + ; PrintNumber (big endian). H_PASTLEADINGZEROES EQU $FF95 ; last char printed H_NUMTOPRINT EQU $FF96 ; 3 bytes diff --git a/macros.asm b/macros.asm index 5223b9d8..307121ff 100644 --- a/macros.asm +++ b/macros.asm @@ -633,3 +633,63 @@ EAST_MAP_CONNECTION: MACRO db 0 ; x alignment dw wOverworldMap + 7 + \2_WIDTH ; window (position of the upper left block after entering the map) ENDM + +tmlearn: MACRO +if 0 == \1 +tm1 = 0 +tm1_ = 0 +else +tm1 = %111 & (\1 - 1) +tm1_ = 1 +endc +if 2 <= _NARG +tm2 = %111 & (\2 - 1) +tm2_ = 1 +else +tm2 = 0 +tm2_ = 0 +endc +if 3 <= _NARG +tm3 = %111 & (\3 - 1) +tm3_ = 1 +else +tm3 = 0 +tm3_ = 0 +endc +if 4 <= _NARG +tm4 = %111 & (\4 - 1) +tm4_ = 1 +else +tm4 = 0 +tm4_ = 0 +endc +if 5 <= _NARG +tm5 = %111 & (\5 - 1) +tm5_ = 1 +else +tm5 = 0 +tm5_ = 0 +endc +if 6 <= _NARG +tm6 = %111 & (\6 - 1) +tm6_ = 1 +else +tm6 = 0 +tm6_ = 0 +endc +if 7 <= _NARG +tm7 = %111 & (\7 - 1) +tm7_ = 1 +else +tm7 = 0 +tm7_ = 0 +endc +if 8 <= _NARG +tm8 = %111 & (\8 - 1) +tm8_ = 1 +else +tm8 = 0 +tm8_ = 0 +endc +db tm8_ << tm8 | tm7_ << tm7 | tm6_ << tm6 | tm5_ << tm5 | tm4_ << tm4 | tm3_ << tm3 | tm2_ << tm2 | tm1_ << tm1 +ENDM \ No newline at end of file diff --git a/wram.asm b/wram.asm index 275ccc40..32ce712d 100755 --- a/wram.asm +++ b/wram.asm @@ -313,7 +313,7 @@ wLinkMenuSelectionReceiveBuffer:: ; cc3d ; two byte buffer ; the received menu selection is stored twice -wcc3d:: ds 1 ; not used for anything other than mentioned above (haha link function) +wcc3d:: ds 1 ; not used for anything other than mentioned above wSerialExchangeNybbleReceiveData:: ; cc3e ; the final received nybble is stored here by Serial_ExchangeNybble -- cgit v1.3.1-sl0p From 87f4f4eb44f16cdf23a8cb7a67efd69ad4a34d75 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 28 Jul 2015 13:42:15 -0700 Subject: fix tmlearn --- macros.asm | 65 ++++++++------------------------------------------------------ 1 file changed, 8 insertions(+), 57 deletions(-) (limited to 'macros.asm') diff --git a/macros.asm b/macros.asm index 307121ff..20a82007 100644 --- a/macros.asm +++ b/macros.asm @@ -635,61 +635,12 @@ EAST_MAP_CONNECTION: MACRO ENDM tmlearn: MACRO -if 0 == \1 -tm1 = 0 -tm1_ = 0 -else -tm1 = %111 & (\1 - 1) -tm1_ = 1 +x = 0 + rept _NARG +if \1 != 0 +x = x | (1 << ((\1 - 1) % 8)) endc -if 2 <= _NARG -tm2 = %111 & (\2 - 1) -tm2_ = 1 -else -tm2 = 0 -tm2_ = 0 -endc -if 3 <= _NARG -tm3 = %111 & (\3 - 1) -tm3_ = 1 -else -tm3 = 0 -tm3_ = 0 -endc -if 4 <= _NARG -tm4 = %111 & (\4 - 1) -tm4_ = 1 -else -tm4 = 0 -tm4_ = 0 -endc -if 5 <= _NARG -tm5 = %111 & (\5 - 1) -tm5_ = 1 -else -tm5 = 0 -tm5_ = 0 -endc -if 6 <= _NARG -tm6 = %111 & (\6 - 1) -tm6_ = 1 -else -tm6 = 0 -tm6_ = 0 -endc -if 7 <= _NARG -tm7 = %111 & (\7 - 1) -tm7_ = 1 -else -tm7 = 0 -tm7_ = 0 -endc -if 8 <= _NARG -tm8 = %111 & (\8 - 1) -tm8_ = 1 -else -tm8 = 0 -tm8_ = 0 -endc -db tm8_ << tm8 | tm7_ << tm7 | tm6_ << tm6 | tm5_ << tm5 | tm4_ << tm4 | tm3_ << tm3 | tm2_ << tm2 | tm1_ << tm1 -ENDM \ No newline at end of file + shift + endr + db x +ENDM -- cgit v1.3.1-sl0p From b6ac1018c29592d667a559016baa18301f21dad4 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Fri, 14 Aug 2015 02:46:12 -0700 Subject: add border constant and clear up misnomer --- constants/connection_constants.asm | 4 ++ constants/misc_constants.asm | 9 +++-- engine/trade.asm | 10 ++--- home/overworld.asm | 76 +++++++++++++++++++------------------- home/vblank.asm | 2 +- home/vcopy.asm | 51 +++++++++++++------------ hram.asm | 8 ++-- macros.asm | 8 ++++ main.asm | 10 ++--- scripts/vermiliondock.asm | 8 ++-- wram.asm | 4 +- 11 files changed, 103 insertions(+), 87 deletions(-) (limited to 'macros.asm') diff --git a/constants/connection_constants.asm b/constants/connection_constants.asm index 916d6c4f..154c4163 100755 --- a/constants/connection_constants.asm +++ b/constants/connection_constants.asm @@ -1,3 +1,7 @@ +; width of east/west connections +; height of north/south connections +MAP_BORDER EQU 3 + ; connection directions EAST EQU 1 WEST EQU 2 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 9fa50e9c..43dc908e 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -25,13 +25,14 @@ D_LEFT EQU %00100000 D_UP EQU %01000000 D_DOWN EQU %10000000 -PIXELS_PER_TILE EQU 8 - SCREEN_WIDTH EQU 20 SCREEN_HEIGHT EQU 18 -SCREEN_WIDTH_PIXELS EQU SCREEN_WIDTH * PIXELS_PER_TILE -SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * PIXELS_PER_TILE +SCREEN_WIDTH_PIXELS EQU SCREEN_WIDTH * 8 +SCREEN_HEIGHT_PIXELS EQU SCREEN_HEIGHT * 8 + +BG_MAP_WIDTH EQU 32 +BG_MAP_HEIGHT EQU 32 NPC_MOVEMENT_DOWN EQU $00 NPC_MOVEMENT_UP EQU $40 diff --git a/engine/trade.asm b/engine/trade.asm index 0e816e05..66afa47e 100755 --- a/engine/trade.asm +++ b/engine/trade.asm @@ -552,14 +552,14 @@ Trade_CopyCableTilesOffScreen: ; 414ae (10:54ae) ; continues when the screen is scrolled. push hl coord hl, 0, 4 - call CopyToScreenEdgeTiles + call CopyToRedrawRowOrColumnSrcTiles pop hl ld a, h - ld [H_SCREENEDGEREDRAWADDR + 1], a + ld [hRedrawRowOrColumnDest + 1], a ld a, l - ld [H_SCREENEDGEREDRAWADDR], a - ld a, REDRAWROW - ld [H_SCREENEDGEREDRAW], a + ld [hRedrawRowOrColumnDest], a + ld a, REDRAW_ROW + ld [hRedrawRowOrColumnMode], a ld c, 10 jp DelayFrames diff --git a/home/overworld.asm b/home/overworld.asm index 6b3a75c6..051d055e 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -555,10 +555,10 @@ CheckMapConnections:: ; 07ba (0:07ba) jr z,.savePointer1 .pointerAdjustmentLoop1 ld a,[wWestConnectedMapWidth] ; width of connected map - add a,$06 + add a,MAP_BORDER * 2 ld e,a - ld d,$00 - ld b,$00 + ld d,0 + ld b,0 add hl,de dec c jr nz,.pointerAdjustmentLoop1 @@ -591,10 +591,10 @@ CheckMapConnections:: ; 07ba (0:07ba) jr z,.savePointer2 .pointerAdjustmentLoop2 ld a,[wEastConnectedMapWidth] - add a,$06 + add a,MAP_BORDER * 2 ld e,a - ld d,$00 - ld b,$00 + ld d,0 + ld b,0 add hl,de dec c jr nz,.pointerAdjustmentLoop2 @@ -883,15 +883,15 @@ LoadTileBlockMap:: ; 09fc (0:09fc) ld hl,wOverworldMap ld a,[W_CURMAPWIDTH] ld [hMapWidth],a - add a,$06 ; border (east and west) + add a,MAP_BORDER * 2 ; east and west ld [hMapStride],a ; map width + border - ld b,$00 + ld b,0 ld c,a ; make space for north border (next 3 lines) add hl,bc add hl,bc add hl,bc - ld c,$03 + ld c,MAP_BORDER add hl,bc ; this puts us past the (west) border ld a,[W_MAPDATAPTR] ; tile map pointer ld e,a @@ -995,7 +995,7 @@ LoadTileBlockMap:: ; 09fc (0:09fc) ret LoadNorthSouthConnectionsTileMap:: ; 0ade (0:0ade) - ld c,$03 + ld c,MAP_BORDER .loop push de push hl @@ -1016,7 +1016,7 @@ LoadNorthSouthConnectionsTileMap:: ; 0ade (0:0ade) inc h .noCarry1 ld a,[W_CURMAPWIDTH] - add a,$06 + add a,MAP_BORDER * 2 add e ld e,a jr nc,.noCarry2 @@ -1029,7 +1029,7 @@ LoadNorthSouthConnectionsTileMap:: ; 0ade (0:0ade) LoadEastWestConnectionsTileMap:: ; 0b02 (0:0b02) push hl push de - ld c,$03 + ld c,MAP_BORDER .innerLoop ld a,[hli] ld [de],a @@ -1045,7 +1045,7 @@ LoadEastWestConnectionsTileMap:: ; 0b02 (0:0b02) inc h .noCarry1 ld a,[W_CURMAPWIDTH] - add a,$06 + add a,MAP_BORDER * 2 add e ld e,a jr nc,.noCarry2 @@ -1387,7 +1387,7 @@ LoadCurrentMapView:: ; 0caa (0:0caa) ; update tile block map pointer to next row's address pop de ld a,[W_CURMAPWIDTH] - add a,$06 + add a,MAP_BORDER * 2 add e ld e,a jr nc,.noCarry @@ -1418,7 +1418,7 @@ LoadCurrentMapView:: ; 0caa (0:0caa) ld bc,$0002 add hl,bc .copyToVisibleAreaBuffer - coord de, 0, 0 ; base address for the tiles that are directly transfered to VRAM during V-blank + coord de, 0, 0 ; base address for the tiles that are directly transferred to VRAM during V-blank ld b, SCREEN_HEIGHT .rowLoop2 ld c, SCREEN_WIDTH @@ -1662,7 +1662,7 @@ MoveTileBlockMapPointerWest:: ; 0e6f (0:0e6f) ret MoveTileBlockMapPointerSouth:: ; 0e79 (0:0e79) - add a,$06 + add a,MAP_BORDER * 2 ld b,a ld a,[de] add b @@ -1675,7 +1675,7 @@ MoveTileBlockMapPointerSouth:: ; 0e79 (0:0e79) ret MoveTileBlockMapPointerNorth:: ; 0e85 (0:0e85) - add a,$06 + add a,MAP_BORDER * 2 ld b,a ld a,[de] sub b @@ -1692,17 +1692,17 @@ MoveTileBlockMapPointerNorth:: ; 0e85 (0:0e85) ScheduleNorthRowRedraw:: ; 0e91 (0:0e91) coord hl, 0, 0 - call CopyToScreenEdgeTiles + call CopyToRedrawRowOrColumnSrcTiles ld a,[wMapViewVRAMPointer] - ld [H_SCREENEDGEREDRAWADDR],a + ld [hRedrawRowOrColumnDest],a ld a,[wMapViewVRAMPointer + 1] - ld [H_SCREENEDGEREDRAWADDR + 1],a - ld a,REDRAWROW - ld [H_SCREENEDGEREDRAW],a + ld [hRedrawRowOrColumnDest + 1],a + ld a,REDRAW_ROW + ld [hRedrawRowOrColumnMode],a ret -CopyToScreenEdgeTiles:: ; 0ea6 (0:0ea6) - ld de,wScreenEdgeTiles +CopyToRedrawRowOrColumnSrcTiles:: ; 0ea6 (0:0ea6) + ld de,wRedrawRowOrColumnSrcTiles ld c,2 * SCREEN_WIDTH .loop ld a,[hli] @@ -1714,7 +1714,7 @@ CopyToScreenEdgeTiles:: ; 0ea6 (0:0ea6) ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2) coord hl, 0, 16 - call CopyToScreenEdgeTiles + call CopyToRedrawRowOrColumnSrcTiles ld a,[wMapViewVRAMPointer] ld l,a ld a,[wMapViewVRAMPointer + 1] @@ -1724,11 +1724,11 @@ ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2) ld a,h and a,$03 or a,$98 - ld [H_SCREENEDGEREDRAWADDR + 1],a + ld [hRedrawRowOrColumnDest + 1],a ld a,l - ld [H_SCREENEDGEREDRAWADDR],a - ld a,REDRAWROW - ld [H_SCREENEDGEREDRAW],a + ld [hRedrawRowOrColumnDest],a + ld a,REDRAW_ROW + ld [hRedrawRowOrColumnMode],a ret ScheduleEastColumnRedraw:: ; 0ed3 (0:0ed3) @@ -1742,15 +1742,15 @@ ScheduleEastColumnRedraw:: ; 0ed3 (0:0ed3) add a,18 and a,$1f or b - ld [H_SCREENEDGEREDRAWADDR],a + ld [hRedrawRowOrColumnDest],a ld a,[wMapViewVRAMPointer + 1] - ld [H_SCREENEDGEREDRAWADDR + 1],a - ld a,REDRAWCOL - ld [H_SCREENEDGEREDRAW],a + ld [hRedrawRowOrColumnDest + 1],a + ld a,REDRAW_COL + ld [hRedrawRowOrColumnMode],a ret ScheduleColumnRedrawHelper:: ; 0ef2 (0:0ef2) - ld de,wScreenEdgeTiles + ld de,wRedrawRowOrColumnSrcTiles ld c,SCREEN_HEIGHT .loop ld a,[hli] @@ -1773,11 +1773,11 @@ ScheduleWestColumnRedraw:: ; 0f08 (0:0f08) coord hl, 0, 0 call ScheduleColumnRedrawHelper ld a,[wMapViewVRAMPointer] - ld [H_SCREENEDGEREDRAWADDR],a + ld [hRedrawRowOrColumnDest],a ld a,[wMapViewVRAMPointer + 1] - ld [H_SCREENEDGEREDRAWADDR + 1],a - ld a,REDRAWCOL - ld [H_SCREENEDGEREDRAW],a + ld [hRedrawRowOrColumnDest + 1],a + ld a,REDRAW_COL + ld [hRedrawRowOrColumnMode],a ret ; function to write the tiles that make up a tile block to memory diff --git a/home/vblank.asm b/home/vblank.asm index 8ffae9f1..f69d4a86 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -22,7 +22,7 @@ VBlank:: call AutoBgMapTransfer call VBlankCopyBgMap - call RedrawExposedScreenEdge + call RedrawRowOrColumn call VBlankCopy call VBlankCopyDouble call UpdateMovingBgTiles diff --git a/home/vcopy.asm b/home/vcopy.asm index 02caef29..69773cfe 100644 --- a/home/vcopy.asm +++ b/home/vcopy.asm @@ -33,23 +33,26 @@ ClearBgMap:: ; 1cf0 (0:1cf0) jr nz,.loop ret -; When the player takes a step, a row or column of 2x2 tile blocks at the edge -; of the screen toward which they moved is exposed and has to be redrawn. -; This function does the redrawing. -RedrawExposedScreenEdge:: ; 1d01 (0:1d01) - ld a,[H_SCREENEDGEREDRAW] +RedrawRowOrColumn:: ; 1d01 (0:1d01) +; This function redraws a BG row of height 2 or a BG column of width 2. +; One of its main uses is redrawing the row or column that will be exposed upon +; scrolling the BG when the player takes a step. Redrawing only the exposed +; row or column is more efficient than redrawing the entire screen. +; However, this function is also called repeatedly to redraw the whole screen +; when necessary. It is also used in trade animation and elevator code. + ld a,[hRedrawRowOrColumnMode] and a ret z ld b,a xor a - ld [H_SCREENEDGEREDRAW],a + ld [hRedrawRowOrColumnMode],a dec b jr nz,.redrawRow .redrawColumn - ld hl,wScreenEdgeTiles - ld a,[H_SCREENEDGEREDRAWADDR] + ld hl,wRedrawRowOrColumnSrcTiles + ld a,[hRedrawRowOrColumnDest] ld e,a - ld a,[H_SCREENEDGEREDRAWADDR + 1] + ld a,[hRedrawRowOrColumnDest + 1] ld d,a ld c,SCREEN_HEIGHT .loop1 @@ -58,7 +61,7 @@ RedrawExposedScreenEdge:: ; 1d01 (0:1d01) inc de ld a,[hli] ld [de],a - ld a,31 + ld a,BG_MAP_WIDTH - 1 add e ld e,a jr nc,.noCarry @@ -72,23 +75,24 @@ RedrawExposedScreenEdge:: ; 1d01 (0:1d01) dec c jr nz,.loop1 xor a - ld [H_SCREENEDGEREDRAW],a + ld [hRedrawRowOrColumnMode],a ret .redrawRow - ld hl,wScreenEdgeTiles - ld a,[H_SCREENEDGEREDRAWADDR] + ld hl,wRedrawRowOrColumnSrcTiles + ld a,[hRedrawRowOrColumnDest] ld e,a - ld a,[H_SCREENEDGEREDRAWADDR + 1] + ld a,[hRedrawRowOrColumnDest + 1] ld d,a push de - call .drawHalf ; draw upper half + call .DrawHalf ; draw upper half pop de - ld a,32 ; width of VRAM background map + ld a,BG_MAP_WIDTH ; width of VRAM background map add e ld e,a - ; draw lower half -.drawHalf - ld c,10 + ; fall through and draw lower half + +.DrawHalf + ld c,SCREEN_WIDTH / 2 .loop2 ld a,[hli] ld [de],a @@ -113,7 +117,7 @@ RedrawExposedScreenEdge:: ; 1d01 (0:1d01) ; background per V-blank. It cycles through which third it draws. ; This transfer is turned off when walking around the map, but is turned ; on when talking to sprites, battling, using menus, etc. This is because -; the above function, RedrawExposedScreenEdge, is used when walking to +; the above function, RedrawRowOrColumn, is used when walking to ; improve efficiency. AutoBgMapTransfer:: ; 1d57 (0:1d57) ld a,[H_AUTOBGTRANSFERENABLED] @@ -302,12 +306,11 @@ VBlankCopyDouble:: VBlankCopy:: -; Copy [H_VBCOPYSIZE] 2bpp tiles +; Copy [H_VBCOPYSIZE] 2bpp tiles (or 16 * [H_VBCOPYSIZE] tile map entries) ; from H_VBCOPYSRC to H_VBCOPYDEST. -; Source and destination addresses -; are updated, so transfer can -; continue in subsequent calls. +; Source and destination addresses are updated, +; so transfer can continue in subsequent calls. ld a, [H_VBCOPYSIZE] and a diff --git a/hram.asm b/hram.asm index c1fb4c4c..f5817fa4 100644 --- a/hram.asm +++ b/hram.asm @@ -242,12 +242,12 @@ H_VBCOPYDOUBLEDEST EQU $FFCE ; 00 = no redraw ; 01 = redraw column ; 02 = redraw row -H_SCREENEDGEREDRAW EQU $FFD0 +hRedrawRowOrColumnMode EQU $FFD0 -REDRAWCOL EQU 1 -REDRAWROW EQU 2 +REDRAW_COL EQU 1 +REDRAW_ROW EQU 2 -H_SCREENEDGEREDRAWADDR EQU $FFD1 +hRedrawRowOrColumnDest EQU $FFD1 hRandomAdd EQU $FFD3 hRandomSub EQU $FFD4 diff --git a/macros.asm b/macros.asm index 20a82007..9efb69e5 100644 --- a/macros.asm +++ b/macros.asm @@ -104,6 +104,14 @@ dwCoord: MACRO dw wTileMap + 20 * \2 + \1 ENDM +;\1 = r +;\2 = X +;\3 = Y +;\4 = map width +overworldMapCoord: MACRO + ld \1, wOverworldMap + ((\2) + 3) + (((\3) + 3) * ((\4) + (3 * 2))) + ENDM + ;\1 = Map Width ;\2 = Rows above (Y-blocks) ;\3 = X movement (X-blocks) diff --git a/main.asm b/main.asm index 6db76b46..c87cd1f0 100755 --- a/main.asm +++ b/main.asm @@ -3184,7 +3184,7 @@ RedrawMapView: ; eedc (3:6edc) add hl, de dec a jr nz, .calcWRAMAddrLoop - call CopyToScreenEdgeTiles + call CopyToRedrawRowOrColumnSrcTiles pop hl ld de, $20 ld a, [$ffbe] @@ -3196,11 +3196,11 @@ RedrawMapView: ; eedc (3:6edc) or $98 dec c jr nz, .calcVRAMAddrLoop - ld [H_SCREENEDGEREDRAWADDR + 1], a + ld [hRedrawRowOrColumnDest + 1], a ld a, l - ld [H_SCREENEDGEREDRAWADDR], a - ld a, REDRAWROW - ld [H_SCREENEDGEREDRAW], a + ld [hRedrawRowOrColumnDest], a + ld a, REDRAW_ROW + ld [hRedrawRowOrColumnMode], a call DelayFrame ld hl, $ffbe inc [hl] diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index d3c7e31a..78ada7cf 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -181,12 +181,12 @@ VermilionDock_1dc7c: ; 1dc7c (7:5c7c) VermilionDock_EraseSSAnne: ; 1dc94 (7:5c94) ; Fill the area the S.S. Anne occupies in BG map 0 with water tiles. ld hl, wVermilionDockTileMapBuffer - ld bc, (5 * 32) + SCREEN_WIDTH + ld bc, (5 * BG_MAP_WIDTH) + SCREEN_WIDTH ld a, $14 ; water tile call FillMemory - ld hl, vBGMap0 + 10 * 32 + ld hl, vBGMap0 + 10 * BG_MAP_WIDTH ld de, wVermilionDockTileMapBuffer - ld bc, (6 * 32) / 16 + ld bc, (6 * BG_MAP_WIDTH) / 16 call CopyVideoData ; Replace the blocks of the lower half of the ship with water blocks. This @@ -194,7 +194,7 @@ VermilionDock_EraseSSAnne: ; 1dc94 (7:5c94) ; the blocks is unnecessary because the blocks the ship occupies are south of ; the player and won't be redrawn when the player automatically walks north and ; exits the map. This code could be removed without affecting anything. - ld hl, wOverworldMap + (5 + 3) + (2 + 3) * (VERMILION_DOCK_WIDTH + 6) ; (5, 2) + overworldMapCoord hl, 5, 2, VERMILION_DOCK_WIDTH ld a, $d ; water block ld [hli], a ld [hli], a diff --git a/wram.asm b/wram.asm index 44ad46a5..7ab8f8c9 100755 --- a/wram.asm +++ b/wram.asm @@ -287,8 +287,8 @@ wTempPic:: wOverworldMap:: ; c6e8 ds 1300 -wScreenEdgeTiles:: ; cbfc -; the tiles of the row or column to be redrawn by RedrawExposedScreenEdge +wRedrawRowOrColumnSrcTiles:: ; cbfc +; the tiles of the row or column to be redrawn by RedrawRowOrColumn ds 20 * 2 ; coordinates of the position of the cursor for the top menu item (id 0) -- cgit v1.3.1-sl0p