diff options
| author | IIMarckus <iimarckus@gmail.com> | 2016-06-08 05:44:58 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2016-06-08 05:44:58 -0600 |
| commit | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (patch) | |
| tree | ca189f210cb5f404d4791ace04fcd70de6b3a642 | |
| parent | 42a9f7e8fd9f2f56a271cd5378467bb6a0f5bd21 (diff) | |
Part 1 of syncing with pokered.
427 files changed, 3835 insertions, 4045 deletions
diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 39db37d5..c116e855 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -1,4 +1,4 @@ -AgathaScript: ; 7642d (1d:642d) +AgathaScript: call AgathaScript_76443 call EnableAutoTextBoxDrawing ld hl, AgathaTrainerHeaders @@ -8,7 +8,7 @@ AgathaScript: ; 7642d (1d:642d) ld [W_AGATHACURSCRIPT], a ret -AgathaScript_76443: ; 76443 (1d:6443) +AgathaScript_76443: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -20,27 +20,27 @@ AgathaScript_76443: ; 76443 (1d:6443) .asm_76457 ld a, $3b -AgathaScript_76459: ; 76459 (1d:6459) +AgathaScript_76459: ld [wNewTileBlockID], a lb bc, 0, 2 predef_jump ReplaceTileBlock -AgathaScript_76464: ; 76464 (1d:6464) +AgathaScript_76464: xor a ld [W_AGATHACURSCRIPT], a ret -AgathaScriptPointers: ; 76469 (1d:6469) +AgathaScriptPointers: dw AgathaScript0 dw DisplayEnemyTrainerTextAndStartBattle dw AgathaScript2 dw AgathaScript3 dw AgathaScript4 -AgathaScript4: ; 76473 (1d:6473) +AgathaScript4: ret -AgathaScript_76474: ; 76474 (1d:6474) +AgathaScript_76474: ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -57,7 +57,7 @@ AgathaScript_76474: ; 76474 (1d:6474) ld [W_CURMAPSCRIPT], a ret -AgathaScript0: ; 76490 (1d:6490) +AgathaScript0: ld hl, CoordsData_764d1 call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -85,14 +85,14 @@ AgathaScript0: ; 76490 (1d:6490) ld [W_CURMAPSCRIPT], a ret -CoordsData_764d1: ; 764d1 (1d:64d1) +CoordsData_764d1: db $0A,$04 db $0A,$05 db $0B,$04 db $0B,$05 db $FF -AgathaScript3: ; 764da (1d:64da) +AgathaScript3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -103,7 +103,7 @@ AgathaScript3: ; 764da (1d:64da) ld [W_CURMAPSCRIPT], a ret -AgathaScript2: ; 764ed (1d:64ed) +AgathaScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff @@ -115,12 +115,12 @@ AgathaScript2: ; 764ed (1d:64ed) ld [W_GARYCURSCRIPT], a ret -AgathaTextPointers: ; 76505 (1d:6505) +AgathaTextPointers: dw AgathaText1 dw AgathaDontRunAwayText -AgathaTrainerHeaders: ; 76509 (1d:6509) -AgathaTrainerHeader0: ; 76509 (1d:6509) +AgathaTrainerHeaders: +AgathaTrainerHeader0: dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 @@ -131,24 +131,24 @@ AgathaTrainerHeader0: ; 76509 (1d:6509) db $ff -AgathaText1: ; 76516 (1d:6516) +AgathaText1: TX_ASM ld hl, AgathaTrainerHeader0 call TalkToTrainer jp TextScriptEnd -AgathaBeforeBattleText: ; 76520 (1d:6520) +AgathaBeforeBattleText: TX_FAR _AgathaBeforeBattleText db "@" -AgathaEndBattleText: ; 76525 (1d:6525) +AgathaEndBattleText: TX_FAR _AgathaEndBattleText db "@" -AgathaAfterBattleText: ; 7652a (1d:652a) +AgathaAfterBattleText: TX_FAR _AgathaAfterBattleText db "@" -AgathaDontRunAwayText: ; 7652f (1d:652f) +AgathaDontRunAwayText: TX_FAR _AgathaDontRunAwayText db "@" diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm index b0daa01f..19554ba7 100644 --- a/scripts/beach_house.asm +++ b/scripts/beach_house.asm @@ -152,7 +152,7 @@ BeachHouseSign4Text: call YesNoChoice ld a, [wCurrentMenuItem] and a - jp z, Func_f23d0 ; 0xf23d0 + jp z, Func_f23d0 call SaveScreenTilesToBuffer2 ld hl, wd730 set 6, [hl] diff --git a/scripts/beach_house2.asm b/scripts/beach_house2.asm index eb2f56b4..03e77ecb 100755 --- a/scripts/beach_house2.asm +++ b/scripts/beach_house2.asm @@ -1,4 +1,4 @@ -Func_f23d0: ; f23d0 +Func_f23d0: call SaveScreenTilesToBuffer2 xor a ld [wUpdateSpritesEnabled], a diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index 5723849d..5ebd1fb6 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -1,13 +1,13 @@ -BikeShopScript: ; 1d73c (7:573c) +BikeShopScript: call EnableAutoTextBoxDrawing ret -BikeShopTextPointers: ; 1d73f (7:573f) +BikeShopTextPointers: dw BikeShopText1 dw BikeShopText2 dw BikeShopText3 -BikeShopText1: ; 1d745 (7:5745) +BikeShopText1: TX_ASM CheckEvent EVENT_GOT_BICYCLE jr z, .asm_260d4 @@ -82,57 +82,57 @@ BikeShopText1: ; 1d745 (7:5745) .Done jp TextScriptEnd -BikeShopMenuText: ; 1d7f8 (7:57f8) +BikeShopMenuText: db "BICYCLE" next "CANCEL@" -BikeShopMenuPrice: ; 1d807 (7:5807) +BikeShopMenuPrice: db "¥1000000@" -BikeShopText_1d810: ; 1d810 (7:5810) +BikeShopText_1d810: TX_FAR _BikeShopText_1d810 db "@" -BikeShopText_1d815: ; 1d815 (7:5815) +BikeShopText_1d815: TX_FAR _BikeShopText_1d815 db "@" -BikeShopCantAffordText: ; 1d81a (7:581a) - TX_FAR _BikeShopText_1d81a +BikeShopCantAffordText: + TX_FAR _BikeShopCantAffordText db "@" -BikeShopText_1d81f: ; 1d81f (7:581f) +BikeShopText_1d81f: TX_FAR _BikeShopText_1d81f db "@" -BikeShopText_1d824: ; 1d824 (7:5824) +BikeShopText_1d824: TX_FAR _BikeShopText_1d824 TX_SFX_KEY_ITEM db "@" -BikeShopComeAgainText: ; 1d82a (7:582a) - TX_FAR _BikeShopText_1d82a +BikeShopComeAgainText: + TX_FAR _BikeShopComeAgainText db "@" -BikeShopText_1d82f: ; 1d82f (7:582f) +BikeShopText_1d82f: TX_FAR _BikeShopText_1d82f db "@" -BikeShopText_1d834: ; 1d834 (7:5834) +BikeShopText_1d834: TX_FAR _BikeShopText_1d834 db "@" -BikeShopText2: ; 1d839 (7:5839) +BikeShopText2: TX_ASM ld hl, BikeShopText_1d843 call PrintText jp TextScriptEnd -BikeShopText_1d843: ; 1d843 (7:5843) +BikeShopText_1d843: TX_FAR _BikeShopText_1d843 db "@" -BikeShopText3: ; 1d848 (7:5848) +BikeShopText3: TX_ASM CheckEvent EVENT_GOT_BICYCLE ld hl, BikeShopText_1d861 @@ -142,10 +142,10 @@ BikeShopText3: ; 1d848 (7:5848) call PrintText jp TextScriptEnd -BikeShopText_1d85c: ; 1d85c (7:585c) +BikeShopText_1d85c: TX_FAR _BikeShopText_1d85c db "@" -BikeShopText_1d861: ; 1d861 (7:5861) +BikeShopText_1d861: TX_FAR _BikeShopText_1d861 db "@" diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index b288a9fe..3abbeb7a 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -1,4 +1,4 @@ -BillsHouseScript: ; 1e76a (7:676a) +BillsHouseScript: call BillsHouseScript_1e09e call EnableAutoTextBoxDrawing ld a, [W_BILLSHOUSECURSCRIPT] @@ -6,7 +6,7 @@ BillsHouseScript: ; 1e76a (7:676a) call JumpTable ret -BillsHouseScriptPointers: ; 1e776 (7:6776) +BillsHouseScriptPointers: dw BillsHouseScript0 dw BillsHouseScript1 dw BillsHouseScript2 @@ -37,7 +37,7 @@ BillsHouseScript_1e09e: ld [W_BILLSHOUSECURSCRIPT], a ret -BillsHouseScript0: ; 1e782 (7:6782) +BillsHouseScript0: ld a, [wd472] bit 7, a jr z, .asm_1e0d2 @@ -51,7 +51,7 @@ BillsHouseScript0: ; 1e782 (7:6782) ld [W_BILLSHOUSECURSCRIPT], a ret -BillsHouseScript1: ; 1e783 (7:6783) +BillsHouseScript1: ret BillsHouseScript2: @@ -74,14 +74,14 @@ BillsHouseScript2: ld [W_BILLSHOUSECURSCRIPT], a ret -MovementData_1e79c: ; 1e79c (7:679c) +MovementData_1e79c: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db $FF ; make Bill walk around the player -MovementData_1e7a0: ; 1e7a0 (7:67a0) +MovementData_1e7a0: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP @@ -89,7 +89,7 @@ MovementData_1e7a0: ; 1e7a0 (7:67a0) db NPC_MOVEMENT_UP db $FF -BillsHouseScript3: ; 1e7a6 (7:67a6) +BillsHouseScript3: ld a, [wd730] bit 0, a ret nz @@ -131,7 +131,7 @@ PikachuMovementData_1e152: db $36 db $3f -BillsHouseScript4: ; 1e7c5 (7:67c5) +BillsHouseScript4: CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL ret z ld a, $fc @@ -184,7 +184,7 @@ BillsHouseScript5: ld [W_BILLSHOUSECURSCRIPT], a ret -MovementData_1e807: ; 1e807 (7:6807) +MovementData_1e807: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -197,7 +197,7 @@ PikachuMovementData_1e1a9: db $37 db $3f -BillsHouseScript6: ; 1e80d (7:680d) +BillsHouseScript6: ld a, [wd730] bit 0, a ret nz @@ -250,30 +250,30 @@ BillsHouseScript8: ld [W_BILLSHOUSECURSCRIPT], a ret -BillsHouseScript9: ; 1e827 (7:6827) +BillsHouseScript9: ret -BillsHouseTextPointers: ; 1e834 (7:6834) +BillsHouseTextPointers: dw BillsHouseText1 dw BillsHouseText2 dw BillsHouseText3 dw BillsHouseText4 -BillsHouseText4: ; 1e83c (7:683c) +BillsHouseText4: TX_FAR _BillsHouseDontLeaveText db "@" -BillsHouseText1: ; 1e83d (7:683d) +BillsHouseText1: TX_ASM callba Func_f2418 jp TextScriptEnd -BillsHouseText2: ; 1e874 (7:6874) +BillsHouseText2: TX_ASM callba Func_f244a jp TextScriptEnd -BillsHouseText3: ; 1e8d0 (7:68d0) +BillsHouseText3: TX_ASM callba Func_f24a2 jp TextScriptEnd diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm index 2ae17ae6..8e0c1765 100755 --- a/scripts/billshouse2.asm +++ b/scripts/billshouse2.asm @@ -83,7 +83,7 @@ BillsHouseText_f24a9: TX_FAR _BillsHouseText_1e8da db "@" -Func_f24ae: ; f24ae +Func_f24ae: ld a, [wCurMap] cp BILLS_HOUSE jr nz, .asm_f24d2 diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 959fb23e..5d1c0723 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -1,29 +1,29 @@ -BluesHouseScript: ; 19b3b (6:5b3b) +BluesHouseScript: call EnableAutoTextBoxDrawing ld hl, BluesHouseScriptPointers xor a call JumpTable ret -BluesHouseScriptPointers: ; 19b47 (6:5b47) +BluesHouseScriptPointers: dw BluesHouseScript0 dw BluesHouseScript1 -BluesHouseScript0: ; 19b4b (6:5b4b) +BluesHouseScript0: SetEvent EVENT_ENTERED_BLUES_HOUSE ; trigger the next script ld a, 1 ld [W_BLUESHOUSECURSCRIPT], a -BluesHouseScript1: ; 19b56 (6:5b56) +BluesHouseScript1: ret -BluesHouseTextPointers: ; 19b57 (6:5b57) +BluesHouseTextPointers: dw BluesHouseText1 dw BluesHouseText2 dw BluesHouseText3 -BluesHouseText1: ; 19b5d (6:5b5d) +BluesHouseText1: TX_ASM CheckEvent EVENT_GOT_TOWN_MAP jr nz, .GotMap @@ -55,30 +55,30 @@ BluesHouseText1: ; 19b5d (6:5b5d) .done jp TextScriptEnd -DaisyInitialText: ; 19baa (6:5baa) +DaisyInitialText: TX_FAR _DaisyInitialText db "@" -DaisyOfferMapText: ; 19baf (6:5baf) +DaisyOfferMapText: TX_FAR _DaisyOfferMapText db "@" -GotMapText: ; 19bb4 (6:5bb4) +GotMapText: TX_FAR _GotMapText db $11, "@" -DaisyBagFullText: ; 19bba (6:5bba) +DaisyBagFullText: TX_FAR _DaisyBagFullText db "@" -DaisyUseMapText: ; 19bbf (6:5bbf) +DaisyUseMapText: TX_FAR _DaisyUseMapText db "@" -BluesHouseText2: ; 0x19bc4 Daisy, walking around +BluesHouseText2: ; Daisy, walking around TX_FAR _BluesHouseText2 db "@" -BluesHouseText3: ; 0x19bc9 map on table +BluesHouseText3: ; map on table TX_FAR _BluesHouseText3 db "@" diff --git a/scripts/bruno.asm b/scripts/bruno.asm index 5318ecba..fcf18b8d 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -1,4 +1,4 @@ -BrunoScript: ; 762d6 (1d:62d6) +BrunoScript: call BrunoScript_762ec call EnableAutoTextBoxDrawing ld hl, BrunoTrainerHeaders @@ -8,7 +8,7 @@ BrunoScript: ; 762d6 (1d:62d6) ld [W_BRUNOCURSCRIPT], a ret -BrunoScript_762ec: ; 762ec (1d:62ec) +BrunoScript_762ec: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -20,27 +20,27 @@ BrunoScript_762ec: ; 762ec (1d:62ec) .asm_76300 ld a, $24 -BrunoScript_76302: ; 76302 (1d:6302) +BrunoScript_76302: ld [wNewTileBlockID], a lb bc, 0, 2 predef_jump ReplaceTileBlock -BrunoScript_7630d: ; 7630d (1d:630d) +BrunoScript_7630d: xor a ld [W_BRUNOCURSCRIPT], a ret -BrunoScriptPointers: ; 76312 (1d:6312) +BrunoScriptPointers: dw BrunoScript0 dw DisplayEnemyTrainerTextAndStartBattle dw BrunoScript2 dw BrunoScript3 dw BrunoScript4 -BrunoScript4: ; 7631c (1d:631c) +BrunoScript4: ret -BrunoScript_7631d: ; 7631d (1d:631d) +BrunoScript_7631d: ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -57,7 +57,7 @@ BrunoScript_7631d: ; 7631d (1d:631d) ld [W_CURMAPSCRIPT], a ret -BrunoScript0: ; 76339 (1d:6339) +BrunoScript0: ld hl, CoordsData_7637a call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -85,14 +85,14 @@ BrunoScript0: ; 76339 (1d:6339) ld [W_CURMAPSCRIPT], a ret -CoordsData_7637a: ; 7637a (1d:637a) +CoordsData_7637a: db $0A,$04 db $0A,$05 db $0B,$04 db $0B,$05 db $FF -BrunoScript3: ; 76383 (1d:6383) +BrunoScript3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -103,7 +103,7 @@ BrunoScript3: ; 76383 (1d:6383) ld [W_CURMAPSCRIPT], a ret -BrunoScript2: ; 76396 (1d:6396) +BrunoScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff @@ -112,12 +112,12 @@ BrunoScript2: ; 76396 (1d:6396) ld [hSpriteIndexOrTextID], a jp DisplayTextID -BrunoTextPointers: ; 763a8 (1d:63a8) +BrunoTextPointers: dw BrunoText1 dw BrunoDontRunAwayText -BrunoTrainerHeaders: ; 763ac (1d:63ac) -BrunoTrainerHeader0: ; 763ac (1d:63ac) +BrunoTrainerHeaders: +BrunoTrainerHeader0: dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 @@ -128,24 +128,24 @@ BrunoTrainerHeader0: ; 763ac (1d:63ac) db $ff -BrunoText1: ; 763b9 (1d:63b9) +BrunoText1: TX_ASM ld hl, BrunoTrainerHeader0 call TalkToTrainer jp TextScriptEnd -BrunoBeforeBattleText: ; 763c3 (1d:63c3) +BrunoBeforeBattleText: TX_FAR _BrunoBeforeBattleText db "@" -BrunoEndBattleText: ; 763c8 (1d:63c8) +BrunoEndBattleText: TX_FAR _BrunoEndBattleText db "@" -BrunoAfterBattleText: ; 763cd (1d:63cd) +BrunoAfterBattleText: TX_FAR _BrunoAfterBattleText db "@" -BrunoDontRunAwayText: ; 763d2 (1d:63d2) +BrunoDontRunAwayText: TX_FAR _BrunoDontRunAwayText db "@" diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm index 233b38bd..c36c4ad7 100755 --- a/scripts/celadoncity.asm +++ b/scripts/celadoncity.asm @@ -1,4 +1,4 @@ -CeladonCityScript: ; 19a43 (6:5a43) +CeladonCityScript: call EnableAutoTextBoxDrawing ld hl, CeladonCityScriptPointers ld a, [W_CELADONCITYCURSCRIPT] @@ -13,7 +13,7 @@ CeladonCityScript1: ResetEvent EVENT_67F ret -CeladonCityTextPointers: ; 19966 (6:5966) +CeladonCityTextPointers: dw CeladonCityText1 dw CeladonCityText2 dw CeladonCityText3 @@ -33,23 +33,23 @@ CeladonCityTextPointers: ; 19966 (6:5966) dw CeladonCityText17 dw CeladonCityText18 -CeladonCityText1: ; 1998a (6:598a) +CeladonCityText1: TX_FAR _CeladonCityText1 db "@" -CeladonCityText2: ; 1998f (6:598f) +CeladonCityText2: TX_FAR _CeladonCityText2 db "@" -CeladonCityText3: ; 19994 (6:5994) +CeladonCityText3: TX_FAR _CeladonCityText3 db "@" -CeladonCityText4: ; 19999 (6:5999) +CeladonCityText4: TX_FAR _CeladonCityText4 db "@" -CeladonCityText5: ; 1999e (6:599e) +CeladonCityText5: TX_ASM CheckEvent EVENT_GOT_TM41 jr nz, .asm_7053f @@ -72,70 +72,70 @@ CeladonCityText5: ; 1999e (6:599e) .Done jp TextScriptEnd -TM41PreText: ; 199d2 (6:59d2) +TM41PreText: TX_FAR _TM41PreText db "@" -ReceivedTM41Text: ; 199d7 (6:59d7) +ReceivedTM41Text: TX_FAR _ReceivedTM41Text db $0B, "@" -TM41ExplanationText: ; 199dd (6:59dd) +TM41ExplanationText: TX_FAR _TM41ExplanationText db "@" -TM41NoRoomText: ; 199e2 (6:59e2) +TM41NoRoomText: TX_FAR _TM41NoRoomText db "@" -CeladonCityText6: ; 199e7 (6:59e7) +CeladonCityText6: TX_FAR _CeladonCityText6 db "@" -CeladonCityText7: ; 199ec (6:59ec) +CeladonCityText7: TX_FAR _CeladonCityText7 TX_ASM ld a, POLIWRATH call PlayCry jp TextScriptEnd -CeladonCityText8: ; 199f9 (6:59f9) +CeladonCityText8: TX_FAR _CeladonCityText8 db "@" -CeladonCityText9: ; 199fe (6:59fe) +CeladonCityText9: TX_FAR _CeladonCityText9 db "@" -CeladonCityText10: ; 19a03 (6:5a03) +CeladonCityText10: TX_ASM callba Func_f1ac6 jp TextScriptEnd -CeladonCityText11: ; 19a08 (6:5a08) +CeladonCityText11: TX_FAR _CeladonCityText11 db "@" -CeladonCityText13: ; 19a0d (6:5a0d) +CeladonCityText13: TX_FAR _CeladonCityText13 db "@" -CeladonCityText14: ; 19a12 (6:5a12) +CeladonCityText14: TX_FAR _CeladonCityText14 db "@" -CeladonCityText15: ; 19a17 (6:5a17) +CeladonCityText15: TX_FAR _CeladonCityText15 db "@" -CeladonCityText16: ; 19a1c (6:5a1c) +CeladonCityText16: TX_FAR _CeladonCityText16 db "@" -CeladonCityText17: ; 19a21 (6:5a21) +CeladonCityText17: TX_FAR _CeladonCityText17 db "@" -CeladonCityText18: ; 19a26 (6:5a26) +CeladonCityText18: TX_FAR _CeladonCityText18 db "@" diff --git a/scripts/celadondiner.asm b/scripts/celadondiner.asm index 944a0952..6ecada9e 100755 --- a/scripts/celadondiner.asm +++ b/scripts/celadondiner.asm @@ -1,31 +1,31 @@ -CeladonDinerScript: ; 49151 (12:5151) +CeladonDinerScript: call EnableAutoTextBoxDrawing ret -CeladonDinerTextPointers: ; 49155 (12:5155) +CeladonDinerTextPointers: dw CeladonDinerText1 dw CeladonDinerText2 dw CeladonDinerText3 dw CeladonDinerText4 dw CeladonDinerText5 -CeladonDinerText1: ; 4915f (12:515f) +CeladonDinerText1: TX_FAR _CeladonDinerText1 db "@" -CeladonDinerText2: ; 49164 (12:5164) +CeladonDinerText2: TX_FAR _CeladonDinerText2 db "@" -CeladonDinerText3: ; 49169 (12:5169) +CeladonDinerText3: TX_FAR _CeladonDinerText3 db "@" -CeladonDinerText4: ; 4916e (12:516e) +CeladonDinerText4: TX_FAR _CeladonDinerText4 db "@" -CeladonDinerText5: ; 49173 (12:5173) +CeladonDinerText5: TX_ASM callab Func_f1f31 jp TextScriptEnd diff --git a/scripts/celadondiner2.asm b/scripts/celadondiner2.asm index cfab218b..8cd66a19 100755 --- a/scripts/celadondiner2.asm +++ b/scripts/celadondiner2.asm @@ -20,19 +20,19 @@ Func_f1f31: .asm_68b61 ret -CeladonDinerText_491a7: ; 491a7 (12:51a7) +CeladonDinerText_491a7: TX_FAR _CeladonDinerText_491a7 db "@" -ReceivedCoinCaseText: ; 491ac (12:51ac) +ReceivedCoinCaseText: TX_FAR _ReceivedCoinCaseText TX_SFX_KEY_ITEM db "@" -CoinCaseNoRoomText: ; 491b2 (12:51b2) +CoinCaseNoRoomText: TX_FAR _CoinCaseNoRoomText db "@" -CeladonDinerText_491b7: ; 491b7 (12:51b7) +CeladonDinerText_491b7: TX_FAR _CeladonDinerText_491b7 db "@" diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 0013be1b..d0433efd 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -1,4 +1,4 @@ -CeladonGameCornerScript: ; 48bbd (12:4bbd) +CeladonGameCornerScript: call CeladonGameCornerScript_48bcf call CeladonGameCornerScript_48bec call EnableAutoTextBoxDrawing @@ -6,7 +6,7 @@ CeladonGameCornerScript: ; 48bbd (12:4bbd) ld a, [W_CELADONGAMECORNERCURSCRIPT] jp JumpTable -CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) +CeladonGameCornerScript_48bcf: ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -23,7 +23,7 @@ CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) ld [wLuckySlotHiddenObjectIndex], a ret -CeladonGameCornerScript_48bec: ; 48bec (12:4bec) +CeladonGameCornerScript_48bec: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -35,22 +35,22 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec) lb bc, 2, 8 predef_jump ReplaceTileBlock -CeladonGameCornerScript_48c07: ; 48c07 (12:4c07) +CeladonGameCornerScript_48c07: xor a ld [wJoyIgnore], a ld [W_CELADONGAMECORNERCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -CeladonGameCornerScriptPointers: ; 48c12 (12:4c12) +CeladonGameCornerScriptPointers: dw CeladonGameCornerScript0 dw CeladonGameCornerScript1 dw CeladonGameCornerScript2 -CeladonGameCornerScript0: ; 48c18 (12:4c18) +CeladonGameCornerScript0: ret -CeladonGameCornerScript1: ; 48c19 (12:4c19) +CeladonGameCornerScript1: ld a, [wIsInBattle] cp $ff jp z, CeladonGameCornerScript_48c07 @@ -85,7 +85,7 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) ld [W_CELADONGAMECORNERCURSCRIPT], a ret -MovementData_48c5a: ; 48c5a (12:4c5a) +MovementData_48c5a: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -96,7 +96,7 @@ MovementData_48c5a: ; 48c5a (12:4c5a) db NPC_MOVEMENT_RIGHT db $FF -MovementData_48c63: ; 48c63 (12:4c63) +MovementData_48c63: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -104,7 +104,7 @@ MovementData_48c63: ; 48c63 (12:4c63) db NPC_MOVEMENT_RIGHT db $FF -CeladonGameCornerScript2: ; 48c69 (12:4c69) +CeladonGameCornerScript2: ld a, [wd730] bit 0, a ret nz @@ -120,7 +120,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69) ld [W_CELADONGAMECORNERCURSCRIPT], a ret -CeladonGameCornerTextPointers: ; 48c8a (12:4c8a) +CeladonGameCornerTextPointers: dw CeladonGameCornerText1 dw CeladonGameCornerText2 dw CeladonGameCornerText3 @@ -135,11 +135,11 @@ CeladonGameCornerTextPointers: ; 48c8a (12:4c8a) dw CeladonGameCornerText12 dw CeladonGameCornerText13 -CeladonGameCornerText1: ; 48ca4 (12:4ca4) +CeladonGameCornerText1: TX_FAR _CeladonGameCornerText1 db "@" -CeladonGameCornerText2: ; 48ca9 (12:4ca9) +CeladonGameCornerText2: TX_ASM call CeladonGameCornerScript_48f1e ld hl, CeladonGameCornerText_48d22 @@ -196,39 +196,39 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) call PrintText jp TextScriptEnd -CeladonGameCornerText_48d22: ; 48d22 (12:4d22) +CeladonGameCornerText_48d22: TX_FAR _CeladonGameCornerText_48d22 db "@" -CeladonGameCornerText_48d27: ; 48d27 (12:4d27) +CeladonGameCornerText_48d27: TX_FAR _CeladonGameCornerText_48d27 db "@" -CeladonGameCornerText_48d2c: ; 48d2c (12:4d2c) +CeladonGameCornerText_48d2c: TX_FAR _CeladonGameCornerText_48d2c db "@" -CeladonGameCornerText_48d31: ; 48d31 (12:4d31) +CeladonGameCornerText_48d31: TX_FAR _CeladonGameCornerText_48d31 db "@" -CeladonGameCornerText_48d36: ; 48d36 (12:4d36) +CeladonGameCornerText_48d36: TX_FAR _CeladonGameCornerText_48d36 db "@" -CeladonGameCornerText_48d3b: ; 48d3b (12:4d3b) +CeladonGameCornerText_48d3b: TX_FAR _CeladonGameCornerText_48d3b db "@" -CeladonGameCornerText3: ; 48d40 (12:4d40) +CeladonGameCornerText3: TX_FAR _CeladonGameCornerText3 db "@" -CeladonGameCornerText4: ; 48d45 (12:4d45) +CeladonGameCornerText4: TX_FAR _CeladonGameCornerText4 db "@" -CeladonGameCornerText5: ; 48d4a (12:4d4a) +CeladonGameCornerText5: TX_ASM CheckEvent EVENT_GOT_10_COINS jr nz, .asm_48d89 @@ -265,28 +265,28 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a) call PrintText jp TextScriptEnd -CeladonGameCornerText_48d9c: ; 48d9c (12:4d9c) +CeladonGameCornerText_48d9c: TX_FAR _CeladonGameCornerText_48d9c db "@" -Received10CoinsText: ; 48da1 (12:4da1) +Received10CoinsText: TX_FAR _Received10CoinsText TX_SFX_ITEM db "@" -CeladonGameCornerText_48da7: ; 48da7 (12:4da7) +CeladonGameCornerText_48da7: TX_FAR _CeladonGameCornerText_48da7 db "@" -CeladonGameCornerText_48dac: ; 48dac (12:4dac) +CeladonGameCornerText_48dac: TX_FAR _CeladonGameCornerText_48dac db "@" -CeladonGameCornerText6: ; 48db1 (12:4db1) +CeladonGameCornerText6: TX_FAR _CeladonGameCornerText6 db "@" -CeladonGameCornerText7: ; 48db6 (12:4db6) +CeladonGameCornerText7: TX_ASM CheckEvent EVENT_BEAT_ERIKA ld hl, CeladonGameCornerText_48dca @@ -296,19 +296,19 @@ CeladonGameCornerText7: ; 48db6 (12:4db6) call PrintText jp TextScriptEnd -CeladonGameCornerText_48dca: ; 48dca (12:4dca) +CeladonGameCornerText_48dca: TX_FAR _CeladonGameCornerText_48dca db "@" -CeladonGameCornerText_48dcf: ; 48dcf (12:4dcf) +CeladonGameCornerText_48dcf: TX_FAR _CeladonGameCornerText_48dcf db "@" -CeladonGameCornerText8: ; 48dd4 (12:4dd4) +CeladonGameCornerText8: TX_FAR _CeladonGameCornerText8 db "@" -CeladonGameCornerText9: ; 48dd9 (12:4dd9) +CeladonGameCornerText9: TX_ASM CheckEvent EVENT_GOT_20_COINS_2 jr nz, .asm_48e13 @@ -343,23 +343,23 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9) call PrintText jp TextScriptEnd -CeladonGameCornerText_48e26: ; 48e26 (12:4e26) +CeladonGameCornerText_48e26: TX_FAR _CeladonGameCornerText_48e26 db "@" -Received20CoinsText: ; 48e2b (12:4e2b) +Received20CoinsText: TX_FAR _Received20CoinsText db $0B, "@" -CeladonGameCornerText_48e31: ; 48e31 (12:4e31) +CeladonGameCornerText_48e31: TX_FAR _CeladonGameCornerText_48e31 db "@" -CeladonGameCornerText_48e36: ; 48e36 (12:4e36) +CeladonGameCornerText_48e36: TX_FAR _CeladonGameCornerText_48e36 db "@" -CeladonGameCornerText10: ; 48e3b (12:4e3b) +CeladonGameCornerText10: TX_ASM CheckEvent EVENT_GOT_20_COINS jr nz, .asm_48e75 @@ -394,23 +394,23 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b) call PrintText jp TextScriptEnd -CeladonGameCornerText_48e88: ; 48e88 (12:4e88) +CeladonGameCornerText_48e88: TX_FAR _CeladonGameCornerText_48e88 db "@" -CeladonGameCornerText_48e8d: ; 48e8d (12:4e8d) +CeladonGameCornerText_48e8d: TX_FAR _CeladonGameCornerText_48e8d db $0B, "@" -CeladonGameCornerText_48e93: ; 48e93 (12:4e93) +CeladonGameCornerText_48e93: TX_FAR _CeladonGameCornerText_48e93 db "@" -CeladonGameCornerText_48e98: ; 48e98 (12:4e98) +CeladonGameCornerText_48e98: TX_FAR _CeladonGameCornerText_48e98 db "@" -CeladonGameCornerText11: ; 48e9d (12:4e9d) +CeladonGameCornerText11: TX_ASM ld hl, CeladonGameCornerText_48ece call PrintText @@ -432,19 +432,19 @@ CeladonGameCornerText11: ; 48e9d (12:4e9d) ld [W_CELADONGAMECORNERCURSCRIPT], a jp TextScriptEnd -CeladonGameCornerText_48ece: ; 48ece (12:4ece) +CeladonGameCornerText_48ece: TX_FAR _CeladonGameCornerText_48ece db "@" -CeladonGameCornerText_48ed3: ; 48ed3 (12:4ed3) +CeladonGameCornerText_48ed3: TX_FAR _CeladonGameCornerText_48ed3 db "@" -CeladonGameCornerText13: ; 48ed8 (12:4ed8) +CeladonGameCornerText13: TX_FAR _CeladonGameCornerText_48ed8 db "@" -CeladonGameCornerText12: ; 48edd (12:4edd) +CeladonGameCornerText12: TX_ASM ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -461,7 +461,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd) predef ReplaceTileBlock jp TextScriptEnd -CeladonGameCornerText_48f09: ; 48f09 (12:4f09) +CeladonGameCornerText_48f09: TX_FAR _CeladonGameCornerText_48f09 TX_ASM ld a, SFX_SWITCH @@ -469,11 +469,11 @@ CeladonGameCornerText_48f09: ; 48f09 (12:4f09) call WaitForSoundToFinish jp TextScriptEnd -CeladonGameCornerText_48f19: ; 48f19 (12:4f19) +CeladonGameCornerText_48f19: TX_FAR _CeladonGameCornerText_48f19 db "@" -CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) +CeladonGameCornerScript_48f1e: ld hl, wd730 set 6, [hl] coord hl, 11, 0 @@ -507,19 +507,19 @@ CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) res 6, [hl] ret -GameCornerMoneyText: ; 48f7a (12:4f7a) +GameCornerMoneyText: db "MONEY@" -GameCornerCoinText: ; 48f80 (12:4f80) +GameCornerCoinText: db "COIN@" -GameCornerBlankText1: ; 48f85 (12:4f85) +GameCornerBlankText1: db " @" -GameCornerBlankText2: ; 48f8d (12:4f8d) +GameCornerBlankText2: db " @" -Has9990Coins: ; 48f95 (12:4f95) +Has9990Coins: ld a, $99 ld [hCoins], a ld a, $90 diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 6588b25e..1021aef1 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -1,4 +1,4 @@ -CeladonGymScript: ; 4890a (12:490a) +CeladonGymScript: ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -11,38 +11,38 @@ CeladonGymScript: ; 4890a (12:490a) ld [W_CELADONGYMCURSCRIPT], a ret -CeladonGymScript_48927: ; 48927 (12:4927) +CeladonGymScript_48927: ld hl, Gym4CityName ld de, Gym4LeaderName jp LoadGymLeaderAndCityName -Gym4CityName: ; 48930 (12:4930) +Gym4CityName: db "CELADON CITY@" -Gym4LeaderName: ; 4893d (12:493d) +Gym4LeaderName: db "ERIKA@" -CeladonGymText_48943: ; 48943 (12:4943) +CeladonGymText_48943: xor a ld [wJoyIgnore], a ld [W_CELADONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -CeladonGymScriptPointers: ; 4894e (12:494e) +CeladonGymScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw CeladonGymScript3 -CeladonGymScript3: ; 48956 (12:4956) +CeladonGymScript3: ld a, [wIsInBattle] cp $ff jp z, CeladonGymText_48943 ld a, $f0 ld [wJoyIgnore], a -CeladonGymText_48963: ; 48963 (12:4963) +CeladonGymText_48963: ld a, $9 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -70,7 +70,7 @@ CeladonGymText_48963: ; 48963 (12:4963) jp CeladonGymText_48943 -CeladonGymTextPointers: ; 489a6 (12:49a6) +CeladonGymTextPointers: dw CeladonGymText1 dw CeladonGymText2 dw CeladonGymText3 @@ -83,8 +83,8 @@ CeladonGymTextPointers: ; 489a6 (12:49a6) dw TM21Text dw TM21NoRoomText -CeladonGymTrainerHeaders: ; 489bc (12:49bc) -CeladonGymTrainerHeader0: ; 489bc (12:49bc) +CeladonGymTrainerHeaders: +CeladonGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_0 @@ -93,7 +93,7 @@ CeladonGymTrainerHeader0: ; 489bc (12:49bc) dw CeladonGymEndBattleText2 ; TextEndBattle dw CeladonGymEndBattleText2 ; TextEndBattle -CeladonGymTrainerHeader2: ; 489c8 (12:49c8) +CeladonGymTrainerHeader2: dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2 @@ -102,7 +102,7 @@ CeladonGymTrainerHeader2: ; 489c8 (12:49c8) dw CeladonGymEndBattleText3 ; TextEndBattle dw CeladonGymEndBattleText3 ; TextEndBattle -CeladonGymTrainerHeader3: ; 489d4 (12:49d4) +CeladonGymTrainerHeader3: dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3 @@ -111,7 +111,7 @@ CeladonGymTrainerHeader3: ; 489d4 (12:49d4) dw CeladonGymEndBattleText4 ; TextEndBattle dw CeladonGymEndBattleText4 ; TextEndBattle -CeladonGymTrainerHeader4: ; 489e0 (12:49e0) +CeladonGymTrainerHeader4: dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4 @@ -120,7 +120,7 @@ CeladonGymTrainerHeader4: ; 489e0 (12:49e0) dw CeladonGymEndBattleText5 ; TextEndBattle dw CeladonGymEndBattleText5 ; TextEndBattle -CeladonGymTrainerHeader5: ; 489ec (12:49ec) +CeladonGymTrainerHeader5: dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5 @@ -129,7 +129,7 @@ CeladonGymTrainerHeader5: ; 489ec (12:49ec) dw CeladonGymEndBattleText6 ; TextEndBattle dw CeladonGymEndBattleText6 ; TextEndBattle -CeladonGymTrainerHeader6: ; 489f8 (12:49f8) +CeladonGymTrainerHeader6: dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6 @@ -138,7 +138,7 @@ CeladonGymTrainerHeader6: ; 489f8 (12:49f8) dw CeladonGymEndBattleText7 ; TextEndBattle dw CeladonGymEndBattleText7 ; TextEndBattle -CeladonGymTrainerHeader7: ; 48a04 (12:4a04) +CeladonGymTrainerHeader7: dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_7, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_7, 1 @@ -149,7 +149,7 @@ CeladonGymTrainerHeader7: ; 48a04 (12:4a04) db $ff -CeladonGymText1: ; 48a11 (12:4a11) +CeladonGymText1: TX_ASM CheckEvent EVENT_BEAT_ERIKA jr z, .asm_48a2d @@ -183,154 +183,154 @@ CeladonGymText1: ; 48a11 (12:4a11) .asm_48a5b jp TextScriptEnd -CeladonGymText_48a5e: ; 48a5e (12:4a5e) +CeladonGymText_48a5e: TX_FAR _CeladonGymText_48a5e db "@" -CeladonGymText_48a63: ; 48a63 (12:4a63) +CeladonGymText_48a63: TX_FAR _CeladonGymText_48a63 db "@" -CeladonGymText_48a68: ; 48a68 (12:4a68) +CeladonGymText_48a68: TX_FAR _CeladonGymText_48a68 db "@" -CeladonGymText9: ; 48a6d (12:4a6d) +CeladonGymText9: TX_FAR _CeladonGymText9 db "@" -TM21Text: ; 48a72 (12:4a72) +TM21Text: TX_FAR _ReceivedTM21Text db $0B TX_FAR _TM21ExplanationText db "@" -TM21NoRoomText: ; 48a7c (12:4a7c) +TM21NoRoomText: TX_FAR _TM21NoRoomText db "@" -CeladonGymText2: ; 48a81 (12:4a81) +CeladonGymText2: TX_ASM ld hl, CeladonGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -CeladonGymBattleText2: ; 48a8b (12:4a8b) +CeladonGymBattleText2: TX_FAR _CeladonGymBattleText2 db "@" -CeladonGymEndBattleText2: ; 48a90 (12:4a90) +CeladonGymEndBattleText2: TX_FAR _CeladonGymEndBattleText2 db "@" -CeladonGymAfterBattleText2: ; 48a95 (12:4a95) +CeladonGymAfterBattleText2: TX_FAR _CeladonGymAfterBattleText2 db "@" -CeladonGymText3: ; 48a9a (12:4a9a) +CeladonGymText3: TX_ASM ld hl, CeladonGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd -CeladonGymBattleText3: ; 48aa4 (12:4aa4) +CeladonGymBattleText3: TX_FAR _CeladonGymBattleText3 db "@" -CeladonGymEndBattleText3: ; 48aa9 (12:4aa9) +CeladonGymEndBattleText3: TX_FAR _CeladonGymEndBattleText3 db "@" -CeladonGymAfterBattleText3: ; 48aae (12:4aae) +CeladonGymAfterBattleText3: TX_FAR _CeladonGymAfterBattleText3 db "@" -CeladonGymText4: ; 48ab3 (12:4ab3) +CeladonGymText4: TX_ASM ld hl, CeladonGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd -CeladonGymBattleText4: ; 48abd (12:4abd) +CeladonGymBattleText4: TX_FAR _CeladonGymBattleText4 db "@" -CeladonGymEndBattleText4: ; 48ac2 (12:4ac2) +CeladonGymEndBattleText4: TX_FAR _CeladonGymEndBattleText4 db "@" -CeladonGymAfterBattleText4: ; 48ac7 (12:4ac7) +CeladonGymAfterBattleText4: TX_FAR _CeladonGymAfterBattleText4 db "@" -CeladonGymText5: ; 48acc (12:4acc) +CeladonGymText5: TX_ASM ld hl, CeladonGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd -CeladonGymBattleText5: ; 48ad6 (12:4ad6) +CeladonGymBattleText5: TX_FAR _CeladonGymBattleText5 db "@" -CeladonGymEndBattleText5: ; 48adb (12:4adb) +CeladonGymEndBattleText5: TX_FAR _CeladonGymEndBattleText5 db "@" -CeladonGymAfterBattleText5: ; 48ae0 (12:4ae0) +CeladonGymAfterBattleText5: TX_FAR _CeladonGymAfterBattleText5 db "@" -CeladonGymText6: ; 48ae5 (12:4ae5) +CeladonGymText6: TX_ASM ld hl, CeladonGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd -CeladonGymBattleText6: ; 48aef (12:4aef) +CeladonGymBattleText6: TX_FAR _CeladonGymBattleText6 db "@" -CeladonGymEndBattleText6: ; 48af4 (12:4af4) +CeladonGymEndBattleText6: TX_FAR _CeladonGymEndBattleText6 db "@" -CeladonGymAfterBattleText6: ; 48af9 (12:4af9) +CeladonGymAfterBattleText6: TX_FAR _CeladonGymAfterBattleText6 db "@" -CeladonGymText7: ; 48afe (12:4afe) +CeladonGymText7: TX_ASM ld hl, CeladonGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd -CeladonGymBattleText7: ; 48b08 (12:4b08) +CeladonGymBattleText7: TX_FAR _CeladonGymBattleText7 db "@" -CeladonGymEndBattleText7: ; 48b0d (12:4b0d) +CeladonGymEndBattleText7: TX_FAR _CeladonGymEndBattleText7 db "@" -CeladonGymAfterBattleText7: ; 48b12 (12:4b12) +CeladonGymAfterBattleText7: TX_FAR _CeladonGymAfterBattleText7 db "@" -CeladonGymText8: ; 48b17 (12:4b17) +CeladonGymText8: TX_ASM ld hl, CeladonGymTrainerHeader7 call TalkToTrainer jp TextScriptEnd -CeladonGymBattleText8: ; 48b21 (12:4b21) +CeladonGymBattleText8: TX_FAR _CeladonGymBattleText8 db "@" -CeladonGymEndBattleText8: ; 48b26 (12:4b26) +CeladonGymEndBattleText8: TX_FAR _CeladonGymEndBattleText8 db "@" -CeladonGymAfterBattleText8: ; 48b2b (12:4b2b) +CeladonGymAfterBattleText8: TX_FAR _CeladonGymAfterBattleText8 db "@" diff --git a/scripts/celadonhotel.asm b/scripts/celadonhotel.asm index a0f80ff6..23b9eb55 100755 --- a/scripts/celadonhotel.asm +++ b/scripts/celadonhotel.asm @@ -1,19 +1,19 @@ -CeladonHotelScript: ; 49269 (12:5269) +CeladonHotelScript: jp EnableAutoTextBoxDrawing -CeladonHotelTextPointers: ; 4926c (12:526c) +CeladonHotelTextPointers: dw CeladonHotelText1 dw CeladonHotelText2 dw CeladonHotelText3 -CeladonHotelText1: ; 49272 (12:5272) +CeladonHotelText1: TX_FAR _CeladonHotelText1 db "@" -CeladonHotelText2: ; 49277 (12:5277) +CeladonHotelText2: TX_FAR _CeladonHotelText2 db "@" -CeladonHotelText3: ; 4927c (12:527c) +CeladonHotelText3: TX_FAR _CeladonHotelText3 db "@" diff --git a/scripts/celadonhouse.asm b/scripts/celadonhouse.asm index aa94f2fd..7f2778d1 100755 --- a/scripts/celadonhouse.asm +++ b/scripts/celadonhouse.asm @@ -1,20 +1,20 @@ -CeladonHouseScript: ; 4920e (12:520e) +CeladonHouseScript: call EnableAutoTextBoxDrawing ret -CeladonHouseTextPointers: ; 49212 (12:5212) +CeladonHouseTextPointers: dw CeladonHouseText1 dw CeladonHouseText2 dw CeladonHouseText3 -CeladonHouseText1: ; 49218 (12:5218) +CeladonHouseText1: TX_FAR _CeladonHouseText1 db "@" -CeladonHouseText2: ; 4921d (12:521d) +CeladonHouseText2: TX_FAR _CeladonHouseText2 db "@" -CeladonHouseText3: ; 49222 (12:5222) +CeladonHouseText3: TX_FAR _CeladonHouseText3 db "@" diff --git a/scripts/celadonmansion1.asm b/scripts/celadonmansion1.asm index b29ee196..59d9d1d8 100755 --- a/scripts/celadonmansion1.asm +++ b/scripts/celadonmansion1.asm @@ -1,22 +1,22 @@ -CeladonMansion1Script: ; 48694 (12:4694) +CeladonMansion1Script: call EnableAutoTextBoxDrawing ret -CeladonMansion1TextPointers: ; 48697 (12:4697) +CeladonMansion1TextPointers: dw CeladonMansion1Text1 dw CeladonMansion1Text2 dw CeladonMansion1Text3 dw CeladonMansion1Text4 dw CeladonMansion1Text5 -CeladonMansion1Text1: ; 486a7 (12:46a7) +CeladonMansion1Text1: TX_FAR _CeladonMansion1Text1 TX_ASM ld a, MEOWTH call PlayCry jp TextScriptEnd -CeladonMansion1Text2: ; 486b1 (12:46b1) +CeladonMansion1Text2: TX_ASM callba Func_f1e70 ld a, [wPikachuHappiness] @@ -29,20 +29,20 @@ CeladonMansion1Text2: ; 486b1 (12:46b1) .asm_485d9 jp TextScriptEnd -CeladonMansion1Text3: ; 486b6 (12:46b6) +CeladonMansion1Text3: TX_FAR _CeladonMansion1Text3 TX_ASM ld a, CLEFAIRY call PlayCry jp TextScriptEnd -CeladonMansion1Text4: ; 486c0 (12:46c0) +CeladonMansion1Text4: TX_FAR _CeladonMansion1Text4 TX_ASM ld a, NIDORAN_F call PlayCry jp TextScriptEnd -CeladonMansion1Text5: ; 486ca (12:46ca) +CeladonMansion1Text5: TX_FAR _CeladonMansion1Text5 db "@" diff --git a/scripts/celadonmansion2.asm b/scripts/celadonmansion2.asm index 7f7e5d45..520615d4 100755 --- a/scripts/celadonmansion2.asm +++ b/scripts/celadonmansion2.asm @@ -1,10 +1,10 @@ -CeladonMansion2Script: ; 4873a (12:473a) +CeladonMansion2Script: call EnableAutoTextBoxDrawing ret -CeladonMansion2TextPointers: ; 4873e (12:473e) +CeladonMansion2TextPointers: dw CeladonMansion2Text1 -CeladonMansion2Text1: ; 48740 (12:4740) +CeladonMansion2Text1: TX_FAR _CeladonMansion2Text1 db "@" diff --git a/scripts/celadonmansion3.asm b/scripts/celadonmansion3.asm index 51f61e94..6693f6a6 100755 --- a/scripts/celadonmansion3.asm +++ b/scripts/celadonmansion3.asm @@ -1,4 +1,4 @@ -CeladonMansion3Script: ; 48790 (12:4790) +CeladonMansion3Script: call EnableAutoTextBoxDrawing ret @@ -9,7 +9,7 @@ CeladonMansion3_PokedexCount: ld a, [wNumSetBits] ret -CeladonMansion3TextPointers: ; 48793 (12:4793) +CeladonMansion3TextPointers: dw ProgrammerText dw GraphicArtistText dw WriterText @@ -19,7 +19,7 @@ CeladonMansion3TextPointers: ; 48793 (12:4793) dw GameFreakPCText3 dw GameFreakSignText -ProgrammerText: ; 487a3 (12:47a3) +ProgrammerText: TX_ASM call CeladonMansion3_PokedexCount cp 150 @@ -38,7 +38,7 @@ CeladonMansion3Text_486f5: TX_FAR _ProgrammerText2 db "@" -GraphicArtistText: ; 487a8 (12:47a8) +GraphicArtistText: TX_ASM call CeladonMansion3_PokedexCount cp 150 @@ -100,7 +100,7 @@ CeladonMansion3Text_4876b: TX_FAR _GraphicArtistText5 db "@" -WriterText: ; 487ad (12:47ad) +WriterText: TX_ASM call CeladonMansion3_PokedexCount cp 150 @@ -119,7 +119,7 @@ CeladonMansion3Text_48789: TX_FAR _WriterText2 db "@" -DirectorText: ; 487b2 (12:47b2) +DirectorText: TX_ASM call CeladonMansion3_PokedexCount ; check pokédex @@ -138,7 +138,7 @@ DirectorText: ; 487b2 (12:47b2) call PrintText jp TextScriptEnd -.GameDesigner ; 487d0 (12:47d0) +.GameDesigner TX_FAR _GameDesignerText db "@" @@ -155,22 +155,22 @@ DirectorText: ; 487b2 (12:47b2) TX_FAR _CompletedDexText2 db "@" -GameFreakPCText1: ; 487eb (12:47eb) +GameFreakPCText1: TX_ASM callba Func_f1ef3 jp TextScriptEnd -GameFreakPCText2: ; 487f0 (12:47f0) +GameFreakPCText2: TX_ASM callba Func_f1eff jp TextScriptEnd -GameFreakPCText3: ; 487f5 (12:47f5) +GameFreakPCText3: TX_ASM callba Func_f1f0b jp TextScriptEnd -GameFreakSignText: ; 487fa (12:47fa) +GameFreakSignText: TX_ASM callba Func_f1f17 jp TextScriptEnd diff --git a/scripts/celadonmansion3_2.asm b/scripts/celadonmansion3_2.asm index 2d5069d1..3a7035ba 100755 --- a/scripts/celadonmansion3_2.asm +++ b/scripts/celadonmansion3_2.asm @@ -3,7 +3,7 @@ Func_f1ef3: call PrintText ret -CeladonMansion3Text_f1efa: ; 487eb (12:47eb) +CeladonMansion3Text_f1efa: TX_FAR _CeladonMansion3Text5 db "@" @@ -12,7 +12,7 @@ Func_f1eff: call PrintText ret -CeladonMansion3Text_f1f06: ; 487f0 (12:47f0) +CeladonMansion3Text_f1f06: TX_FAR _CeladonMansion3Text6 db "@" @@ -21,7 +21,7 @@ Func_f1f0b: call PrintText ret -CeladonMansion3Text_f1f12: ; 487f5 (12:47f5) +CeladonMansion3Text_f1f12: TX_FAR _CeladonMansion3Text7 db "@" @@ -30,6 +30,6 @@ Func_f1f17: call PrintText ret -CeladonMansion3Text_f1f1e: ; 487fa (12:47fa) +CeladonMansion3Text_f1f1e: TX_FAR _CeladonMansion3Text8 db "@" diff --git a/scripts/celadonmansion4.asm b/scripts/celadonmansion4.asm index 475baff3..483aa4fd 100755 --- a/scripts/celadonmansion4.asm +++ b/scripts/celadonmansion4.asm @@ -1,10 +1,10 @@ -CeladonMansion4Script: ; 4886b (12:486b) +CeladonMansion4Script: call EnableAutoTextBoxDrawing ret -CeladonMansion4TextPointers: ; 4886e (12:486e) +CeladonMansion4TextPointers: dw CeladonMansion4Text1 -CeladonMansion4Text1: ; 48870 (12:4870) +CeladonMansion4Text1: TX_FAR _CeladonMansion4Text1 db "@" diff --git a/scripts/celadonmansion5.asm b/scripts/celadonmansion5.asm index 346eb6bb..c2da8c6d 100755 --- a/scripts/celadonmansion5.asm +++ b/scripts/celadonmansion5.asm @@ -1,16 +1,16 @@ -CeladonMansion5Script: ; 1dd3a (7:5d3a) +CeladonMansion5Script: call EnableAutoTextBoxDrawing ret -CeladonMansion5TextPointers: ; 1dd3d (7:5d3d) +CeladonMansion5TextPointers: dw CeladonMansion5Text1 dw CeladonMansion5Text2 -CeladonMansion5Text1: ; 1dd41 (7:5d41) +CeladonMansion5Text1: TX_FAR _CeladonMansion5Text1 db "@" -CeladonMansion5Text2: ; 1dd46 (7:5d46) +CeladonMansion5Text2: TX_ASM lb bc, EEVEE, 25 call GivePokemon diff --git a/scripts/celadonmart1.asm b/scripts/celadonmart1.asm index 4f297a6e..64c4a087 100755 --- a/scripts/celadonmart1.asm +++ b/scripts/celadonmart1.asm @@ -1,20 +1,20 @@ -CeladonMart1Script: ; 60f86 (18:4f86) +CeladonMart1Script: call EnableAutoTextBoxDrawing ret -CeladonMart1TextPointers: ; 60f89 (18:4f89) +CeladonMart1TextPointers: dw CeladonMart1Text1 dw CeladonMart1Text2 dw CeladonMart1Text3 -CeladonMart1Text1: ; 60f8f (18:4f8f) +CeladonMart1Text1: TX_FAR _CeladonMart1Text1 db "@" -CeladonMart1Text2: ; 60f94 (18:4f94) +CeladonMart1Text2: TX_FAR _CeladonMart1Text2 db "@" -CeladonMart1Text3: ; 60f99 (18:4f99) +CeladonMart1Text3: TX_FAR _CeladonMart1Text3 db "@" diff --git a/scripts/celadonmart2.asm b/scripts/celadonmart2.asm index 92f04399..b8128c54 100755 --- a/scripts/celadonmart2.asm +++ b/scripts/celadonmart2.asm @@ -1,21 +1,21 @@ -CeladonMart2Script: ; 560f5 (15:60f5) +CeladonMart2Script: jp EnableAutoTextBoxDrawing -CeladonMart2TextPointers: ; 560f8 (15:60f8) +CeladonMart2TextPointers: dw CeladonMart2Text1 dw CeladonMart2Text2 dw CeladonMart2Text3 dw CeladonMart2Text4 dw CeladonMart2Text5 -CeladonMart2Text3: ; 56102 (15:6102) +CeladonMart2Text3: TX_FAR _CeladonMart2Text3 db "@" -CeladonMart2Text4: ; 56107 (15:6107) +CeladonMart2Text4: TX_FAR _CeladonMart2Text4 db "@" -CeladonMart2Text5: ; 5610c (15:610c) +CeladonMart2Text5: TX_FAR _CeladonMart2Text5 db "@" diff --git a/scripts/celadonmart3.asm b/scripts/celadonmart3.asm index 49e5e84b..25bf4e80 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/celadonmart3.asm @@ -1,7 +1,7 @@ -CeladonMart3Script: ; 48225 (12:4225) +CeladonMart3Script: jp EnableAutoTextBoxDrawing -CeladonMart3TextPointers: ; 48228 (12:4228) +CeladonMart3TextPointers: dw CeladonMart3Text1 dw CeladonMart3Text2 dw CeladonMart3Text3 @@ -20,56 +20,56 @@ CeladonMart3TextPointers: ; 48228 (12:4228) dw CeladonMart3Text16 dw CeladonMart3Text17 -CeladonMart3Text1: ; 4824a (12:424a) +CeladonMart3Text1: TX_ASM callab Func_f1e30 jp TextScriptEnd -CeladonMart3Text2: ; 4828d (12:428d) +CeladonMart3Text2: TX_FAR _CeladonMart3Text2 db "@" -CeladonMart3Text3: ; 48292 (12:4292) +CeladonMart3Text3: TX_FAR _CeladonMart3Text3 db "@" -CeladonMart3Text4: ; 48297 (12:4297) +CeladonMart3Text4: TX_FAR _CeladonMart3Text4 db "@" -CeladonMart3Text5: ; 4829c (12:429c) +CeladonMart3Text5: TX_FAR _CeladonMart3Text5 db "@" CeladonMart3Text12 -CeladonMart3Text10: ; 482a1 (12:42a1) -CeladonMart3Text8: ; 482a1 (12:42a1) -CeladonMart3Text6: ; 482a1 (12:42a1) +CeladonMart3Text10: +CeladonMart3Text8: +CeladonMart3Text6: TX_FAR _CeladonMart3Text6 db "@" -CeladonMart3Text7: ; 482a6 (12:42a6) +CeladonMart3Text7: TX_FAR _CeladonMart3Text7 db "@" -CeladonMart3Text9: ; 482ab (12:42ab) +CeladonMart3Text9: TX_FAR _CeladonMart3Text9 db "@" -CeladonMart3Text11: ; 482b0 (12:42b0) +CeladonMart3Text11: TX_FAR _CeladonMart3Text11 db "@" -CeladonMart3Text13: ; 482b5 (12:42b5) +CeladonMart3Text13: TX_FAR _CeladonMart3Text13 db "@" -CeladonMart3Text14: ; 482ba (12:42ba) +CeladonMart3Text14: TX_FAR _CeladonMart3Text14 db "@" -CeladonMart3Text17: ; 482bf (12:42bf) -CeladonMart3Text16: ; 482bf (12:42bf) -CeladonMart3Text15: ; 482bf (12:42bf) +CeladonMart3Text17: +CeladonMart3Text16: +CeladonMart3Text15: TX_FAR _CeladonMart3Text15 db "@" diff --git a/scripts/celadonmart4.asm b/scripts/celadonmart4.asm index dfe2b90a..f547ca62 100755 --- a/scripts/celadonmart4.asm +++ b/scripts/celadonmart4.asm @@ -1,20 +1,20 @@ -CeladonMart4Script: ; 48356 (12:4356) +CeladonMart4Script: jp EnableAutoTextBoxDrawing -CeladonMart4TextPointers: ; 48359 (12:4359) +CeladonMart4TextPointers: dw CeladonMart4Text1 dw CeladonMart4Text2 dw CeladonMart4Text3 dw CeladonMart4Text4 -CeladonMart4Text2: ; 48361 (12:4361) +CeladonMart4Text2: TX_FAR _CeladonMart4Text2 db "@" -CeladonMart4Text3: ; 48366 (12:4366) +CeladonMart4Text3: TX_FAR _CeladonMart4Text3 db "@" -CeladonMart4Text4: ; 4836b (12:436b) +CeladonMart4Text4: TX_FAR _CeladonMart4Text4 db "@" diff --git a/scripts/celadonmart5.asm b/scripts/celadonmart5.asm index bf63a7cc..92ccb313 100755 --- a/scripts/celadonmart5.asm +++ b/scripts/celadonmart5.asm @@ -1,22 +1,22 @@ -CeladonMart5Script: ; 49069 (12:5069) +CeladonMart5Script: call EnableAutoTextBoxDrawing ret -CeladonMart5TextPointers: ; 4906c (12:506c) +CeladonMart5TextPointers: dw CeladonMart5Text1 dw CeladonMart5Text2 dw CeladonMart5Text3 dw CeladonMart5Text4 dw CeladonMart5Text5 -CeladonMart5Text1: ; 49076 (12:5076) +CeladonMart5Text1: TX_FAR _CeladonMart5Text1 db "@" -CeladonMart5Text2: ; 4907b (12:507b) +CeladonMart5Text2: TX_FAR _CeladonMart5Text2 db "@" -CeladonMart5Text5: ; 49080 (12:5080) +CeladonMart5Text5: TX_FAR _CeladonMart5Text5 db "@" diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm index 6d901613..2dbeca04 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/celadonmartelevator.asm @@ -1,4 +1,4 @@ -CeladonMartElevatorScript: ; 48600 (12:4600) +CeladonMartElevatorScript: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -14,7 +14,7 @@ CeladonMartElevatorScript: ; 48600 (12:4600) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -CeladonMartElevatorScript_4861c: ; 4861c (12:461c) +CeladonMartElevatorScript_4861c: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a @@ -22,7 +22,7 @@ CeladonMartElevatorScript_4861c: ; 4861c (12:461c) ld c, a call CeladonMartElevatorScript_4862a -CeladonMartElevatorScript_4862a: ; 4862a (12:462a) +CeladonMartElevatorScript_4862a: inc hl inc hl ld a, b @@ -31,7 +31,7 @@ CeladonMartElevatorScript_4862a: ; 4862a (12:462a) ld [hli], a ret -CeladonMartElevatorScript_48631: ; 48631 (12:4631) +CeladonMartElevatorScript_48631: ld hl, CeladonMartElavatorFloors call LoadItemList ld hl, CeldaonMartElevatorWarpMaps @@ -39,7 +39,7 @@ CeladonMartElevatorScript_48631: ; 48631 (12:4631) ld bc, CeldaonMartElevatorWarpMapsEnd - CeldaonMartElevatorWarpMaps jp CopyData -CeladonMartElavatorFloors: ; 48643 (12:4643) +CeladonMartElavatorFloors: db $05 ; num elements in list db FLOOR_1F db FLOOR_2F @@ -48,7 +48,7 @@ CeladonMartElavatorFloors: ; 48643 (12:4643) db FLOOR_5F db $FF ; terminator -CeldaonMartElevatorWarpMaps: ; 4864a (12:464a) +CeldaonMartElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. @@ -59,13 +59,13 @@ CeldaonMartElevatorWarpMaps: ; 4864a (12:464a) db $02, CELADON_MART_5 CeldaonMartElevatorWarpMapsEnd: -CeladonMartElevatorScript_48654: ; 48654 (12:4654) +CeladonMartElevatorScript_48654: jpba ShakeElevator -CeladonMartElevatorTextPointers: ; 4865c (12:465c) +CeladonMartElevatorTextPointers: dw CeladonMartElevatorText1 -CeladonMartElevatorText1: ; 4865e (12:465e) +CeladonMartElevatorText1: TX_ASM call CeladonMartElevatorScript_48631 ld hl, CeldaonMartElevatorWarpMaps diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index 4d819be7..22a83780 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -1,8 +1,8 @@ -CeladonMartRoofScript: ; 483d5 (12:43d5) +CeladonMartRoofScript: call EnableAutoTextBoxDrawing ret -CeladonMartRoofScript_GetDrinksInBag: ; 483d8 (12:43d8) +CeladonMartRoofScript_GetDrinksInBag: ; construct a list of all drinks in the player's bag xor a ld [wFilteredBagItemsCount], a @@ -35,13 +35,13 @@ CeladonMartRoofScript_GetDrinksInBag: ; 483d8 (12:43d8) ld [de], a ret -CeladonMartRoofDrinkList: ; 48408 (12:4408) +CeladonMartRoofDrinkList: db FRESH_WATER db SODA_POP db LEMONADE db $00 -CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c) +CeladonMartRoofScript_GiveDrinkToGirl: ld hl, wd730 set 6, [hl] ld hl, CeladonMartRoofText_484ee @@ -133,61 +133,61 @@ CeladonMartRoofScript_GiveDrinkToGirl: ; 4840c (12:440c) call PrintText ret -RemoveItemByIDBank12: ; 484e6 (12:44e6) +RemoveItemByIDBank12: callba RemoveItemByID ret -CeladonMartRoofText_484ee: ; 484ee (12:44ee) +CeladonMartRoofText_484ee: TX_FAR _CeladonMartRoofText_484ee db "@" -CeladonMartRoofText_484f3: ; 484f3 (12:44f3) +CeladonMartRoofText_484f3: TX_FAR _CeladonMartRoofText_484f3 db $0d db "@" -CeladonMartRoofText_484f9: ; 484f9 (12:44f9) +CeladonMartRoofText_484f9: TX_FAR _CeladonMartRoofText_484f9 db $0b TX_FAR _CeladonMartRoofText_484fe db $0d db "@" -CeladonMartRoofText_48504: ; 48504 (12:4504) +CeladonMartRoofText_48504: TX_FAR _CeladonMartRoofText_48504 db $0d db "@" -CeladonMartRoofText_4850a: ; 4850a (12:450a) +CeladonMartRoofText_4850a: TX_FAR _CeladonMartRoofText_4850a db $0b TX_FAR _CeladonMartRoofText_4850f db $0d db "@" -CeladonMartRoofText_48515: ; 48515 (12:4515) +CeladonMartRoofText_48515: TX_FAR _CeladonMartRoofText_48515 db $0d db "@" -ReceivedTM49Text: ; 4851b (12:451b) +ReceivedTM49Text: TX_FAR _ReceivedTM49Text db $0b TX_FAR _CeladonMartRoofText_48520 db $0d db "@" -CeladonMartRoofText_48526: ; 48526 (12:4526) +CeladonMartRoofText_48526: TX_FAR _CeladonMartRoofText_48526 db $0d db "@" -CeladonMartRoofText_4852c: ; 4852c (12:452c) +CeladonMartRoofText_4852c: TX_FAR _CeladonMartRoofText_4852c db $0d db "@" -CeladonMartRoofScript_PrintDrinksInBag: ; 48532 (12:4532) +CeladonMartRoofScript_PrintDrinksInBag: ld hl, wFilteredBagItems xor a ld [hItemCounter], a @@ -209,7 +209,7 @@ CeladonMartRoofScript_PrintDrinksInBag: ; 48532 (12:4532) pop hl jr .loop -CeladonMartRoofTextPointers: ; 4855b (12:455b) +CeladonMartRoofTextPointers: dw CeladonMartRoofText1 dw CeladonMartRoofText2 dw CeladonMartRoofText5 @@ -217,11 +217,11 @@ CeladonMartRoofTextPointers: ; 4855b (12:455b) dw CeladonMartRoofText5 dw CeladonMartRoofText6 -CeladonMartRoofText1: ; 48567 (12:4567) +CeladonMartRoofText1: TX_FAR _CeladonMartRoofText1 db "@" -CeladonMartRoofText2: ; 4856c (12:456c) +CeladonMartRoofText2: TX_ASM call CeladonMartRoofScript_GetDrinksInBag ld a, [wFilteredBagItemsCount] @@ -243,17 +243,17 @@ CeladonMartRoofText2: ; 4856c (12:456c) .done jp TextScriptEnd -CeladonMartRoofText3: ; 48598 (12:4598) +CeladonMartRoofText3: TX_FAR _CeladonMartRoofText_48598 db "@" -CeladonMartRoofText4: ; 4859d (12:459d) +CeladonMartRoofText4: TX_FAR _CeladonMartRoofText4 db "@" -CeladonMartRoofText5: ; 485a2 (12:45a2) +CeladonMartRoofText5: TX_VENDING_MACHINE -CeladonMartRoofText6: ; 485a3 (12:45a3) +CeladonMartRoofText6: TX_FAR _CeladonMartRoofText6 db "@" diff --git a/scripts/celadonpokecenter.asm b/scripts/celadonpokecenter.asm index 4ff71c43..b577906a 100755 --- a/scripts/celadonpokecenter.asm +++ b/scripts/celadonpokecenter.asm @@ -1,25 +1,25 @@ -CeladonPokecenterScript: ; 488b8 (12:48b8) +CeladonPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CeladonPokecenterTextPointers: ; 488be (12:48be) +CeladonPokecenterTextPointers: dw CeladonPokecenterText1 dw CeladonPokecenterText2 dw CeladonPokecenterText3 dw CeladonPokecenterText4 dw CeladonPokecenterText5 -CeladonPokecenterText4: ; 488c6 (12:48c6) +CeladonPokecenterText4: TX_CABLE_CLUB_RECEPTIONIST -CeladonPokecenterText1: ; 488c7 (12:48c7) +CeladonPokecenterText1: TX_POKECENTER_NURSE -CeladonPokecenterText2: ; 488c8 (12:48c8) +CeladonPokecenterText2: TX_FAR _CeladonPokecenterText2 db "@" -CeladonPokecenterText3: ; 488cd (12:48cd) +CeladonPokecenterText3: TX_FAR _CeladonPokecenterText3 db "@" diff --git a/scripts/celadonprizeroom.asm b/scripts/celadonprizeroom.asm index 980778fe..a07ce162 100755 --- a/scripts/celadonprizeroom.asm +++ b/scripts/celadonprizeroom.asm @@ -1,20 +1,20 @@ -CeladonPrizeRoomScript: ; 490f0 (12:50f0) +CeladonPrizeRoomScript: jp EnableAutoTextBoxDrawing -CeladonPrizeRoomTextPointers: ; 490f3 (12:50f3) +CeladonPrizeRoomTextPointers: dw CeladonPrizeRoomText1 dw CeladonPrizeRoomText2 dw CeladonPrizeRoomText3 dw CeladonPrizeRoomText3 dw CeladonPrizeRoomText3 -CeladonPrizeRoomText1: ; 490fd (12:50fd) +CeladonPrizeRoomText1: TX_FAR _CeladonPrizeRoomText1 db "@" -CeladonPrizeRoomText2: ; 49102 (12:5102) +CeladonPrizeRoomText2: TX_FAR _CeladonPrizeRoomText2 db "@" -CeladonPrizeRoomText3: ; 49107 (12:5107) +CeladonPrizeRoomText3: TX_PRIZE_VENDOR diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 59b0e525..4eaa66b9 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -1,10 +1,10 @@ -CeruleanCityScript: ; 19480 (6:5480) +CeruleanCityScript: call EnableAutoTextBoxDrawing ld hl, CeruleanCityScriptPointers ld a, [W_CERULEANCITYCURSCRIPT] jp JumpTable -CeruleanCityScript_1948c: ; 1948c (6:548c) +CeruleanCityScript_1948c: xor a ld [wJoyIgnore], a ld [W_CERULEANCITYCURSCRIPT], a @@ -12,14 +12,14 @@ CeruleanCityScript_1948c: ; 1948c (6:548c) ld [wMissableObjectIndex], a predef_jump HideObject -CeruleanCityScriptPointers: ; 1949d (6:549d) +CeruleanCityScriptPointers: dw CeruleanCityScript0 dw CeruleanCityScript1 dw CeruleanCityScript2 dw CeruleanCityScript3 dw CeruleanCityScript4 -CeruleanCityScript4: ; 194a7 (6:54a7) +CeruleanCityScript4: ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c @@ -34,7 +34,7 @@ CeruleanCityScript4: ; 194a7 (6:54a7) ld [W_CERULEANCITYCURSCRIPT], a ret -CeruleanCityScript0: ; 194c8 (6:54c8) +CeruleanCityScript0: CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF jr nz, .asm_194f7 ld hl, CeruleanCityCoords1 @@ -94,30 +94,30 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [W_CERULEANCITYCURSCRIPT], a ret -CeruleanCityCoords1: ; 1954f (6:554f) +CeruleanCityCoords1: db $07,$1e db $09,$1e db $ff -CeruleanCityCoords2: ; 19554 (6:5554) +CeruleanCityCoords2: db $06,$14 db $06,$15 db $ff -CeruleanCityMovement1: ; 19559 (6:5559) +CeruleanCityMovement1: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db $FF -CeruleanCityScript_1955d: ; 1955d (6:555d) +CeruleanCityScript_1955d: ld a,1 ld [H_SPRITEINDEX],a xor a ; SPRITE_FACING_DOWN ld [hSpriteFacingDirection],a jp SetSpriteFacingDirectionAndDelay ; face object -CeruleanCityScript1: ; 19567 (6:5567) +CeruleanCityScript1: ld a, [wd730] bit 0, a ret nz @@ -143,7 +143,7 @@ CeruleanCityScript1: ; 19567 (6:5567) ld [W_CERULEANCITYCURSCRIPT], a ret -CeruleanCityScript2: ; 195b1 (6:55b1) +CeruleanCityScript2: ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c @@ -174,7 +174,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld [W_CERULEANCITYCURSCRIPT], a ret -CeruleanCityMovement3: ; 19600 (6:5600) +CeruleanCityMovement3: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -184,7 +184,7 @@ CeruleanCityMovement3: ; 19600 (6:5600) db NPC_MOVEMENT_DOWN db $FF -CeruleanCityMovement4: ; 19608 (6:5608) +CeruleanCityMovement4: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -194,7 +194,7 @@ CeruleanCityMovement4: ; 19608 (6:5608) db NPC_MOVEMENT_DOWN db $FF -CeruleanCityScript3: ; 19610 (6:5610) +CeruleanCityScript3: ld a, [wd730] bit 0, a ret nz @@ -208,7 +208,7 @@ CeruleanCityScript3: ; 19610 (6:5610) ld [W_CERULEANCITYCURSCRIPT], a ret -CeruleanCityTextPointers: ; 1962d (6:562d) +CeruleanCityTextPointers: dw CeruleanCityText1 dw CeruleanCityText2 dw CeruleanCityText3 @@ -227,7 +227,7 @@ CeruleanCityTextPointers: ; 1962d (6:562d) dw CeruleanCityText16 dw CeruleanCityText17 -CeruleanCityText1: ; 1964f (6:564f) +CeruleanCityText1: TX_ASM CheckEvent EVENT_BEAT_CERULEAN_RIVAL ; do pre-battle text @@ -242,23 +242,23 @@ CeruleanCityText1: ; 1964f (6:564f) .end jp TextScriptEnd -CeruleanCityText_19668: ; 19668 (6:5668) +CeruleanCityText_19668: TX_FAR _CeruleanCityText_19668 db "@" -CeruleanCityText_1966d: ; 1966d (6:566d) +CeruleanCityText_1966d: TX_FAR _CeruleanCityText_1966d db "@" -CeruleanCityText_19672: ; 19672 (6:5672) +CeruleanCityText_19672: TX_FAR _CeruleanCityText_19672 db "@" -CeruleanCityText_19677: ; 19677 (6:5677) +CeruleanCityText_19677: TX_FAR _CeruleanCityText_19677 db "@" -CeruleanCityText2: ; 1967c (6:567c) +CeruleanCityText2: TX_ASM CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF jr nz, .asm_4ca20 @@ -295,46 +295,46 @@ CeruleanCityText2: ; 1967c (6:567c) .Done jp TextScriptEnd -CeruleanCityText_196d9: ; 196d9 (6:56d9) +CeruleanCityText_196d9: TX_FAR _CeruleanCityText_196d9 db "@" -ReceivedTM28Text: ; 196de (6:56de) +ReceivedTM28Text: TX_FAR _ReceivedTM28Text db $0B TX_FAR _ReceivedTM28Text2 db $0D, "@" -TM28NoRoomText: ; 196e9 (6:56e9) +TM28NoRoomText: TX_FAR _TM28NoRoomText db "@" -CeruleanCityText_196ee: ; 196ee (6:56ee) +CeruleanCityText_196ee: TX_FAR _CeruleanCityText_196ee db "@" -CeruleanCityText_196f3: ; 196f3 (6:56f3) +CeruleanCityText_196f3: TX_FAR _CeruleanCityText_196f3 db "@" -CeruleanCityText3: ; 196f8 (6:56f8) +CeruleanCityText3: TX_FAR _CeruleanCityText3 db "@" -CeruleanCityText4: ; 196fd (6:56fd) +CeruleanCityText4: TX_FAR _CeruleanCityText4 db "@" -CeruleanCityText5: ; 19702 (6:5702) +CeruleanCityText5: TX_FAR _CeruleanCityText5 db "@" -CeruleanCityText11: ; 19707 (6:5707) -CeruleanCityText6: ; 19707 (6:5707) +CeruleanCityText11: +CeruleanCityText6: TX_FAR _CeruleanCityText6 db "@" -CeruleanCityText7: ; 1970c (6:570c) +CeruleanCityText7: TX_ASM ld a, [hRandomAdd] cp $b4 @@ -354,19 +354,19 @@ CeruleanCityText7: ; 1970c (6:570c) .asm_d486e jp TextScriptEnd -CeruleanCityText_19730: ; 19730 (6:5730) +CeruleanCityText_19730: TX_FAR _CeruleanCityText_19730 db "@" -CeruleanCityText_19735: ; 19735 (6:5735) +CeruleanCityText_19735: TX_FAR _CeruleanCityText_19735 db "@" -CeruleanCityText_1973a: ; 1973a (6:573a) +CeruleanCityText_1973a: TX_FAR _CeruleanCityText_1973a db "@" -CeruleanCityText8: ; 1973f (6:573f) +CeruleanCityText8: TX_ASM ld a, [hRandomAdd] cp $b4 @@ -392,42 +392,42 @@ CeruleanCityText8: ; 1973f (6:573f) .asm_f2f38 jp TextScriptEnd -CeruleanCityText_1976f: ; 1976f (6:576f) +CeruleanCityText_1976f: TX_FAR _CeruleanCityText_1976f db "@" -CeruleanCityText_19774: ; 19774 (6:5774) +CeruleanCityText_19774: TX_FAR _CeruleanCityText_19774 db "@" -CeruleanCityText_19779: ; 19779 (6:5779) +CeruleanCityText_19779: TX_FAR _CeruleanCityText_19779 db "@" -CeruleanCityText_1977e: ; 1977e (6:577e) +CeruleanCityText_1977e: TX_FAR _CeruleanCityText_1977e db "@" -CeruleanCityText9: ; 19783 (6:5783) +CeruleanCityText9: TX_FAR _CeruleanCityText9 db "@" -CeruleanCityText10: ; 19788 (6:5788) +CeruleanCityText10: TX_FAR _CeruleanCityText10 db "@" -CeruleanCityText12: ; 1978d (6:578d) +CeruleanCityText12: TX_FAR _CeruleanCityText12 db "@" -CeruleanCityText13: ; 19792 (6:5792) +CeruleanCityText13: TX_FAR _CeruleanCityText13 db "@" -CeruleanCityText16: ; 19797 (6:5797) +CeruleanCityText16: TX_FAR _CeruleanCityText16 db "@" -CeruleanCityText17: ; 1979c (6:579c) +CeruleanCityText17: TX_FAR _CeruleanCityText17 db "@" diff --git a/scripts/ceruleancity2.asm b/scripts/ceruleancity2.asm index 3dafb3f8..53ace5c8 100755 --- a/scripts/ceruleancity2.asm +++ b/scripts/ceruleancity2.asm @@ -1,4 +1,4 @@ -CeruleanHideRocket: ; 74872 (1d:4872) +CeruleanHideRocket: ; code similar to this appears in a lot of banks; this particular ; one is called after you beat the Rocket that gives you TM28 DIG. ; the screen then fades out, he disappears, and fades back in diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index f1ef4c43..eae1b364 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -1,4 +1,4 @@ -CeruleanGymScript: ; 5c6b3 (17:46b3) +CeruleanGymScript: ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -11,38 +11,38 @@ CeruleanGymScript: ; 5c6b3 (17:46b3) ld [W_CERULEANGYMCURSCRIPT], a ret -CeruleanGymScript_5c6d0: ; 5c6d0 (17:46d0) +CeruleanGymScript_5c6d0: ld hl, Gym2CityName ld de, Gym2LeaderName jp LoadGymLeaderAndCityName -Gym2CityName: ; 5c6d9 (17:46d9) +Gym2CityName: db "CERULEAN CITY@" -Gym2LeaderName: ; 5c6e7 (17:46e7) +Gym2LeaderName: db "MISTY@" -CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed) +CeruleanGymScript_5c6ed: xor a ld [wJoyIgnore], a ld [W_CERULEANGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -CeruleanGymScriptPointers: ; 5c6f8 (17:46f8) +CeruleanGymScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw CeruleanGymScript3 -CeruleanGymScript3: ; 5c700 (17:4700) +CeruleanGymScript3: ld a, [wIsInBattle] cp $ff jp z, CeruleanGymScript_5c6ed ld a, $f0 ld [wJoyIgnore], a -CeruleanGymScript_5c70d: ; 5c70d (17:470d) +CeruleanGymScript_5c70d: ld a, $5 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -71,7 +71,7 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) jp CeruleanGymScript_5c6ed -CeruleanGymTextPointers: ; 5c74a (17:474a) +CeruleanGymTextPointers: dw CeruleanGymText1 dw CeruleanGymText2 dw CeruleanGymText3 @@ -80,8 +80,8 @@ CeruleanGymTextPointers: ; 5c74a (17:474a) dw CeruleanGymText6 dw CeruleanGymText7 -CeruleanGymTrainerHeaders: ; 5c758 (17:4758) -CeruleanGymTrainerHeader0: ; 5c758 (17:4758) +CeruleanGymTrainerHeaders: +CeruleanGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_0 @@ -90,7 +90,7 @@ CeruleanGymTrainerHeader0: ; 5c758 (17:4758) dw CeruleanGymEndBattleText1 ; TextEndBattle dw CeruleanGymEndBattleText1 ; TextEndBattle -CeruleanGymTrainerHeader1: ; 5c764 (17:4764) +CeruleanGymTrainerHeader1: dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_CERULEAN_GYM_TRAINER_1 @@ -101,7 +101,7 @@ CeruleanGymTrainerHeader1: ; 5c764 (17:4764) db $ff -CeruleanGymText1: ; 5c771 (17:4771) +CeruleanGymText1: TX_ASM CheckEvent EVENT_BEAT_MISTY jr z, .asm_5c78d @@ -136,68 +136,68 @@ CeruleanGymText1: ; 5c771 (17:4771) .asm_5c7bb jp TextScriptEnd -CeruleanGymText_5c7be: ; 5c7be (17:47be) +CeruleanGymText_5c7be: TX_FAR _CeruleanGymText_5c7be db "@" -CeruleanGymText_5c7c3: ; 5c7c3 (17:47c3) +CeruleanGymText_5c7c3: TX_FAR _CeruleanGymText_5c7c3 db "@" -CeruleanGymText5: ; 5c7c8 (17:47c8) +CeruleanGymText5: TX_FAR _CeruleanGymText_5c7c8 db "@" -CeruleanGymText6: ; 5c7cd (17:47cd) -ReceivedTM11Text: ; 5c7cd (17:47cd) +CeruleanGymText6: +ReceivedTM11Text: TX_FAR _ReceivedTM11Text db $0B, "@" -CeruleanGymText7: ; 5c7d3 (17:47d3) +CeruleanGymText7: TX_FAR _CeruleanGymText_5c7d3 db "@" -CeruleanGymText_5c7d8: ; 5c7d8 (17:47d8) +CeruleanGymText_5c7d8: TX_FAR _CeruleanGymText_5c7d8 db "@" -CeruleanGymText2: ; 5c7df (17:47df) +CeruleanGymText2: TX_ASM ld hl, CeruleanGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -CeruleanGymBattleText1: ; 5c7e9 (17:47e9) +CeruleanGymBattleText1: TX_FAR _CeruleanGymBattleText1 db "@" -CeruleanGymEndBattleText1: ; 5c7ee (17:47ee) +CeruleanGymEndBattleText1: TX_FAR _CeruleanGymEndBattleText1 db "@" -CeruleanGymAfterBattleText1: ; 5c7f3 (17:47f3) +CeruleanGymAfterBattleText1: TX_FAR _CeruleanGymAfterBattleText1 db "@" -CeruleanGymText3: ; 5c7f8 (17:47f8) +CeruleanGymText3: TX_ASM ld hl, CeruleanGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd -CeruleanGymBattleText2: ; 5c802 (17:4802) +CeruleanGymBattleText2: TX_FAR _CeruleanGymBattleText2 db "@" -CeruleanGymEndBattleText2: ; 5c807 (17:4807) +CeruleanGymEndBattleText2: TX_FAR _CeruleanGymEndBattleText2 db "@" -CeruleanGymAfterBattleText2: ; 5c80c (17:480c) +CeruleanGymAfterBattleText2: TX_FAR _CeruleanGymAfterBattleText2 db "@" -CeruleanGymText4: ; 5c811 (17:4811) +CeruleanGymText4: TX_ASM CheckEvent EVENT_BEAT_MISTY jr nz, .asm_5c821 @@ -210,10 +210,10 @@ CeruleanGymText4: ; 5c811 (17:4811) .asm_5c827 jp TextScriptEnd -CeruleanGymText_5c82a: ; 5c82a (17:482a) +CeruleanGymText_5c82a: TX_FAR _CeruleanGymText_5c82a db "@" -CeruleanGymText_5c82f: ; 5c82f (17:482f) +CeruleanGymText_5c82f: TX_FAR _CeruleanGymText_5c82f db "@" diff --git a/scripts/ceruleanhouse1.asm b/scripts/ceruleanhouse1.asm index 0b9a9052..ba75c240 100755 --- a/scripts/ceruleanhouse1.asm +++ b/scripts/ceruleanhouse1.asm @@ -1,14 +1,14 @@ -CeruleanHouse1Script: ; 1d6f6 (7:56f6) +CeruleanHouse1Script: call EnableAutoTextBoxDrawing ret -CeruleanHouse1TextPointers: ; 1d6f9 (7:56f9) +CeruleanHouse1TextPointers: dw CeruleanHouse1Text1 dw CeruleanHouse1Text2 dw CeruleanHouse1Text3 dw CeruleanHouse1Text4 -CeruleanHouse1Text1: ; 1d6fd (7:56fd) +CeruleanHouse1Text1: TX_ASM ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a @@ -84,21 +84,21 @@ CeruleanHouse1Text_1cfdf: TX_WAIT_BUTTON db "@" -CeruleanHouse1Text2: ; 1d702 (7:5702) +CeruleanHouse1Text2: TX_FAR MelanieBulbasaurText TX_ASM ld a, BULBASAUR call PlayCry jp TextScriptEnd -CeruleanHouse1Text3: ; 1d702 (7:5702) +CeruleanHouse1Text3: TX_FAR MelanieOddishText TX_ASM ld a, ODDISH call PlayCry jp TextScriptEnd -CeruleanHouse1Text4: ; 1d702 (7:5702) +CeruleanHouse1Text4: TX_FAR MelanieSandshrewText TX_ASM ld a, SANDSHREW diff --git a/scripts/ceruleanhouse2.asm b/scripts/ceruleanhouse2.asm index 278f3bcf..e83c2194 100755 --- a/scripts/ceruleanhouse2.asm +++ b/scripts/ceruleanhouse2.asm @@ -1,14 +1,14 @@ -CeruleanHouse2Script: ; 74e09 (1d:4e09) +CeruleanHouse2Script: ld a, $1 ld [wAutoTextBoxDrawingControl], a dec a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -CeruleanHouse2TextPointers: ; 74e13 (1d:4e13) +CeruleanHouse2TextPointers: dw CeruleanHouse2Text1 -CeruleanHouse2Text1: ; 74e15 (1d:4e15) +CeruleanHouse2Text1: TX_ASM ld hl, CeruleanHouse2Text_74e77 call PrintText @@ -51,22 +51,22 @@ CeruleanHouse2Text1: ; 74e15 (1d:4e15) call PrintText jp TextScriptEnd -BadgeItemList: ; 74e6d (1d:4e6d) +BadgeItemList: db $8,BOULDERBADGE,CASCADEBADGE,THUNDERBADGE,RAINBOWBADGE,SOULBADGE,MARSHBADGE,VOLCANOBADGE,EARTHBADGE,$FF -CeruleanHouse2Text_74e77: ; 74e77 (1d:4e77) +CeruleanHouse2Text_74e77: TX_FAR _CeruleanHouse2Text_74e77 db "@" -CeruleanHouse2Text_74e7c: ; 74e7c (1d:4e7c) +CeruleanHouse2Text_74e7c: TX_FAR _CeruleanHouse2Text_74e7c db "@" -CeruleanHouse2Text_74e81: ; 74e81 (1d:4e81) +CeruleanHouse2Text_74e81: TX_FAR _CeruleanHouse2Text_74e81 db "@" -TextPointers_74e86: ; 74e86 (1d:4e86) +TextPointers_74e86: dw CeruleanHouse2Text_74e96 dw CeruleanHouse2Text_74e9b dw CeruleanHouse2Text_74ea0 @@ -76,34 +76,34 @@ TextPointers_74e86: ; 74e86 (1d:4e86) dw CeruleanHouse2Text_74eb4 dw CeruleanHouse2Text_74eb9 -CeruleanHouse2Text_74e96: ; 74e96 (1d:4e96) +CeruleanHouse2Text_74e96: TX_FAR _CeruleanHouse2Text_74e96 db "@" -CeruleanHouse2Text_74e9b: ; 74e9b (1d:4e9b) +CeruleanHouse2Text_74e9b: TX_FAR _CeruleanHouse2Text_74e9b db "@" -CeruleanHouse2Text_74ea0: ; 74ea0 (1d:4ea0) +CeruleanHouse2Text_74ea0: TX_FAR _CeruleanHouse2Text_74ea0 db "@" -CeruleanHouse2Text_74ea5: ; 74ea5 (1d:4ea5) +CeruleanHouse2Text_74ea5: TX_FAR _CeruleanHouse2Text_74ea5 db "@" -CeruleanHouse2Text_74eaa: ; 74eaa (1d:4eaa) +CeruleanHouse2Text_74eaa: TX_FAR _CeruleanHouse2Text_74eaa db "@" -CeruleanHouse2Text_74eaf: ; 74eaf (1d:4eaf) +CeruleanHouse2Text_74eaf: TX_FAR _CeruleanHouse2Text_74eaf db "@" -CeruleanHouse2Text_74eb4: ; 74eb4 (1d:4eb4) +CeruleanHouse2Text_74eb4: TX_FAR _CeruleanHouse2Text_74eb4 db "@" -CeruleanHouse2Text_74eb9: ; 74eb9 (1d:4eb9) +CeruleanHouse2Text_74eb9: TX_FAR _CeruleanHouse2Text_74eb9 db "@" diff --git a/scripts/ceruleanhousetrashed.asm b/scripts/ceruleanhousetrashed.asm index a1f58684..da848b7c 100755 --- a/scripts/ceruleanhousetrashed.asm +++ b/scripts/ceruleanhousetrashed.asm @@ -1,13 +1,13 @@ -CeruleanHouseTrashedScript: ; 1d685 (7:5685) +CeruleanHouseTrashedScript: call EnableAutoTextBoxDrawing ret -CeruleanHouseTrashedTextPointers: ; 1d689 (7:5689) +CeruleanHouseTrashedTextPointers: dw CeruleanHouseTrashedText1 dw CeruleanHouseTrashedText2 dw CeruleanHouseTrashedText3 -CeruleanHouseTrashedText1: ; 1d68f (7:568f) +CeruleanHouseTrashedText1: TX_ASM ld b, $e4 predef GetQuantityOfItemInBag @@ -22,18 +22,18 @@ CeruleanHouseTrashedText1: ; 1d68f (7:568f) .asm_8dfe9 jp TextScriptEnd -CeruleanHouseTrashedText_1d6ab: ; 1d6ab (7:56ab) +CeruleanHouseTrashedText_1d6ab: TX_FAR _CeruleanTrashedText_1d6ab db "@" -CeruleanHouseTrashedText_1d6b0: ; 1d6b0 (7:56b0) +CeruleanHouseTrashedText_1d6b0: TX_FAR _CeruleanTrashedText_1d6b0 db "@" -CeruleanHouseTrashedText2: ; 1d6b5 (7:56b5) +CeruleanHouseTrashedText2: TX_FAR _CeruleanHouseTrashedText2 db "@" -CeruleanHouseTrashedText3: ; 1d6ba (7:56ba) +CeruleanHouseTrashedText3: TX_FAR _CeruleanHouseTrashedText3 db "@" diff --git a/scripts/ceruleanmart.asm b/scripts/ceruleanmart.asm index 7aea6d47..1a5df5a2 100755 --- a/scripts/ceruleanmart.asm +++ b/scripts/ceruleanmart.asm @@ -1,15 +1,15 @@ -CeruleanMartScript: ; 5c895 (17:4895) +CeruleanMartScript: jp EnableAutoTextBoxDrawing -CeruleanMartTextPointers: ; 5c898 (17:4898) +CeruleanMartTextPointers: dw CeruleanMartText1 dw CeruleanMartText2 dw CeruleanMartText3 -CeruleanMartText2: ; 5c89e (17:489e) +CeruleanMartText2: TX_FAR _CeruleanMartText2 db "@" -CeruleanMartText3: ; 5c8a3 (17:48a3) +CeruleanMartText3: TX_FAR _CeruleanMartText3 db "@" diff --git a/scripts/ceruleanpokecenter.asm b/scripts/ceruleanpokecenter.asm index 5ee5d4a2..2c9d4419 100755 --- a/scripts/ceruleanpokecenter.asm +++ b/scripts/ceruleanpokecenter.asm @@ -1,25 +1,25 @@ -CeruleanPokecenterScript: ; 5c645 (17:4645) +CeruleanPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CeruleanPokecenterTextPointers: ; 5c64b (17:464b) +CeruleanPokecenterTextPointers: dw CeruleanPokecenterText1 dw CeruleanPokecenterText2 dw CeruleanPokecenterText3 dw CeruleanPokecenterText4 dw CeruleanPokecenterText5 -CeruleanPokecenterText4: ; 5c653 (17:4653) +CeruleanPokecenterText4: TX_CABLE_CLUB_RECEPTIONIST -CeruleanPokecenterText1: ; 5c654 (17:4654) +CeruleanPokecenterText1: TX_POKECENTER_NURSE -CeruleanPokecenterText2: ; 5c655 (17:4655) - TX_FAR _CeruleanPokecenterText1 +CeruleanPokecenterText2: + TX_FAR _CeruleanPokecenterText2 db "@" -CeruleanPokecenterText3: ; 5c65a (17:465a) +CeruleanPokecenterText3: TX_FAR _CeruleanPokecenterText3 db "@" diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 4ad26a42..02122490 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -1,11 +1,11 @@ -CinnabarGymScript: ; 7574a (1d:574a) +CinnabarGymScript: call CinnabarGymScript_75759 call EnableAutoTextBoxDrawing ld hl, CinnabarGymScriptPointers ld a, [W_CINNABARGYMCURSCRIPT] jp JumpTable -CinnabarGymScript_75759: ; 75759 (1d:5759) +CinnabarGymScript_75759: ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -17,17 +17,17 @@ CinnabarGymScript_75759: ; 75759 (1d:5759) call nz, UpdateCinnabarGymGateTileBlocks ResetEvent EVENT_2A7 ret -CinnabarGymScript_75772: ; 75772 (1d:5772) +CinnabarGymScript_75772: ld hl, Gym7CityName ld de, Gym7LeaderName jp LoadGymLeaderAndCityName -Gym7CityName: ; 7577b (1d:577b) +Gym7CityName: db "CINNABAR ISLAND@" -Gym7LeaderName: ; 7578b (1d:578b) +Gym7LeaderName: db "BLAINE@" -CinnabarGymScript_75792: ; 75792 (1d:5792) +CinnabarGymScript_75792: xor a ld [wJoyIgnore], a ld [W_CINNABARGYMCURSCRIPT], a @@ -35,21 +35,21 @@ CinnabarGymScript_75792: ; 75792 (1d:5792) ld [wOpponentAfterWrongAnswer], a ret -CinnabarGymScript_74f48: ; 757a0 (1d:57a0) +CinnabarGymScript_74f48: ld a, [hSpriteIndexOrTextID] ld [wTrainerHeaderFlagBit], a ret -CinnabarGymFlagAction: ; 757f1 (1d:57f1) +CinnabarGymFlagAction: predef_jump FlagActionPredef -CinnabarGymScriptPointers: ; 757a6 (1d:57a6) +CinnabarGymScriptPointers: dw CinnabarGymScript0 dw CinnabarGymScript1 dw CinnabarGymScript2 dw CinnabarGymScript3 -CinnabarGymScript0: ; 757ae (1d:57ae) +CinnabarGymScript0: ld a, [wOpponentAfterWrongAnswer] and a ret z @@ -77,7 +77,7 @@ CinnabarGymScript0: ; 757ae (1d:57ae) ld [W_CURMAPSCRIPT], a ret -MovementData_757d7: ; 757d7 (1d:57d7) +MovementData_757d7: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_UP db $FF @@ -89,7 +89,7 @@ PikachuMovementData_74f97: db $35 db $3f -MovementData_757da: ; 757da (1d:57da) +MovementData_757da: db NPC_MOVEMENT_LEFT db $FF @@ -115,7 +115,7 @@ CinnabarGymScript_74fa3: call ApplyPikachuMovementData ret -CinnabarGymScript1: ; 757dc (1d:57dc) +CinnabarGymScript1: ld a, [wd730] bit 0, a ret nz @@ -126,7 +126,7 @@ CinnabarGymScript1: ; 757dc (1d:57dc) ld [hSpriteIndexOrTextID], a jp DisplayTextID -CinnabarGymScript2: ; 757f6 (1d:57f6) +CinnabarGymScript2: call CinnabarGymScript_753e9 ld a, [wIsInBattle] cp $ff @@ -192,14 +192,14 @@ CinnabarGymScript_75041: call UpdateCinnabarGymGateTileBlocks ret -CinnabarGymScript3: ; 7584a (1d:584a) +CinnabarGymScript3: call CinnabarGymScript_753e9 ld a, [wIsInBattle] cp $ff jp z, CinnabarGymScript_75792 ld a, $f0 ld [wJoyIgnore], a -CinnabarGymScript3_75857: ; 75857 (1d:5857) +CinnabarGymScript3_75857: ld a, $a ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -230,7 +230,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) jp CinnabarGymScript_75792 -CinnabarGymTextPointers: ; 7589f (1d:589f) +CinnabarGymTextPointers: dw CinnabarGymText1 dw CinnabarGymText2 dw CinnabarGymText3 @@ -244,7 +244,7 @@ CinnabarGymTextPointers: ; 7589f (1d:589f) dw ReceivedTM38Text dw TM38NoRoomText -CinnabarGymScript_750c3: ; 758b7 (1d:58b7) +CinnabarGymScript_750c3: ld a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer @@ -264,7 +264,7 @@ CinnabarGymScript_750c3: ; 758b7 (1d:58b7) ld [W_CURMAPSCRIPT], a jp TextScriptEnd -CinnabarGymText1: ; 758df (1d:58df) +CinnabarGymText1: TX_ASM CheckEvent EVENT_BEAT_BLAINE jr z, .asm_d9332 @@ -287,35 +287,35 @@ CinnabarGymText1: ; 758df (1d:58df) ld [wGymLeaderNo], a jp CinnabarGymScript_750c3 -BlaineBattleText: ; 75914 (1d:5914) +BlaineBattleText: TX_FAR _BlaineBattleText db "@" -BlaineEndBattleText: ; 75919 (1d:5919) +BlaineEndBattleText: TX_FAR _BlaineEndBattleText db $11 db $d db "@" -BlaineFireBlastText: ; 75920 (1d:5920) +BlaineFireBlastText: TX_FAR _BlaineFireBlastText db "@" -BlaineBadgeText: ; 75925 (1d:5925) +BlaineBadgeText: TX_FAR _BlaineBadgeText db "@" -ReceivedTM38Text: ; 7592a (1d:592a) +ReceivedTM38Text: TX_FAR _ReceivedTM38Text db $0B TX_FAR _TM38ExplanationText db "@" -TM38NoRoomText: ; 75934 (1d:5934) +TM38NoRoomText: TX_FAR _TM38NoRoomText db "@" -CinnabarGymText2: ; 75939 (1d:5939) +CinnabarGymText2: TX_ASM call CinnabarGymScript_74f48 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_0 @@ -331,19 +331,19 @@ CinnabarGymText2: ; 75939 (1d:5939) call PrintText jp TextScriptEnd -CinnabarGymText_7595f: ; 7595f (1d:595f) +CinnabarGymText_7595f: TX_FAR _CinnabarGymText_7595f db "@" -CinnabarGymText_75964: ; 75964 (1d:5964) +CinnabarGymText_75964: TX_FAR _CinnabarGymText_75964 db "@" -CinnabarGymText_75969: ; 75969 (1d:5969) +CinnabarGymText_75969: TX_FAR _CinnabarGymText_75969 db "@" -CinnabarGymText3: ; 7596e (1d:596e) +CinnabarGymText3: TX_ASM call CinnabarGymScript_74f48 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_1 @@ -368,19 +368,19 @@ CinnabarGymText3: ; 7596e (1d:596e) call PrintText jp TextScriptEnd -CinnabarGymText_75994: ; 75994 (1d:5994) +CinnabarGymText_75994: TX_FAR _CinnabarGymText_75994 db "@" -CinnabarGymText_75999: ; 75999 (1d:5999) +CinnabarGymText_75999: TX_FAR _CinnabarGymText_75999 db "@" -CinnabarGymText_7599e: ; 7599e (1d:599e) +CinnabarGymText_7599e: TX_FAR _CinnabarGymText_7599e db "@" -CinnabarGymText4: ; 759a3 (1d:59a3) +CinnabarGymText4: TX_ASM call CinnabarGymScript_74f48 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_2 @@ -404,19 +404,19 @@ CinnabarGymText4: ; 759a3 (1d:59a3) call PrintText jp TextScriptEnd -CinnabarGymText_759c9: ; 759c9 (1d:59c9) +CinnabarGymText_759c9: TX_FAR _CinnabarGymText_759c9 db "@" -CinnabarGymText_759ce: ; 759ce (1d:59ce) +CinnabarGymText_759ce: TX_FAR _CinnabarGymText_759ce db "@" -CinnabarGymText_759d3: ; 759d3 (1d:59d3) +CinnabarGymText_759d3: TX_FAR _CinnabarGymText_759d3 db "@" -CinnabarGymText5: ; 759d8 (1d:59d8) +CinnabarGymText5: TX_ASM call CinnabarGymScript_74f48 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_3 @@ -440,19 +440,19 @@ CinnabarGymText5: ; 759d8 (1d:59d8) call PrintText jp TextScriptEnd -CinnabarGymText_759fe: ; 759fe (1d:59fe) +CinnabarGymText_759fe: TX_FAR _CinnabarGymText_759fe db "@" -CinnabarGymText_75a03: ; 75a03 (1d:5a03) +CinnabarGymText_75a03: TX_FAR _CinnabarGymText_75a03 db "@" -CinnabarGymText_75a08: ; 75a08 (1d:5a08) +CinnabarGymText_75a08: TX_FAR _CinnabarGymText_75a08 db "@" -CinnabarGymText6: ; 75a0d (1d:5a0d) +CinnabarGymText6: TX_ASM call CinnabarGymScript_74f48 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_4 @@ -476,19 +476,19 @@ CinnabarGymText6: ; 75a0d (1d:5a0d) call PrintText jp TextScriptEnd -CinnabarGymText_75a33: ; 75a33 (1d:5a33) +CinnabarGymText_75a33: TX_FAR _CinnabarGymText_75a33 db "@" -CinnabarGymText_75a38: ; 75a38 (1d:5a38) +CinnabarGymText_75a38: TX_FAR _CinnabarGymText_75a38 db "@" -CinnabarGymText_75a3d: ; 75a3d (1d:5a3d) +CinnabarGymText_75a3d: TX_FAR _CinnabarGymText_75a3d db "@" -CinnabarGymText7: ; 75a42 (1d:5a42) +CinnabarGymText7: TX_ASM call CinnabarGymScript_74f48 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_5 @@ -512,19 +512,19 @@ CinnabarGymText7: ; 75a42 (1d:5a42) call PrintText jp TextScriptEnd -CinnabarGymText_75a68: ; 75a68 (1d:5a68) +CinnabarGymText_75a68: TX_FAR _CinnabarGymText_75a68 db "@" -CinnabarGymText_75a6d: ; 75a6d (1d:5a6d) +CinnabarGymText_75a6d: TX_FAR _CinnabarGymText_75a6d db "@" -CinnabarGymText_75a72: ; 75a72 (1d:5a72) +CinnabarGymText_75a72: TX_FAR _CinnabarGymText_75a72 db "@" -CinnabarGymText8: ; 75a77 (1d:5a77) +CinnabarGymText8: TX_ASM call CinnabarGymScript_74f48 CheckEvent EVENT_BEAT_CINNABAR_GYM_TRAINER_6 @@ -548,19 +548,19 @@ CinnabarGymText8: ; 75a77 (1d:5a77) call PrintText jp TextScriptEnd -CinnabarGymText_75a9d: ; 75a9d (1d:5a9d) +CinnabarGymText_75a9d: TX_FAR _CinnabarGymText_75a9d db "@" -CinnabarGymText_75aa2: ; 75aa2 (1d:5aa2) +CinnabarGymText_75aa2: TX_FAR _CinnabarGymText_75aa2 db "@" -CinnabarGymText_75aa7: ; 75aa7 (1d:5aa7) +CinnabarGymText_75aa7: TX_FAR _CinnabarGymText_75aa7 db "@" -CinnabarGymText9: ; 75aac (1d:5aac) +CinnabarGymText9: TX_ASM callab Func_f2133 jp TextScriptEnd diff --git a/scripts/cinnabargym3.asm b/scripts/cinnabargym3.asm index a85a3206..9e8cad74 100755 --- a/scripts/cinnabargym3.asm +++ b/scripts/cinnabargym3.asm @@ -9,11 +9,11 @@ Func_f2133: call PrintText ret -CinnabarGymText_75ac2: ; 75ac2 (1d:5ac2) +CinnabarGymText_75ac2: TX_FAR _CinnabarGymText_75ac2 db "@" -CinnabarGymText_75ac7: ; 75ac7 (1d:5ac7) +CinnabarGymText_75ac7: TX_FAR _CinnabarGymText_75ac7 db "@" diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index a6fa3af7..2c6fda4e 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -1,4 +1,4 @@ -CinnabarIslandScript: ; 1ca19 (7:4a19) +CinnabarIslandScript: call EnableAutoTextBoxDrawing ld hl, wd126 set 5, [hl] @@ -8,11 +8,11 @@ CinnabarIslandScript: ; 1ca19 (7:4a19) ld a, [W_CINNABARISLANDCURSCRIPT] jp JumpTable -CinnabarIslandScriptPointers: ; 1ca34 (7:4a34) +CinnabarIslandScriptPointers: dw CinnabarIslandScript0 dw CinnabarIslandScript1 -CinnabarIslandScript0: ; 1ca38 (7:4a38) +CinnabarIslandScript0: ld b, SECRET_KEY call IsItemInBag ret nz @@ -41,7 +41,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld [W_CINNABARISLANDCURSCRIPT], a ret -CinnabarIslandScript1: ; 1ca73 (7:4a73) +CinnabarIslandScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -50,7 +50,7 @@ CinnabarIslandScript1: ; 1ca73 (7:4a73) ld [W_CINNABARISLANDCURSCRIPT], a ret -CinnabarIslandTextPointers: ; 1ca81 (7:4a81) +CinnabarIslandTextPointers: dw CinnabarIslandText1 dw CinnabarIslandText2 dw CinnabarIslandText3 @@ -60,26 +60,26 @@ CinnabarIslandTextPointers: ; 1ca81 (7:4a81) dw CinnabarIslandText7 dw CinnabarIslandText8 -CinnabarIslandText8: ; 1ca91 (7:4a91) +CinnabarIslandText8: TX_FAR _CinnabarIslandText8 db "@" -CinnabarIslandText1: ; 1ca96 (7:4a96) +CinnabarIslandText1: TX_FAR _CinnabarIslandText1 db "@" -CinnabarIslandText2: ; 1ca9b (7:4a9b) +CinnabarIslandText2: TX_FAR _CinnabarIslandText2 db "@" -CinnabarIslandText3: ; 1caa0 (7:4aa0) +CinnabarIslandText3: TX_FAR _CinnabarIslandText3 db "@" -CinnabarIslandText6: ; 1caa5 (7:4aa5) +CinnabarIslandText6: TX_FAR _CinnabarIslandText6 db "@" -CinnabarIslandText7: ; 1caaa (7:4aaa) +CinnabarIslandText7: TX_FAR _CinnabarIslandText7 db "@" diff --git a/scripts/cinnabarmart.asm b/scripts/cinnabarmart.asm index 2abd7b67..35e9b4ce 100755 --- a/scripts/cinnabarmart.asm +++ b/scripts/cinnabarmart.asm @@ -1,15 +1,15 @@ -CinnabarMartScript: ; 75e7e (1d:5e7e) +CinnabarMartScript: jp EnableAutoTextBoxDrawing -CinnabarMartTextPointers: ; 75e81 (1d:5e81) +CinnabarMartTextPointers: dw CinnabarMartText1 dw CinnabarMartText2 dw CinnabarMartText3 -CinnabarMartText2: ; 75e87 (1d:5e87) +CinnabarMartText2: TX_FAR _CinnabarMartText2 db "@" -CinnabarMartText3: ; 75e8c (1d:5e8c) +CinnabarMartText3: TX_FAR _CinnabarMartText3 db "@" diff --git a/scripts/cinnabarpokecenter.asm b/scripts/cinnabarpokecenter.asm index fd49ae85..b4305d02 100755 --- a/scripts/cinnabarpokecenter.asm +++ b/scripts/cinnabarpokecenter.asm @@ -1,26 +1,26 @@ -CinnabarPokecenterScript: ; 75e2c (1d:5e2c) +CinnabarPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CinnabarPokecenterTextPointers: ; 75e32 (1d:5e32) +CinnabarPokecenterTextPointers: dw CinnabarPokecenterText1 dw CinnabarPokecenterText2 dw CinnabarPokecenterText3 dw CinnabarPokecenterText4 dw CinnabarPokecenterText5 -CinnabarPokecenterText1: ; 75e3a (1d:5e3a) +CinnabarPokecenterText1: TX_POKECENTER_NURSE -CinnabarPokecenterText2: ; 75e3b (1d:5e3b) +CinnabarPokecenterText2: TX_FAR _CinnabarPokecenterText1 db "@" -CinnabarPokecenterText3: ; 75e40 (1d:5e40) +CinnabarPokecenterText3: TX_FAR _CinnabarPokecenterText3 db "@" -CinnabarPokecenterText4: ; 75e45 (1d:5e45) +CinnabarPokecenterText4: TX_CABLE_CLUB_RECEPTIONIST CinnabarPokecenterText5: diff --git a/scripts/colosseum.asm b/scripts/colosseum.asm index e4ba4611..bdfa3c44 100644 --- a/scripts/colosseum.asm +++ b/scripts/colosseum.asm @@ -1,9 +1,9 @@ -ColosseumScript: ; 4fd7d (13:7d7d) +ColosseumScript: jp TradeCenterScript -ColosseumTextPointers: ; 4fd80 (13:7d80) +ColosseumTextPointers: dw ColosseumText1 -ColosseumText1: ; 4fd82 (13:7d82) +ColosseumText1: TX_FAR _ColosseumText1 db "@" diff --git a/scripts/copycatshouse1f.asm b/scripts/copycatshouse1f.asm index bc76da1a..25cd0fc2 100755 --- a/scripts/copycatshouse1f.asm +++ b/scripts/copycatshouse1f.asm @@ -1,20 +1,20 @@ -CopycatsHouse1FScript: ; 75ec3 (1d:5ec3) +CopycatsHouse1FScript: jp EnableAutoTextBoxDrawing -CopycatsHouse1FTextPointers: ; 75ec6 (1d:5ec6) +CopycatsHouse1FTextPointers: dw CopycatsHouse1FText1 dw CopycatsHouse1FText2 dw CopycatsHouse1FText3 -CopycatsHouse1FText1: ; 75ecc (1d:5ecc) +CopycatsHouse1FText1: TX_FAR _CopycatsHouse1FText1 db "@" -CopycatsHouse1FText2: ; 75ed1 (1d:5ed1) +CopycatsHouse1FText2: TX_FAR _CopycatsHouse1FText2 db "@" -CopycatsHouse1FText3: ; 75ed6 (1d:5ed6) +CopycatsHouse1FText3: TX_FAR _CopycatsHouse1FText3 TX_ASM ld a, CHANSEY diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm index 6d896ce7..7bf8d0e9 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/copycatshouse2f.asm @@ -1,7 +1,7 @@ -CopycatsHouse2FScript: ; 5cc71 (17:4c71) +CopycatsHouse2FScript: jp EnableAutoTextBoxDrawing -CopycatsHouse2FTextPointers: ; 5cc74 (17:4c74) +CopycatsHouse2FTextPointers: dw CopycatsHouse2FText1 dw CopycatsHouse2FText2 dw CopycatsHouse2FText3 @@ -10,7 +10,7 @@ CopycatsHouse2FTextPointers: ; 5cc74 (17:4c74) dw CopycatsHouse2FText6 dw CopycatsHouse2FText7 -CopycatsHouse2FText1: ; 5cc82 (17:4c82) +CopycatsHouse2FText1: TX_ASM CheckEvent EVENT_GOT_TM31 jr nz, .asm_7ccf3 @@ -43,44 +43,44 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82) .asm_62ecd jp TextScriptEnd -CopycatsHouse2FText_5ccd4: ; 5ccd4 (17:4cd4) +CopycatsHouse2FText_5ccd4: TX_FAR _CopycatsHouse2FText_5ccd4 db "@" -TM31PreReceiveText: ; 5ccd9 (17:4cd9) +TM31PreReceiveText: TX_FAR _TM31PreReceiveText db "@" -ReceivedTM31Text: ; 5ccde (17:4cde) +ReceivedTM31Text: TX_FAR _ReceivedTM31Text db $0B -TM31ExplanationText1: ; 5cce3 (17:4ce3) +TM31ExplanationText1: TX_FAR _TM31ExplanationText1 db $d, "@" -TM31ExplanationText2: ; 5cce9 (17:4ce9) +TM31ExplanationText2: TX_FAR _TM31ExplanationText2 db "@" -TM31NoRoomText: ; 5ccee (17:4cee) +TM31NoRoomText: TX_FAR _TM31NoRoomText db $d, "@" -CopycatsHouse2FText2: ; 5ccf4 (17:4cf4) +CopycatsHouse2FText2: TX_FAR _CopycatsHouse2FText2 db "@" -CopycatsHouse2FText5: ; 5ccf9 (17:4cf9) -CopycatsHouse2FText4: ; 5ccf9 (17:4cf9) -CopycatsHouse2FText3: ; 5ccf9 (17:4cf9) +CopycatsHouse2FText5: +CopycatsHouse2FText4: +CopycatsHouse2FText3: TX_FAR _CopycatsHouse2FText3 db "@" -CopycatsHouse2FText6: ; 5ccfe (17:4cfe) +CopycatsHouse2FText6: TX_FAR _CopycatsHouse2FText6 db "@" -CopycatsHouse2FText7: ; 5cd03 (17:4d03) +CopycatsHouse2FText7: TX_ASM ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP @@ -91,10 +91,10 @@ CopycatsHouse2FText7: ; 5cd03 (17:4d03) call PrintText jp TextScriptEnd -CopycatsHouse2FText_5cd17: ; 5cd17 (17:4d17) +CopycatsHouse2FText_5cd17: TX_FAR _CopycatsHouse2FText_5cd17 db "@" -CopycatsHouse2FText_5cd1c: ; 5cd1c (17:4d1c) +CopycatsHouse2FText_5cd1c: TX_FAR _CopycatsHouse2FText_5cd1c db "@" diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 82622285..6df2bcd6 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -1,10 +1,10 @@ -DayCareMScript: ; 5624f (15:624f) +DayCareMScript: jp EnableAutoTextBoxDrawing -DayCareMTextPointers: ; 56252 (15:6252) +DayCareMTextPointers: dw DayCareMText1 -DayCareMText1: ; 56254 (15:6254) +DayCareMText1: TX_ASM call SaveScreenTilesToBuffer2 ld a, [wDayCareInUse] @@ -239,60 +239,60 @@ DayCareMText1: ; 56254 (15:6254) call PrintText jp TextScriptEnd -DayCareIntroText: ; 5640f (15:640f) +DayCareIntroText: TX_FAR _DayCareIntroText db "@" -DayCareWhichMonText: ; 56414 (15:6414) +DayCareWhichMonText: TX_FAR _DayCareWhichMonText db "@" -DayCareWillLookAfterMonText: ; 56419 (15:6419) +DayCareWillLookAfterMonText: TX_FAR _DayCareWillLookAfterMonText db "@" -DayCareComeSeeMeInAWhileText: ; 5641e (15:641e) +DayCareComeSeeMeInAWhileText: TX_FAR _DayCareComeSeeMeInAWhileText db "@" -DayCareMonHasGrownText: ; 56423 (15:6423) +DayCareMonHasGrownText: TX_FAR _DayCareMonHasGrownText db "@" -DayCareOweMoneyText: ; 56428 (15:6428) +DayCareOweMoneyText: TX_FAR _DayCareOweMoneyText db "@" -DayCareGotMonBackText: ; 5642d (15:642d) +DayCareGotMonBackText: TX_FAR _DayCareGotMonBackText db "@" -DayCareMonNeedsMoreTimeText: ; 56432 (15:6432) +DayCareMonNeedsMoreTimeText: TX_FAR _DayCareMonNeedsMoreTimeText db "@" -DayCareAllRightThenText: ; 56437 (15:6437) +DayCareAllRightThenText: TX_FAR _DayCareAllRightThenText -DayCareComeAgainText: ; 5643b (15:643b) +DayCareComeAgainText: TX_FAR _DayCareComeAgainText db "@" -DayCareNoRoomForMonText: ; 56440 (15:6440) +DayCareNoRoomForMonText: TX_FAR _DayCareNoRoomForMonText db "@" -DayCareOnlyHaveOneMonText: ; 56445 (15:6445) +DayCareOnlyHaveOneMonText: TX_FAR _DayCareOnlyHaveOneMonText db "@" -DayCareCantAcceptMonWithHMText: ; 5644a (15:644a) +DayCareCantAcceptMonWithHMText: TX_FAR _DayCareCantAcceptMonWithHMText db "@" -DayCareHeresYourMonText: ; 5644f (15:644f) +DayCareHeresYourMonText: TX_FAR _DayCareHeresYourMonText db "@" -DayCareNotEnoughMoneyText: ; 56454 (15:6454) +DayCareNotEnoughMoneyText: TX_FAR _DayCareNotEnoughMoneyText db "@" diff --git a/scripts/diglettscave.asm b/scripts/diglettscave.asm index efbf9713..593b12a6 100755 --- a/scripts/diglettscave.asm +++ b/scripts/diglettscave.asm @@ -1,5 +1,5 @@ -DiglettsCaveScript: ; 61f6e (18:5f6e) +DiglettsCaveScript: jp EnableAutoTextBoxDrawing -DiglettsCaveTextPointers: ; 61f71 (18:5f71) +DiglettsCaveTextPointers: db "@" diff --git a/scripts/diglettscaveroute11.asm b/scripts/diglettscaveroute11.asm index 43e3f24e..d97a8446 100755 --- a/scripts/diglettscaveroute11.asm +++ b/scripts/diglettscaveroute11.asm @@ -1,12 +1,12 @@ -DiglettsCaveEntranceRoute11Script: ; 1e5ba (7:65ba) +DiglettsCaveEntranceRoute11Script: call EnableAutoTextBoxDrawing ld a, ROUTE_11 ld [wLastMap], a ret -DiglettsCaveEntranceRoute11TextPointers: ; 1e5c3 (7:65c3) +DiglettsCaveEntranceRoute11TextPointers: dw DiglettsCaveEntranceRoute11Text1 -DiglettsCaveEntranceRoute11Text1: ; 1e5c5 (7:65c5) +DiglettsCaveEntranceRoute11Text1: TX_FAR _DiglettsCaveEntRoute11Text1 db "@" diff --git a/scripts/diglettscaveroute2.asm b/scripts/diglettscaveroute2.asm index 1bee2a1c..9f061daa 100755 --- a/scripts/diglettscaveroute2.asm +++ b/scripts/diglettscaveroute2.asm @@ -1,11 +1,11 @@ -DiglettsCaveRoute2Script: ; 1deb0 (7:5eb0) +DiglettsCaveRoute2Script: ld a, ROUTE_2 ld [wLastMap], a jp EnableAutoTextBoxDrawing -DiglettsCaveRoute2TextPointers: ; 1deb8 (7:5eb8) +DiglettsCaveRoute2TextPointers: dw DiglettsCaveRoute2Text1 -DiglettsCaveRoute2Text1: ; 1deba (7:5eba) +DiglettsCaveRoute2Text1: TX_FAR _DiglettsCaveRoute2Text1 db "@" diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index 21be1443..44c55168 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -1,4 +1,4 @@ -FanClubScript: ; 59b70 (16:5b70) +FanClubScript: call EnableAutoTextBoxDrawing ld hl, FanClubScriptPointers ld a, [W_FANCLUBCURSCRIPT] @@ -68,7 +68,7 @@ PikachuMovementScript_59a8c: db $1e db $3f -FanClubTextPointers: ; 59b84 (16:5b84) +FanClubTextPointers: dw FanClubText1 dw FanClubText2 dw FanClubText3 @@ -302,6 +302,6 @@ Text_59c2e: TX_FAR FanClubChairPrintText4 db "@" -FanClubText6: ; 59c88 (16:5c88) +FanClubText6: TX_FAR _FanClubText6 db "@" diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index 101701b1..9a79506e 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -1,4 +1,4 @@ -FightingDojoScript: ; 5cd5d (17:4d5d) +FightingDojoScript: call EnableAutoTextBoxDrawing ld hl, FightingDojoTrainerHeaders ld de, FightingDojoScriptPointers @@ -7,20 +7,20 @@ FightingDojoScript: ; 5cd5d (17:4d5d) ld [W_FIGHTINGDOJOCURSCRIPT], a ret -FightingDojoScript_5cd70: ; 5cd70 (17:4d70) +FightingDojoScript_5cd70: xor a ld [wJoyIgnore], a ld [W_FIGHTINGDOJOCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -FightingDojoScriptPointers: ; 5cd7b (17:4d7b) +FightingDojoScriptPointers: dw FightingDojoScript1 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw FightingDojoScript3 -FightingDojoScript1: ; 5cd83 (17:4d83) +FightingDojoScript1: CheckEvent EVENT_DEFEATED_FIGHTING_DOJO ret nz call CheckFightingMapTrainers @@ -52,7 +52,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83) call DisplayTextID ret -FightingDojoScript3: ; 5cdc6 (17:4dc6) +FightingDojoScript3: ld a, [wIsInBattle] cp $ff jp z, FightingDojoScript_5cd70 @@ -80,7 +80,7 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6) ld [W_CURMAPSCRIPT], a ret -FightingDojoTextPointers: ; 5ce03 (17:4e03) +FightingDojoTextPointers: dw FightingDojoText1 dw FightingDojoText2 dw FightingDojoText3 @@ -90,8 +90,8 @@ FightingDojoTextPointers: ; 5ce03 (17:4e03) dw FightingDojoText7 dw FightingDojoText8 -FightingDojoTrainerHeaders: ; 5ce13 (17:4e13) -FightingDojoTrainerHeader0: ; 5ce13 (17:4e13) +FightingDojoTrainerHeaders: +FightingDojoTrainerHeader0: dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_0 @@ -100,7 +100,7 @@ FightingDojoTrainerHeader0: ; 5ce13 (17:4e13) dw FightingDojoEndBattleText1 ; TextEndBattle dw FightingDojoEndBattleText1 ; TextEndBattle -FightingDojoTrainerHeader1: ; 5ce1f (17:4e1f) +FightingDojoTrainerHeader1: dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_1 @@ -109,7 +109,7 @@ FightingDojoTrainerHeader1: ; 5ce1f (17:4e1f) dw FightingDojoEndBattleText2 ; TextEndBattle dw FightingDojoEndBattleText2 ; TextEndBattle -FightingDojoTrainerHeader2: ; 5ce2b (17:4e2b) +FightingDojoTrainerHeader2: dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_2 @@ -118,7 +118,7 @@ FightingDojoTrainerHeader2: ; 5ce2b (17:4e2b) dw FightingDojoEndBattleText3 ; TextEndBattle dw FightingDojoEndBattleText3 ; TextEndBattle -FightingDojoTrainerHeader3: ; 5ce37 (17:4e37) +FightingDojoTrainerHeader3: dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_FIGHTING_DOJO_TRAINER_3 @@ -129,7 +129,7 @@ FightingDojoTrainerHeader3: ; 5ce37 (17:4e37) db $ff -FightingDojoText1: ; 5ce44 (17:4e44) +FightingDojoText1: TX_ASM CheckEvent EVENT_DEFEATED_FIGHTING_DOJO jp nz, .continue1 @@ -161,95 +161,95 @@ FightingDojoText1: ; 5ce44 (17:4e44) .asm_9dba4 jp TextScriptEnd -FightingDojoText_5ce8e: ; 5ce8e (17:4e8e) +FightingDojoText_5ce8e: TX_FAR _FightingDojoText_5ce8e db "@" -FightingDojoText_5ce93: ; 5ce93 (17:4e93) +FightingDojoText_5ce93: TX_FAR _FightingDojoText_5ce93 db "@" -FightingDojoText8: ; 5ce98 (17:4e98) +FightingDojoText8: TX_FAR _FightingDojoText_5ce98 db "@" -FightingDojoText_5ce9d: ; 5ce9d (17:4e9d) +FightingDojoText_5ce9d: TX_FAR _FightingDojoText_5ce9d db "@" -FightingDojoText2: ; 5cea2 (17:4ea2) +FightingDojoText2: TX_ASM ld hl, FightingDojoTrainerHeader0 call TalkToTrainer jp TextScriptEnd -FightingDojoBattleText1: ; 5ceac (17:4eac) +FightingDojoBattleText1: TX_FAR _FightingDojoBattleText1 db "@" -FightingDojoEndBattleText1: ; 5ceb1 (17:4eb1) +FightingDojoEndBattleText1: TX_FAR _FightingDojoEndBattleText1 db "@" -FightingDojoAfterBattleText1: ; 5ceb6 (17:4eb6) +FightingDojoAfterBattleText1: TX_FAR _FightingDojoAfterBattleText1 db "@" -FightingDojoText3: ; 5cebb (17:4ebb) +FightingDojoText3: TX_ASM ld hl, FightingDojoTrainerHeader1 call TalkToTrainer jp TextScriptEnd -FightingDojoBattleText2: ; 5cec5 (17:4ec5) +FightingDojoBattleText2: TX_FAR _FightingDojoBattleText2 db "@" -FightingDojoEndBattleText2: ; 5ceca (17:4eca) +FightingDojoEndBattleText2: TX_FAR _FightingDojoEndBattleText2 db "@" -FightingDojoAfterBattleText2: ; 5cecf (17:4ecf) +FightingDojoAfterBattleText2: TX_FAR _FightingDojoAfterBattleText2 db "@" -FightingDojoText4: ; 5ced4 (17:4ed4) +FightingDojoText4: TX_ASM ld hl, FightingDojoTrainerHeader2 call TalkToTrainer jp TextScriptEnd -FightingDojoBattleText3: ; 5cede (17:4ede) +FightingDojoBattleText3: TX_FAR _FightingDojoBattleText3 db "@" -FightingDojoEndBattleText3: ; 5cee3 (17:4ee3) +FightingDojoEndBattleText3: TX_FAR _FightingDojoEndBattleText3 db "@" -FightingDojoAfterBattleText3: ; 5cee8 (17:4ee8) +FightingDojoAfterBattleText3: TX_FAR _FightingDojoAfterBattleText3 db "@" -FightingDojoText5: ; 5ceed (17:4eed) +FightingDojoText5: TX_ASM ld hl, FightingDojoTrainerHeader3 call TalkToTrainer jp TextScriptEnd -FightingDojoBattleText4: ; 5cef7 (17:4ef7) +FightingDojoBattleText4: TX_FAR _FightingDojoBattleText4 db "@" -FightingDojoEndBattleText4: ; 5cefc (17:4efc) +FightingDojoEndBattleText4: TX_FAR _FightingDojoEndBattleText4 db "@" -FightingDojoAfterBattleText4: ; 5cf01 (17:4f01) +FightingDojoAfterBattleText4: TX_FAR _FightingDojoAfterBattleText4 db "@" -FightingDojoText6: ; 5cf06 (17:4f06) +FightingDojoText6: ; Hitmonlee Poké Ball TX_ASM CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN @@ -280,11 +280,11 @@ FightingDojoText6: ; 5cf06 (17:4f06) .done jp TextScriptEnd -WantHitmonleeText: ; 5cf49 (17:4f49) +WantHitmonleeText: TX_FAR _WantHitmonleeText db "@" -FightingDojoText7: ; 5cf4e (17:4f4e) +FightingDojoText7: ; Hitmonchan Poké Ball TX_ASM CheckEitherEventSet EVENT_GOT_HITMONLEE, EVENT_GOT_HITMONCHAN @@ -315,10 +315,10 @@ FightingDojoText7: ; 5cf4e (17:4f4e) .done jp TextScriptEnd -WantHitmonchanText: ; 5cf91 (17:4f91) +WantHitmonchanText: TX_FAR _WantHitmonchanText db "@" -OtherHitmonText: ; 5cf96 (17:4f96) +OtherHitmonText: TX_FAR _OtherHitmonText db "@" diff --git a/scripts/fuchsiacity.asm b/scripts/fuchsiacity.asm index cdf8e203..74d7ee30 100755 --- a/scripts/fuchsiacity.asm +++ b/scripts/fuchsiacity.asm @@ -1,7 +1,7 @@ -FuchsiaCityScript: ; 19a2b (6:5a2b) +FuchsiaCityScript: jp EnableAutoTextBoxDrawing -FuchsiaCityTextPointers: ; 19a2e (6:5a2e) +FuchsiaCityTextPointers: dw FuchsiaCityText1 dw FuchsiaCityText2 dw FuchsiaCityText3 @@ -27,53 +27,53 @@ FuchsiaCityTextPointers: ; 19a2e (6:5a2e) dw FuchsiaCityText23 dw FuchsiaCityText24 -FuchsiaCityText1: ; 19a5e (6:5a5e) +FuchsiaCityText1: TX_FAR _FuchsiaCityText1 db "@" -FuchsiaCityText2: ; 19a63 (6:5a63) +FuchsiaCityText2: TX_FAR _FuchsiaCityText2 db "@" -FuchsiaCityText3: ; 19a68 (6:5a68) +FuchsiaCityText3: TX_FAR _FuchsiaCityText3 db "@" -FuchsiaCityText4: ; 19a6d (6:5a6d) +FuchsiaCityText4: TX_FAR _FuchsiaCityText4 db "@" -FuchsiaCityText5: ; 19a72 (6:5a72) -FuchsiaCityText6: ; 19a72 (6:5a72) -FuchsiaCityText7: ; 19a72 (6:5a72) -FuchsiaCityText8: ; 19a72 (6:5a72) -FuchsiaCityText9: ; 19a72 (6:5a72) -FuchsiaCityText10: ; 19a72 (6:5a72) +FuchsiaCityText5: +FuchsiaCityText6: +FuchsiaCityText7: +FuchsiaCityText8: +FuchsiaCityText9: +FuchsiaCityText10: TX_FAR _FuchsiaCityText5 db "@" -FuchsiaCityText12: ; 19a77 (6:5a77) -FuchsiaCityText11: ; 19a77 (6:5a77) +FuchsiaCityText12: +FuchsiaCityText11: TX_FAR _FuchsiaCityText11 db "@" -FuchsiaCityText13: ; 19a7c (6:5a7c) +FuchsiaCityText13: TX_FAR _FuchsiaCityText13 db "@" -FuchsiaCityText16: ; 19a81 (6:5a81) +FuchsiaCityText16: TX_FAR _FuchsiaCityText16 db "@" -FuchsiaCityText17: ; 19a86 (6:5a86) +FuchsiaCityText17: TX_FAR _FuchsiaCityText17 db "@" -FuchsiaCityText18: ; 19a8b (6:5a8b) +FuchsiaCityText18: TX_FAR _FuchsiaCityText18 db "@" -FuchsiaCityText19: ; 19a90 (6:5a90) +FuchsiaCityText19: TX_ASM ld hl, FuchsiaCityChanseyText call PrintText @@ -81,11 +81,11 @@ FuchsiaCityText19: ; 19a90 (6:5a90) call DisplayPokedex jp TextScriptEnd -FuchsiaCityChanseyText: ; 19a9f (6:5a9f) +FuchsiaCityChanseyText: TX_FAR _FuchsiaCityChanseyText db "@" -FuchsiaCityText20: ; 19aa4 (6:5aa4) +FuchsiaCityText20: TX_ASM ld hl, FuchsiaCityVoltorbText call PrintText @@ -93,11 +93,11 @@ FuchsiaCityText20: ; 19aa4 (6:5aa4) call DisplayPokedex jp TextScriptEnd -FuchsiaCityVoltorbText: ; 19ab3 (6:5ab3) +FuchsiaCityVoltorbText: TX_FAR _FuchsiaCityVoltorbText db "@" -FuchsiaCityText21: ; 19ab8 (6:5ab8) +FuchsiaCityText21: TX_ASM ld hl, FuchsiaCityKangaskhanText call PrintText @@ -105,11 +105,11 @@ FuchsiaCityText21: ; 19ab8 (6:5ab8) call DisplayPokedex jp TextScriptEnd -FuchsiaCityKangaskhanText: ; 19ac7 (6:5ac7) +FuchsiaCityKangaskhanText: TX_FAR _FuchsiaCityKangaskhanText db "@" -FuchsiaCityText22: ; 19acc (6:5acc) +FuchsiaCityText22: TX_ASM ld hl, FuchsiaCitySlowpokeText call PrintText @@ -117,11 +117,11 @@ FuchsiaCityText22: ; 19acc (6:5acc) call DisplayPokedex jp TextScriptEnd -FuchsiaCitySlowpokeText: ; 19adb (6:5adb) +FuchsiaCitySlowpokeText: TX_FAR _FuchsiaCitySlowpokeText db "@" -FuchsiaCityText23: ; 19ae0 (6:5ae0) +FuchsiaCityText23: TX_ASM ld hl, FuchsiaCityLaprasText call PrintText @@ -129,11 +129,11 @@ FuchsiaCityText23: ; 19ae0 (6:5ae0) call DisplayPokedex jp TextScriptEnd -FuchsiaCityLaprasText: ; 19aef (6:5aef) +FuchsiaCityLaprasText: TX_FAR _FuchsiaCityLaprasText db "@" -FuchsiaCityText24: ; 19af4 (6:5af4) +FuchsiaCityText24: TX_ASM CheckEvent EVENT_GOT_DOME_FOSSIL jr nz, .asm_3b4e8 @@ -156,14 +156,14 @@ FuchsiaCityText24: ; 19af4 (6:5af4) .asm_4343f jp TextScriptEnd -FuchsiaCityOmanyteText: ; 19b20 (6:5b20) +FuchsiaCityOmanyteText: TX_FAR _FuchsiaCityOmanyteText db "@" -FuchsiaCityKabutoText: ; 19b25 (6:5b25) +FuchsiaCityKabutoText: TX_FAR _FuchsiaCityKabutoText db "@" -FuchsiaCityText_19b2a: ; 19b2a (6:5b2a) +FuchsiaCityText_19b2a: TX_FAR _FuchsiaCityText_19b2a db "@" diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index 70f9fff0..a67cc0c8 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -1,4 +1,4 @@ -FuchsiaGymScript: ; 7543d (1d:543d) +FuchsiaGymScript: call FuchsiaGymScript_75453 call EnableAutoTextBoxDrawing ld hl, FuchsiaGymTrainerHeaders @@ -8,7 +8,7 @@ FuchsiaGymScript: ; 7543d (1d:543d) ld [W_FUCHSIAGYMCURSCRIPT], a ret -FuchsiaGymScript_75453: ; 75453 (1d:5453) +FuchsiaGymScript_75453: ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -18,31 +18,31 @@ FuchsiaGymScript_75453: ; 75453 (1d:5453) call LoadGymLeaderAndCityName ret -Gym5CityName: ; 75465 (1d:5465) +Gym5CityName: db "FUCHSIA CITY@" -Gym5LeaderName: ; 75472 (1d:5472) +Gym5LeaderName: db "KOGA@" -FuchsiaGymScript_75477: ; 75477 (1d:5477) +FuchsiaGymScript_75477: xor a ld [wJoyIgnore], a ld [W_FUCHSIAGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -FuchsiaGymScriptPointers: ; 75482 (1d:5482) +FuchsiaGymScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw FuchsiaGymScript3 -FuchsiaGymScript3: ; 7548a (1d:548a) +FuchsiaGymScript3: ld a, [wIsInBattle] cp $ff jp z, FuchsiaGymScript_75477 ld a, $f0 ld [wJoyIgnore], a -FuchsiaGymScript3_75497: ; 75497 (1d:5497) +FuchsiaGymScript3_75497: ld a, $9 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -70,7 +70,7 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497) jp FuchsiaGymScript_75477 -FuchsiaGymTextPointers: ; 754d5 (1d:54d5) +FuchsiaGymTextPointers: dw FuchsiaGymText1 dw FuchsiaGymText2 dw FuchsiaGymText3 @@ -83,8 +83,8 @@ FuchsiaGymTextPointers: ; 754d5 (1d:54d5) dw FuchsiaGymText10 dw FuchsiaGymText11 -FuchsiaGymTrainerHeaders: ; 754eb (1d:54eb) -FuchsiaGymTrainerHeader0: ; 754eb (1d:54eb) +FuchsiaGymTrainerHeaders: +FuchsiaGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_0 @@ -93,7 +93,7 @@ FuchsiaGymTrainerHeader0: ; 754eb (1d:54eb) dw FuchsiaGymEndBattleText1 ; TextEndBattle dw FuchsiaGymEndBattleText1 ; TextEndBattle -FuchsiaGymTrainerHeader2: ; 754f7 (1d:54f7) +FuchsiaGymTrainerHeader2: dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2 @@ -102,7 +102,7 @@ FuchsiaGymTrainerHeader2: ; 754f7 (1d:54f7) dw FuchsiaGymEndBattleText2 ; TextEndBattle dw FuchsiaGymEndBattleText2 ; TextEndBattle -FuchsiaGymTrainerHeader3: ; 75503 (1d:5503) +FuchsiaGymTrainerHeader3: dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3 @@ -111,7 +111,7 @@ FuchsiaGymTrainerHeader3: ; 75503 (1d:5503) dw FuchsiaGymEndBattleText3 ; TextEndBattle dw FuchsiaGymEndBattleText3 ; TextEndBattle -FuchsiaGymTrainerHeader4: ; 7550f (1d:550f) +FuchsiaGymTrainerHeader4: dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4 @@ -120,7 +120,7 @@ FuchsiaGymTrainerHeader4: ; 7550f (1d:550f) dw FuchsiaGymEndBattleText4 ; TextEndBattle dw FuchsiaGymEndBattleText4 ; TextEndBattle -FuchsiaGymTrainerHeader5: ; 7551b (1d:551b) +FuchsiaGymTrainerHeader5: dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5 @@ -129,7 +129,7 @@ FuchsiaGymTrainerHeader5: ; 7551b (1d:551b) dw FuchsiaGymEndBattleText5 ; TextEndBattle dw FuchsiaGymEndBattleText5 ; TextEndBattle -FuchsiaGymTrainerHeader6: ; 75527 (1d:5527) +FuchsiaGymTrainerHeader6: dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_6 @@ -140,7 +140,7 @@ FuchsiaGymTrainerHeader6: ; 75527 (1d:5527) db $ff -FuchsiaGymText1: ; 75534 (1d:5534) +FuchsiaGymText1: TX_ASM CheckEvent EVENT_BEAT_KOGA jr z, .asm_181b6 @@ -175,143 +175,143 @@ FuchsiaGymText1: ; 75534 (1d:5534) .asm_e84c6 jp TextScriptEnd -KogaBeforeBattleText: ; 75581 (1d:5581) +KogaBeforeBattleText: TX_FAR _KogaBeforeBattleText db "@" -KogaAfterBattleText: ; 75586 (1d:5586) +KogaAfterBattleText: TX_FAR _KogaAfterBattleText db "@" -KogaExplainToxicText: ; 7558b (1d:558b) +KogaExplainToxicText: TX_FAR _KogaExplainToxicText db "@" -FuchsiaGymText9: ; 75590 (1d:5590) +FuchsiaGymText9: TX_FAR _FuchsiaGymText9 db "@" -FuchsiaGymText10: ; 75595 (1d:5595) +FuchsiaGymText10: TX_FAR _ReceivedTM06Text db $11 -TM06ExplanationText: ; 7559a (1d:559a) +TM06ExplanationText: TX_FAR _TM06ExplanationText db "@" -FuchsiaGymText11: ; 7559f (1d:559f) +FuchsiaGymText11: TX_FAR _TM06NoRoomText db "@" -FuchsiaGymText2: ; 755a4 (1d:55a4) +FuchsiaGymText2: TX_ASM ld hl, FuchsiaGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText1: ; 755ae (1d:55ae) +FuchsiaGymBattleText1: TX_FAR _FuchsiaGymBattleText1 db "@" -FuchsiaGymEndBattleText1: ; 755b3 (1d:55b3) +FuchsiaGymEndBattleText1: TX_FAR _FuchsiaGymEndBattleText1 db "@" -FuchsiaGymAfterBattleText1: ; 755b8 (1d:55b8) +FuchsiaGymAfterBattleText1: TX_FAR _FuchsiaGymAfterBattleText1 db "@" -FuchsiaGymText3: ; 755bd (1d:55bd) +FuchsiaGymText3: TX_ASM ld hl, FuchsiaGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText2: ; 755c7 (1d:55c7) +FuchsiaGymBattleText2: TX_FAR _FuchsiaGymBattleText2 db "@" -FuchsiaGymEndBattleText2: ; 755cc (1d:55cc) +FuchsiaGymEndBattleText2: TX_FAR _FuchsiaGymEndBattleText2 db "@" -FuchsiaGymAfterBattleText2: ; 755d1 (1d:55d1) +FuchsiaGymAfterBattleText2: TX_FAR _FuchsiaGymAfterBattleText2 db "@" -FuchsiaGymText4: ; 755d6 (1d:55d6) +FuchsiaGymText4: TX_ASM ld hl, FuchsiaGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText3: ; 755e0 (1d:55e0) +FuchsiaGymBattleText3: TX_FAR _FuchsiaGymBattleText3 db "@" -FuchsiaGymEndBattleText3: ; 755e5 (1d:55e5) +FuchsiaGymEndBattleText3: TX_FAR _FuchsiaGymEndBattleText3 db "@" -FuchsiaGymAfterBattleText3: ; 755ea (1d:55ea) +FuchsiaGymAfterBattleText3: TX_FAR _FuchsiaGymAfterBattleText3 db "@" -FuchsiaGymText5: ; 755ef (1d:55ef) +FuchsiaGymText5: TX_ASM ld hl, FuchsiaGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText4: ; 755f9 (1d:55f9) +FuchsiaGymBattleText4: TX_FAR _FuchsiaGymBattleText4 db "@" -FuchsiaGymEndBattleText4: ; 755fe (1d:55fe) +FuchsiaGymEndBattleText4: TX_FAR _FuchsiaGymEndBattleText4 db "@" -FuchsiaGymAfterBattleText4: ; 75603 (1d:5603) +FuchsiaGymAfterBattleText4: TX_FAR _FuchsiaGymAfterBattleText4 db "@" -FuchsiaGymText6: ; 75608 (1d:5608) +FuchsiaGymText6: TX_ASM ld hl, FuchsiaGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText5: ; 75612 (1d:5612) +FuchsiaGymBattleText5: TX_FAR _FuchsiaGymBattleText5 db "@" -FuchsiaGymEndBattleText5: ; 75617 (1d:5617) +FuchsiaGymEndBattleText5: TX_FAR _FuchsiaGymEndBattleText5 db "@" -FuchsiaGymAfterBattleText5: ; 7561c (1d:561c) +FuchsiaGymAfterBattleText5: TX_FAR _FuchsiaGymAfterBattleText5 db "@" -FuchsiaGymText7: ; 75621 (1d:5621) +FuchsiaGymText7: TX_ASM ld hl, FuchsiaGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd -FuchsiaGymBattleText6: ; 7562b (1d:562b) +FuchsiaGymBattleText6: TX_FAR _FuchsiaGymBattleText6 db "@" -FuchsiaGymEndBattleText6: ; 75630 (1d:5630) +FuchsiaGymEndBattleText6: TX_FAR _FuchsiaGymEndBattleText6 db "@" -FuchsiaGymAfterBattleText6: ; 75635 (1d:5635) +FuchsiaGymAfterBattleText6: TX_FAR _FuchsiaGymAfterBattleText6 db "@" -FuchsiaGymText8: ; 7563a (1d:563a) +FuchsiaGymText8: TX_ASM CheckEvent EVENT_BEAT_KOGA ld hl, FuchsiaGymText_75653 @@ -321,10 +321,10 @@ FuchsiaGymText8: ; 7563a (1d:563a) call PrintText jp TextScriptEnd -FuchsiaGymText_7564e: ; 7564e (1d:564e) +FuchsiaGymText_7564e: TX_FAR _FuchsiaGymText_7564e db "@" -FuchsiaGymText_75653: ; 75653 (1d:5653) +FuchsiaGymText_75653: TX_FAR _FuchsiaGymText_75653 db "@" diff --git a/scripts/fuchsiahouse1.asm b/scripts/fuchsiahouse1.asm index 4d5e6eb1..95e59503 100755 --- a/scripts/fuchsiahouse1.asm +++ b/scripts/fuchsiahouse1.asm @@ -1,20 +1,20 @@ -FuchsiaHouse1Script: ; 75018 (1d:5018) +FuchsiaHouse1Script: call EnableAutoTextBoxDrawing ret -FuchsiaHouse1TextPointers: ; 7501c (1d:501c) +FuchsiaHouse1TextPointers: dw FuchsiaHouse1Text1 dw FuchsiaHouse1Text2 dw FuchsiaHouse1Text3 -FuchsiaHouse1Text1: ; 75022 (1d:5022) +FuchsiaHouse1Text1: TX_FAR _FuchsiaHouse1Text1 db "@" -FuchsiaHouse1Text2: ; 75027 (1d:5027) +FuchsiaHouse1Text2: TX_FAR _FuchsiaHouse1Text2 db "@" -FuchsiaHouse1Text3: ; 7502c (1d:502c) +FuchsiaHouse1Text3: TX_FAR _FuchsiaHouse1Text3 db "@" diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm index 76b5e91f..7e90aa84 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/fuchsiahouse2.asm @@ -1,14 +1,14 @@ -FuchsiaHouse2Script: ; 750b5 (1d:50b5) +FuchsiaHouse2Script: jp EnableAutoTextBoxDrawing -FuchsiaHouse2TextPointers: ; 750b8 (1d:50b8) +FuchsiaHouse2TextPointers: dw FuchsiaHouse2Text1 dw PickUpItemText dw BoulderText dw FuchsiaHouse2Text4 dw FuchsiaHouse2Text5 -FuchsiaHouse2Text1: ; 750c2 (1d:50c2) +FuchsiaHouse2Text1: TX_ASM CheckEvent EVENT_GOT_HM04 jr nz, .subtract @@ -55,44 +55,44 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2) .asm_52039 jp TextScriptEnd -WardenGibberishText1: ; 75135 (1d:5135) +WardenGibberishText1: TX_FAR _WardenGibberishText1 db "@" -WardenGibberishText2: ; 7513a (1d:513a) +WardenGibberishText2: TX_FAR _WardenGibberishText2 db "@" -WardenGibberishText3: ; 7513f (1d:513f) +WardenGibberishText3: TX_FAR _WardenGibberishText3 db "@" -WardenTeethText1: ; 75144 (1d:5144) +WardenTeethText1: TX_FAR _WardenTeethText1 db $0b -WardenTeethText2: ; 75149 (1d:5149) +WardenTeethText2: TX_FAR _WardenTeethText2 db "@" -WardenThankYouText: ; 7514e (1d:514e) +WardenThankYouText: TX_FAR _WardenThankYouText db "@" -ReceivedHM04Text: ; 75153 (1d:5153) +ReceivedHM04Text: TX_FAR _ReceivedHM04Text db $0B, "@" -HM04ExplanationText: ; 75159 (1d:5159) +HM04ExplanationText: TX_FAR _HM04ExplanationText db "@" -HM04NoRoomText: ; 7515e (1d:515e) +HM04NoRoomText: TX_FAR _HM04NoRoomText db "@" -FuchsiaHouse2Text5: ; 75163 (1d:5163) -FuchsiaHouse2Text4: ; 75163 (1d:5163) +FuchsiaHouse2Text5: +FuchsiaHouse2Text4: TX_ASM ld a, [H_SPRITEINDEX] cp $4 @@ -103,10 +103,10 @@ FuchsiaHouse2Text4: ; 75163 (1d:5163) call PrintText jp TextScriptEnd -FuchsiaHouse2Text_75176: ; 75176 (1d:5176) +FuchsiaHouse2Text_75176: TX_FAR _FuchsiaHouse2Text_75176 db "@" -FuchsiaHouse2Text_7517b: ; 7517b (1d:517b) +FuchsiaHouse2Text_7517b: TX_FAR _FuchsiaHouse2Text_7517b db "@" diff --git a/scripts/fuchsiahouse3.asm b/scripts/fuchsiahouse3.asm index 2aabb9c2..fe1da024 100755 --- a/scripts/fuchsiahouse3.asm +++ b/scripts/fuchsiahouse3.asm @@ -1,10 +1,10 @@ -FuchsiaHouse3Script: ; 5617c (15:617c) +FuchsiaHouse3Script: jp EnableAutoTextBoxDrawing -FuchsiaHouse3TextPointers: ; 5617f (15:617f) +FuchsiaHouse3TextPointers: dw FuchsiaHouse3Text1 -FuchsiaHouse3Text1: ; 56181 (15:6181) +FuchsiaHouse3Text1: TX_ASM ld a, [wd728] bit 4, a @@ -43,16 +43,16 @@ FuchsiaHouse3Text1: ; 56181 (15:6181) call PrintText jp TextScriptEnd -FuchsiaHouse3Text_561bd: ; 561bd (15:61bd) +FuchsiaHouse3Text_561bd: TX_FAR _FuchsiaHouse3Text_561bd db "@" -FuchsiaHouse3Text_561c2: ; 561c2 (15:61c2) +FuchsiaHouse3Text_561c2: TX_FAR _FuchsiaHouse3Text_561c2 db $0B db "@" -UnusedText_561c8: ; 561c8 +UnusedText_561c8: para "つり こそ" line "おとこの ロマン だ!" @@ -62,14 +62,14 @@ UnusedText_561c8: ; 561c8 line "もっと いいもんが つれるんじゃ!" done -FuchsiaHouse3Text_56212: ; 56212 (15:6212) +FuchsiaHouse3Text_56212: TX_FAR _FuchsiaHouse3Text_56212 db "@" -FuchsiaHouse3Text_56217: ; 56217 (15:6217) +FuchsiaHouse3Text_56217: TX_FAR _FuchsiaHouse3Text_56217 db "@" -FuchsiaHouse3Text_5621c: ; 5621c (15:621c) +FuchsiaHouse3Text_5621c: TX_FAR _FuchsiaHouse3Text_5621c db "@" diff --git a/scripts/fuchsiamart.asm b/scripts/fuchsiamart.asm index 41aec49a..46049163 100755 --- a/scripts/fuchsiamart.asm +++ b/scripts/fuchsiamart.asm @@ -1,16 +1,16 @@ -FuchsiaMartScript: ; 1dd88 (7:5d88) +FuchsiaMartScript: call EnableAutoTextBoxDrawing ret -FuchsiaMartTextPointers: ; 1dd8b (7:5d8b) +FuchsiaMartTextPointers: dw FuchsiaMartText1 dw FuchsiaMartText2 dw FuchsiaMartText3 -FuchsiaMartText2: ; 1dd91 (7:5d91) +FuchsiaMartText2: TX_FAR _FuchsiaMartText2 db "@" -FuchsiaMartText3: ; 1dd96 (7:5d96) +FuchsiaMartText3: TX_FAR _FuchsiaMartText3 db "@" diff --git a/scripts/fuchsiameetingroom.asm b/scripts/fuchsiameetingroom.asm index 140a5ccc..7995a49b 100755 --- a/scripts/fuchsiameetingroom.asm +++ b/scripts/fuchsiameetingroom.asm @@ -1,20 +1,20 @@ -FuchsiaMeetingRoomScript: ; 756e3 (1d:56e3) +FuchsiaMeetingRoomScript: call EnableAutoTextBoxDrawing ret -FuchsiaMeetingRoomTextPointers: ; 756e7 (1d:56e7) +FuchsiaMeetingRoomTextPointers: dw FuchsiaMeetingRoomText1 dw FuchsiaMeetingRoomText2 dw FuchsiaMeetingRoomText3 -FuchsiaMeetingRoomText1: ; 756ed (1d:56ed) +FuchsiaMeetingRoomText1: TX_FAR _FuchsiaMeetingRoomText1 db "@" -FuchsiaMeetingRoomText2: ; 756f2 (1d:56f2) +FuchsiaMeetingRoomText2: TX_FAR _FuchsiaMeetingRoomText2 db "@" -FuchsiaMeetingRoomText3: ; 756f7 (1d:56f7) +FuchsiaMeetingRoomText3: TX_FAR _FuchsiaMeetingRoomText3 db "@" diff --git a/scripts/fuchsiapokecenter.asm b/scripts/fuchsiapokecenter.asm index 2ad3ac01..5f7afeb3 100755 --- a/scripts/fuchsiapokecenter.asm +++ b/scripts/fuchsiapokecenter.asm @@ -1,26 +1,26 @@ -FuchsiaPokecenterScript: ; 75063 (1d:5063) +FuchsiaPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -FuchsiaPokecenterTextPointers: ; 75069 (1d:5069) +FuchsiaPokecenterTextPointers: dw FuchsiaPokecenterText1 dw FuchsiaPokecenterText2 dw FuchsiaPokecenterText3 dw FuchsiaPokecenterText4 dw FuchsiaPokecenterText5 -FuchsiaPokecenterText1: ; 75071 (1d:5071) +FuchsiaPokecenterText1: db $ff -FuchsiaPokecenterText2: ; 75072 (1d:5072) +FuchsiaPokecenterText2: TX_FAR _FuchsiaPokecenterText1 db "@" -FuchsiaPokecenterText3: ; 75077 (1d:5077) +FuchsiaPokecenterText3: TX_FAR _FuchsiaPokecenterText3 db "@" -FuchsiaPokecenterText4: ; 7507c (1d:507c) +FuchsiaPokecenterText4: db $f6 FuchsiaPokecenterText5: diff --git a/scripts/gary.asm b/scripts/gary.asm index 290bd753..a000cc87 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -1,17 +1,17 @@ -GaryScript: ; 75f1d (1d:5f1d) +GaryScript: call EnableAutoTextBoxDrawing ld hl, GaryScriptPointers ld a, [W_GARYCURSCRIPT] call JumpTable ret -GaryScript_75f29: ; 75f29 (1d:5f29) +GaryScript_75f29: xor a ld [wJoyIgnore], a ld [W_GARYCURSCRIPT], a ret -GaryScriptPointers: ; 75f31 (1d:5f31) +GaryScriptPointers: dw GaryScript0 dw GaryScript1 dw GaryScript2 @@ -24,10 +24,10 @@ GaryScriptPointers: ; 75f31 (1d:5f31) dw GaryScript9 dw GaryScript10 -GaryScript0: ; 75f47 (1d:5f47) +GaryScript0: ret -GaryScript1: ; 75f48 (1d:5f48) +GaryScript1: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd @@ -40,13 +40,13 @@ GaryScript1: ; 75f48 (1d:5f48) ld [W_GARYCURSCRIPT], a ret -RLEMovement75f63: ; 75f63 (1d:5f63) +RLEMovement75f63: db D_UP, 1 db D_RIGHT, 1 db D_UP, 3 db $ff -GaryScript2: ; 75f6a (1d:5f6a) +GaryScript2: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -79,7 +79,7 @@ GaryScript2: ; 75f6a (1d:5f6a) ld [W_GARYCURSCRIPT], a ret -GaryScript3: ; 75fbb (1d:5fbb) +GaryScript3: ld a, [wIsInBattle] cp $ff jp z, GaryScript_75f29 @@ -97,7 +97,7 @@ GaryScript3: ; 75fbb (1d:5fbb) ld [W_GARYCURSCRIPT], a ret -GaryScript4: ; 75fe4 (1d:5fe4) +GaryScript4: callba Music_Cities1AlternateTempo ld a, $2 ld [hSpriteIndexOrTextID], a @@ -116,7 +116,7 @@ GaryScript4: ; 75fe4 (1d:5fe4) ld [W_GARYCURSCRIPT], a ret -MovementData_76014: ; 76014 (1d:6014) +MovementData_76014: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP @@ -124,7 +124,7 @@ MovementData_76014: ; 76014 (1d:6014) db NPC_MOVEMENT_UP db $FF -GaryScript5: ; 7601a (1d:601a) +GaryScript5: ld a, [wd730] bit 0, a ret nz @@ -147,7 +147,7 @@ GaryScript5: ; 7601a (1d:601a) ld [W_GARYCURSCRIPT], a ret -GaryScript6: ; 76047 (1d:6047) +GaryScript6: ld a, $2 ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_RIGHT @@ -160,7 +160,7 @@ GaryScript6: ; 76047 (1d:6047) ld [W_GARYCURSCRIPT], a ret -GaryScript7: ; 7605f (1d:605f) +GaryScript7: ld a, $2 ld [H_SPRITEINDEX], a xor a ; SPRITE_FACING_DOWN @@ -177,12 +177,12 @@ GaryScript7: ; 7605f (1d:605f) ld [W_GARYCURSCRIPT], a ret -MovementData_76080: ; 76080 (1d:6080) +MovementData_76080: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db $FF -GaryScript8: ; 76083 (1d:6083) +GaryScript8: ld a, [wd730] bit 0, a ret nz @@ -193,7 +193,7 @@ GaryScript8: ; 76083 (1d:6083) ld [W_GARYCURSCRIPT], a ret -GaryScript9: ; 76099 (1d:6099) +GaryScript9: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd @@ -206,12 +206,12 @@ GaryScript9: ; 76099 (1d:6099) ld [W_GARYCURSCRIPT], a ret -RLEMovement760b4: ; 760b4 (1d:60b4) +RLEMovement760b4: db D_UP, 4 db D_LEFT, 1 db $ff -GaryScript10: ; 760b9 (1d:60b9) +GaryScript10: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -221,7 +221,7 @@ GaryScript10: ; 760b9 (1d:60b9) ld [W_GARYCURSCRIPT], a ret -GaryScript_760c8: ; 760c8 (1d:60c8) +GaryScript_760c8: ld a, $f0 ld [wJoyIgnore], a call DisplayTextID @@ -229,14 +229,14 @@ GaryScript_760c8: ; 760c8 (1d:60c8) ld [wJoyIgnore], a ret -GaryTextPointers: ; 760d6 (1d:60d6) +GaryTextPointers: dw GaryText1 dw GaryText2 dw GaryText3 dw GaryText4 dw GaryText5 -GaryText1: ; 760e0 (1d:60e0) +GaryText1: TX_ASM CheckEvent EVENT_BEAT_CHAMPION_RIVAL ld hl, GaryText_760f4 @@ -246,27 +246,27 @@ GaryText1: ; 760e0 (1d:60e0) call PrintText jp TextScriptEnd -GaryText_760f4: ; 760f4 (1d:60f4) - TX_FAR _GaryText_760f4 +GaryText_760f4: + TX_FAR _GaryChampionIntroText db "@" -GaryText_760f9: ; 760f9 (1d:60f9) +GaryText_760f9: TX_FAR _GaryText_760f9 db "@" -GaryText_760fe: ; 760fe (1d:60fe) +GaryText_760fe: TX_FAR _GaryText_760fe db "@" -GaryText_76103: ; 76103 (1d:6103) +GaryText_76103: TX_FAR _GaryText_76103 db "@" -GaryText2: ; 76108 (1d:6108) +GaryText2: TX_FAR _GaryText2 db "@" -GaryText3: ; 7610d (1d:610d) +GaryText3: TX_ASM ld a, [W_PLAYERSTARTER] ld [wd11e], a @@ -275,14 +275,14 @@ GaryText3: ; 7610d (1d:610d) call PrintText jp TextScriptEnd -GaryText_76120: ; 76120 (1d:6120) +GaryText_76120: TX_FAR _GaryText_76120 db "@" -GaryText4: ; 76125 (1d:6125) +GaryText4: TX_FAR _GaryText_76125 db "@" -GaryText5: ; 7612a (1d:612a) +GaryText5: TX_FAR _GaryText_7612a db "@" diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index 0f975673..8e5d1907 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -1,25 +1,25 @@ -HallofFameRoomScript: ; 5a49e (16:649e) +HallofFameRoomScript: call EnableAutoTextBoxDrawing ld hl, HallofFameRoomScriptPointers ld a, [W_HALLOFFAMEROOMCURSCRIPT] jp JumpTable -HallofFameRoomScript_5a4aa: ; 5a4aa (16:64aa) +HallofFameRoomScript_5a4aa: xor a ld [wJoyIgnore], a ld [W_HALLOFFAMEROOMCURSCRIPT], a ret -HallofFameRoomScriptPointers: ; 5a4b2 (16:64b2) +HallofFameRoomScriptPointers: dw HallofFameRoomScript0 dw HallofFameRoomScript1 dw HallofFameRoomScript2 dw HallofFameRoomScript3 -HallofFameRoomScript3: ; 5a4ba (16:64ba) +HallofFameRoomScript3: ret -HallofFameRoomScript2: ; 5a4bb (16:64bb) +HallofFameRoomScript2: call Delay3 ld a, [wLetterPrintingDelayFlags] push af @@ -55,7 +55,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) call WaitForTextScrollButtonPress jp Init -HallofFameRoomScript0: ; 5a50d (16:650d) +HallofFameRoomScript0: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd @@ -68,11 +68,11 @@ HallofFameRoomScript0: ; 5a50d (16:650d) ld [W_HALLOFFAMEROOMCURSCRIPT], a ret -RLEMovement5a528: ; 5a528 (16:6528) +RLEMovement5a528: db D_UP,$5 db $ff -HallofFameRoomScript1: ; 5a52b (16:652b) +HallofFameRoomScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -101,9 +101,9 @@ HallofFameRoomScript1: ; 5a52b (16:652b) ld [W_HALLOFFAMEROOMCURSCRIPT], a ret -HallofFameRoomTextPointers: ; 5a56a (16:656a) +HallofFameRoomTextPointers: dw HallofFameRoomText1 -HallofFameRoomText1: ; 5a56c (16:656c) +HallofFameRoomText1: TX_FAR _HallofFameRoomText1 db "@" diff --git a/scripts/indigoplateau.asm b/scripts/indigoplateau.asm index 9e4802ba..6a6fdb6c 100755 --- a/scripts/indigoplateau.asm +++ b/scripts/indigoplateau.asm @@ -1,4 +1,4 @@ -IndigoPlateauScript: ; 50935 (14:4935) +IndigoPlateauScript: ret -IndigoPlateauTextPointers: ; 50936 (14:4936) +IndigoPlateauTextPointers: diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index c639adb7..93653931 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) +IndigoPlateauLobbyScript: call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing ld hl, wd126 @@ -14,7 +14,7 @@ IndigoPlateauLobbyScript: ; 19c5b (6:5c5b) ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR ret -IndigoPlateauLobbyTextPointers: ; 19c7f (6:5c7f) +IndigoPlateauLobbyTextPointers: dw IndigoPlateauLobbyText1 dw IndigoPlateauLobbyText2 dw IndigoPlateauLobbyText3 @@ -22,18 +22,18 @@ IndigoPlateauLobbyTextPointers: ; 19c7f (6:5c7f) dw IndigoPlateauLobbyText5 dw IndigoPlateauLobbyText6 -IndigoPlateauLobbyText1: ; 19c89 (6:5c89) +IndigoPlateauLobbyText1: TX_POKECENTER_NURSE -IndigoPlateauLobbyText2: ; 19c8a (6:5c8a) +IndigoPlateauLobbyText2: TX_FAR _IndigoPlateauLobbyText1 db "@" -IndigoPlateauLobbyText3: ; 19c8f (6:5c8f) +IndigoPlateauLobbyText3: TX_FAR _IndigoPlateauLobbyText3 db "@" -IndigoPlateauLobbyText5: ; 19c94 (6:5c94) +IndigoPlateauLobbyText5: TX_CABLE_CLUB_RECEPTIONIST IndigoPlateauLobbyText6: diff --git a/scripts/lab1.asm b/scripts/lab1.asm index a4ec9b41..5b08f4f2 100755 --- a/scripts/lab1.asm +++ b/scripts/lab1.asm @@ -1,30 +1,30 @@ -Lab1Script: ; 75b8c (1d:5b8c) +Lab1Script: call EnableAutoTextBoxDrawing ret -Lab1TextPointers: ; 75b90 (1d:5b90) +Lab1TextPointers: dw Lab1Text1 dw Lab1Text2 dw Lab1Text3 dw Lab1Text4 dw Lab1Text5 -Lab1Text1: ; 75b9a (1d:5b9a) +Lab1Text1: TX_FAR _Lab1Text1 db "@" -Lab1Text2: ; 75b9f (1d:5b9f) +Lab1Text2: TX_FAR _Lab1Text2 db "@" -Lab1Text3: ; 75ba4 (1d:5ba4) +Lab1Text3: TX_FAR _Lab1Text3 db "@" -Lab1Text4: ; 75ba9 (1d:5ba9) +Lab1Text4: TX_FAR _Lab1Text4 db "@" -Lab1Text5: ; 75bae (1d:5bae) +Lab1Text5: TX_FAR _Lab1Text5 db "@" diff --git a/scripts/lab2.asm b/scripts/lab2.asm index 4c3ab344..ed9ef1b4 100755 --- a/scripts/lab2.asm +++ b/scripts/lab2.asm @@ -1,25 +1,25 @@ -Lab2Script: ; 75c21 (1d:5c21) +Lab2Script: jp EnableAutoTextBoxDrawing -Lab2TextPointers: ; 75c24 (1d:5c24) +Lab2TextPointers: dw Lab2Text1 dw Lab2Text2 dw Lab2Text3 -Lab2Text1: ; 75c2a (1d:5c2a) +Lab2Text1: TX_FAR _Lab2Text1 db "@" -Lab2Text2: ; 75c2f (1d:5c2f) +Lab2Text2: TX_ASM ld a, $7 ld [wWhichTrade], a jr Lab2DoTrade -Lab2Text3: ; 75c37 (1d:5c37) +Lab2Text3: TX_ASM ld a, $8 ld [wWhichTrade], a -Lab2DoTrade: ; 75c3d (1d:5c3d) +Lab2DoTrade: predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/lab3.asm b/scripts/lab3.asm index cbb5f53f..dbd0913d 100755 --- a/scripts/lab3.asm +++ b/scripts/lab3.asm @@ -1,14 +1,14 @@ -Lab3Script: ; 75c87 (1d:5c87) +Lab3Script: jp EnableAutoTextBoxDrawing -Lab3TextPointers: ; 75c8a (1d:5c8a) +Lab3TextPointers: dw Lab3Text1 dw Lab3Text2 dw Lab3Text3 dw Lab3Text4 dw Lab3Text5 -Lab3Text1: ; 75c94 (1d:5c94) +Lab3Text1: TX_ASM CheckEvent EVENT_GOT_TM35 jr nz, .asm_e551a @@ -31,31 +31,31 @@ Lab3Text1: ; 75c94 (1d:5c94) .asm_eb896 jp TextScriptEnd -TM35PreReceiveText: ; 75cc8 (1d:5cc8) +TM35PreReceiveText: TX_FAR _TM35PreReceiveText db "@" -ReceivedTM35Text: ; 75ccd (1d:5ccd) +ReceivedTM35Text: TX_FAR _ReceivedTM35Text db $0B, "@" -TM35ExplanationText: ; 75cd3 (1d:5cd3) +TM35ExplanationText: TX_FAR _TM35ExplanationText db "@" -TM35NoRoomText: ; 75cd8 (1d:5cd8) +TM35NoRoomText: TX_FAR _TM35NoRoomText db "@" -Lab3Text2: ; 75cdd (1d:5cdd) +Lab3Text2: TX_FAR _Lab3Text2 db "@" -Lab3Text4: ; 75ce2 (1d:5ce2) -Lab3Text3: ; 75ce2 (1d:5ce2) +Lab3Text4: +Lab3Text3: TX_FAR _Lab3Text3 db "@" -Lab3Text5: ; 75ce7 (1d:5ce7) +Lab3Text5: TX_FAR _Lab3Text5 db "@" diff --git a/scripts/lab4.asm b/scripts/lab4.asm index dab07824..8177a64c 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -1,11 +1,11 @@ -Lab4Script: ; 75d31 (1d:5d31) +Lab4Script: jp EnableAutoTextBoxDrawing -Lab4TextPointers: ; 75d34 (1d:5d34) +Lab4TextPointers: dw Lab4Text1 dw Lab4Text2 -Lab4Script_GetFossilsInBag: ; 75d38 (1d:5d38) +Lab4Script_GetFossilsInBag: ; construct a list of all fossils in the player's bag xor a ld [wFilteredBagItemsCount], a @@ -40,13 +40,13 @@ Lab4Script_GetFossilsInBag: ; 75d38 (1d:5d38) ld [de], a ret -FossilsList: ; 75d68 (1d:5d68) +FossilsList: db DOME_FOSSIL db HELIX_FOSSIL db OLD_AMBER db $00 -Lab4Text1: ; 75d6c (1d:5d6c) +Lab4Text1: TX_ASM CheckEvent EVENT_GAVE_FOSSIL_TO_LAB jr nz, .asm_75d96 @@ -82,28 +82,28 @@ Lab4Text1: ; 75d6c (1d:5d6c) ResetEvents EVENT_GAVE_FOSSIL_TO_LAB, EVENT_LAB_STILL_REVIVING_FOSSIL, EVENT_LAB_HANDING_OVER_FOSSIL_MON jr .asm_75d93 -Lab4Text_75dc6: ; 75dc6 (1d:5dc6) +Lab4Text_75dc6: TX_FAR _Lab4Text_75dc6 db "@" -Lab4Text_75dcb: ; 75dcb (1d:5dcb) +Lab4Text_75dcb: TX_FAR _Lab4Text_75dcb db "@" -Lab4Text_75dd0: ; 75dd0 (1d:5dd0) +Lab4Text_75dd0: TX_FAR _Lab4Text_75dd0 db "@" -Lab4Text_75dd5: ; 75dd5 (1d:5dd5) +Lab4Text_75dd5: TX_FAR _Lab4Text_75dd5 db "@" -Lab4Text2: ; 75dda (1d:5dda) +Lab4Text2: TX_ASM ld a, $3 ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd -LoadFossilItemAndMonNameBank1D: ; 75de8 (1d:5de8) +LoadFossilItemAndMonNameBank1D: jpba LoadFossilItemAndMonName diff --git a/scripts/lance.asm b/scripts/lance.asm index 564e7ef1..b2cf9207 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -1,4 +1,4 @@ -LanceScript: ; 5a2ae (16:62ae) +LanceScript: call LanceScript_5a2c4 call EnableAutoTextBoxDrawing ld hl, LanceTrainerHeaders @@ -8,7 +8,7 @@ LanceScript: ; 5a2ae (16:62ae) ld [W_LANCECURSCRIPT], a ret -LanceScript_5a2c4: ; 5a2c4 (16:62c4) +LanceScript_5a2c4: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -34,22 +34,22 @@ LanceScript_5a2c4: ; 5a2c4 (16:62c4) .asm_5a2f0 predef_jump ReplaceTileBlock -LanceScript_5a2f5: ; 5a2f5 (16:62f5) +LanceScript_5a2f5: xor a ld [W_LANCECURSCRIPT], a ret -LanceScriptPointers: ; 5a2fa (16:62fa) +LanceScriptPointers: dw LanceScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LanceScript2 dw LanceScript3 dw LanceScript4 -LanceScript4: ; 5a304 (16:6304) +LanceScript4: ret -LanceScript0: ; 5a305 (16:6305) +LanceScript0: CheckEvent EVENT_BEAT_LANCE ret nz ld hl, CoordsData_5a33e @@ -74,7 +74,7 @@ LanceScript0: ; 5a305 (16:6305) call PlaySound jp LanceScript_5a2c4 -CoordsData_5a33e: ; 5a33e (16:633e) +CoordsData_5a33e: db $01,$05 db $02,$06 db $0B,$05 @@ -82,7 +82,7 @@ CoordsData_5a33e: ; 5a33e (16:633e) db $10,$18 db $FF -LanceScript2: ; 5a349 (16:6349) +LanceScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff @@ -91,7 +91,7 @@ LanceScript2: ; 5a349 (16:6349) ld [hSpriteIndexOrTextID], a jp DisplayTextID -LanceScript_5a35b: ; 5a35b (16:635b) +LanceScript_5a35b: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd @@ -105,14 +105,14 @@ LanceScript_5a35b: ; 5a35b (16:635b) ld [W_CURMAPSCRIPT], a ret -RLEList_5a379: ; 5a379 (16:6379) +RLEList_5a379: db D_UP, $0D db D_LEFT, $0C db D_DOWN, $07 db D_LEFT, $06 db $FF -LanceScript3: ; 5a382 (16:6382) +LanceScript3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -123,11 +123,11 @@ LanceScript3: ; 5a382 (16:6382) ld [W_CURMAPSCRIPT], a ret -LanceTextPointers: ; 5a395 (16:6395) +LanceTextPointers: dw LanceText1 -LanceTrainerHeaders: ; 5a397 (16:6397) -LanceTrainerHeader0: ; 5a397 (16:6397) +LanceTrainerHeaders: +LanceTrainerHeader0: dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_LANCES_ROOM_TRAINER_0 @@ -138,21 +138,21 @@ LanceTrainerHeader0: ; 5a397 (16:6397) db $ff -LanceText1: ; 5a3a4 (16:63a4) +LanceText1: TX_ASM ld hl, LanceTrainerHeader0 call TalkToTrainer jp TextScriptEnd -LanceBeforeBattleText: ; 5a3ae (16:63ae) +LanceBeforeBattleText: TX_FAR _LanceBeforeBattleText db "@" -LanceEndBattleText: ; 5a3b3 (16:63b3) +LanceEndBattleText: TX_FAR _LanceEndBattleText db "@" -LanceAfterBattleText: ; 5a3b8 (16:63b8) +LanceAfterBattleText: TX_FAR _LanceAfterBattleText TX_ASM SetEvent EVENT_BEAT_LANCE diff --git a/scripts/lavenderhouse1.asm b/scripts/lavenderhouse1.asm index ccf9cef1..65637018 100755 --- a/scripts/lavenderhouse1.asm +++ b/scripts/lavenderhouse1.asm @@ -1,8 +1,8 @@ -LavenderHouse1Script: ; 1d8a8 (7:58a8) +LavenderHouse1Script: call EnableAutoTextBoxDrawing ret -LavenderHouse1TextPointers: ; 1d8ac (7:58ac) +LavenderHouse1TextPointers: dw LavenderHouse1Text1 dw LavenderHouse1Text2 dw LavenderHouse1Text3 @@ -10,7 +10,7 @@ LavenderHouse1TextPointers: ; 1d8ac (7:58ac) dw LavenderHouse1Text5 dw LavenderHouse1Text6 -LavenderHouse1Text1: ; 1d8b8 (7:58b8) +LavenderHouse1Text1: TX_ASM CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .asm_72e5d @@ -23,15 +23,15 @@ LavenderHouse1Text1: ; 1d8b8 (7:58b8) .asm_6957f jp TextScriptEnd -LavenderHouse1Text_1d8d1: ; 1d8d1 (7:58d1) +LavenderHouse1Text_1d8d1: TX_FAR _LavenderHouse1Text_1d8d1 db "@" -LavenderHouse1Text_1d8d6: ; 1d8d6 (7:58d6) +LavenderHouse1Text_1d8d6: TX_FAR _LavenderHouse1Text_1d8d6 db "@" -LavenderHouse1Text2: ; 1d8db (7:58db) +LavenderHouse1Text2: TX_ASM CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .asm_06470 @@ -44,29 +44,29 @@ LavenderHouse1Text2: ; 1d8db (7:58db) .asm_3d208 jp TextScriptEnd -LavenderHouse1Text_1d8f4: ; 1d8f4 (7:58f4) +LavenderHouse1Text_1d8f4: TX_FAR _LavenderHouse1Text_1d8f4 db "@" -LavenderHouse1Text_1d8f9: ; 1d8f9 (7:58f9) +LavenderHouse1Text_1d8f9: TX_FAR _LavenderHouse1Text_1d8f9 db "@" -LavenderHouse1Text3: ; 1d8fe (7:58fe) +LavenderHouse1Text3: TX_FAR _LavenderHouse1Text3 TX_ASM ld a, PSYDUCK call PlayCry jp TextScriptEnd -LavenderHouse1Text4: ; 1d90b (7:590b) +LavenderHouse1Text4: TX_FAR _LavenderHouse1Text4 TX_ASM ld a, NIDORINO call PlayCry jp TextScriptEnd -LavenderHouse1Text5: ; 1d918 (7:5918) +LavenderHouse1Text5: TX_ASM CheckEvent EVENT_GOT_POKE_FLUTE jr nz, .asm_15ac2 @@ -89,24 +89,24 @@ LavenderHouse1Text5: ; 1d918 (7:5918) .asm_da749 jp TextScriptEnd -LavenderHouse1Text_1d94c: ; 1d94c (7:594c) +LavenderHouse1Text_1d94c: TX_FAR _LavenderHouse1Text_1d94c db "@" -ReceivedFluteText: ; 1d951 (7:5951) +ReceivedFluteText: TX_FAR _ReceivedFluteText db $11 TX_FAR _FluteExplanationText db "@" -FluteNoRoomText: ; 1d95b (7:595b) +FluteNoRoomText: TX_FAR _FluteNoRoomText db "@" -MrFujiAfterFluteText: ; 1d960 (7:5960) +MrFujiAfterFluteText: TX_FAR _MrFujiAfterFluteText db "@" -LavenderHouse1Text6: ; 1d965 (7:5965) +LavenderHouse1Text6: TX_FAR _LavenderHouse1Text6 db "@" diff --git a/scripts/lavenderhouse2.asm b/scripts/lavenderhouse2.asm index fe0b3ee2..b531c047 100755 --- a/scripts/lavenderhouse2.asm +++ b/scripts/lavenderhouse2.asm @@ -1,19 +1,19 @@ -LavenderHouse2Script: ; 1d9ae (7:59ae) +LavenderHouse2Script: call EnableAutoTextBoxDrawing ret -LavenderHouse2TextPointers: ; 1d9b2 (7:59b2) +LavenderHouse2TextPointers: dw LavenderHouse2Text1 dw LavenderHouse2Text2 -LavenderHouse2Text1: ; 1d9b6 (7:59b6) +LavenderHouse2Text1: TX_FAR _LavenderHouse2Text1 TX_ASM ld a, CUBONE call PlayCry jp TextScriptEnd -LavenderHouse2Text2: ; 1d9c3 (7:59c3) +LavenderHouse2Text2: TX_ASM CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .asm_65711 @@ -26,10 +26,10 @@ LavenderHouse2Text2: ; 1d9c3 (7:59c3) .asm_64be1 jp TextScriptEnd -LavenderHouse2Text_1d9dc: ; 1d9dc (7:59dc) +LavenderHouse2Text_1d9dc: TX_FAR _LavenderHouse2Text_1d9dc db "@" -LavenderHouse2Text_1d9e1: ; 1d9e1 (7:59e1) +LavenderHouse2Text_1d9e1: TX_FAR _LavenderHouse2Text_1d9e1 db "@" diff --git a/scripts/lavendermart.asm b/scripts/lavendermart.asm index 85518fd2..915c9662 100755 --- a/scripts/lavendermart.asm +++ b/scripts/lavendermart.asm @@ -1,16 +1,16 @@ -LavenderMartScript: ; 5c92c (17:492c) +LavenderMartScript: jp EnableAutoTextBoxDrawing -LavenderMartTextPointers: ; 5c92f (17:492f) +LavenderMartTextPointers: dw LavenderMartText1 dw LavenderMartText2 dw LavenderMartText3 -LavenderMartText2: ; 5c935 (17:4935) +LavenderMartText2: TX_FAR _LavenderMartText2 db "@" -LavenderMartText3: ; 5c93a (17:493a) +LavenderMartText3: TX_ASM CheckEvent EVENT_RESCUED_MR_FUJI jr nz, .asm_c88d4 @@ -23,10 +23,10 @@ LavenderMartText3: ; 5c93a (17:493a) .asm_6d225 jp TextScriptEnd -LavenderMart_5c953: ; 5c953 (17:4953) +LavenderMart_5c953: TX_FAR _LavenderMart_5c953 db "@" -LavenderMart_5c958: ; 5c958 (17:4958) +LavenderMart_5c958: TX_FAR _LavenderMart_5c958 db "@" diff --git a/scripts/lavenderpokecenter.asm b/scripts/lavenderpokecenter.asm index 8f9c5454..e8e23655 100755 --- a/scripts/lavenderpokecenter.asm +++ b/scripts/lavenderpokecenter.asm @@ -1,25 +1,25 @@ -LavenderPokecenterScript: ; 5c8da (17:48da) +LavenderPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -LavenderPokecenterTextPointers: ; 5c8e0 (17:48e0) +LavenderPokecenterTextPointers: dw LavenderPokecenterText1 dw LavenderPokecenterText2 dw LavenderPokecenterText3 dw LavenderPokecenterText4 dw LavenderPokecenterText5 -LavenderPokecenterText4: ; 5c8e8 (17:48e8) +LavenderPokecenterText4: TX_CABLE_CLUB_RECEPTIONIST -LavenderPokecenterText1: ; 5c8e9 (17:48e9) +LavenderPokecenterText1: TX_POKECENTER_NURSE -LavenderPokecenterText2: ; 5c8ea (17:48ea) +LavenderPokecenterText2: TX_FAR _LavenderPokecenterText1 db "@" -LavenderPokecenterText3: ; 5c8ef (17:48ef) +LavenderPokecenterText3: TX_FAR _LavenderPokecenterText3 db "@" diff --git a/scripts/lavendertown.asm b/scripts/lavendertown.asm index 30c6d4e5..daf490b1 100755 --- a/scripts/lavendertown.asm +++ b/scripts/lavendertown.asm @@ -1,7 +1,7 @@ -LavenderTownScript: ; 4410b (11:410b) +LavenderTownScript: jp EnableAutoTextBoxDrawing -LavenderTownTextPointers: ; 4410e (11:410e) +LavenderTownTextPointers: dw LavenderTownText1 dw LavenderTownText2 dw LavenderTownText3 @@ -12,7 +12,7 @@ LavenderTownTextPointers: ; 4410e (11:410e) dw LavenderTownText8 dw LavenderTownText9 -LavenderTownText1: ; 44120 (11:4120) +LavenderTownText1: TX_ASM ld hl, LavenderTownText_4413c call PrintText @@ -26,38 +26,38 @@ LavenderTownText1: ; 44120 (11:4120) call PrintText jp TextScriptEnd -LavenderTownText_4413c: ; 4413c (11:413c) +LavenderTownText_4413c: TX_FAR _LavenderTownText_4413c db "@" -LavenderTownText_44141: ; 44141 (11:4141) +LavenderTownText_44141: TX_FAR _LavenderTownText_44141 db "@" -LavenderTownText_44146: ; 44146 (11:4146) +LavenderTownText_44146: TX_FAR _LavenderTownText_44146 db "@" -LavenderTownText2: ; 4414b (11:414b) +LavenderTownText2: TX_FAR _LavenderTownText2 db "@" -LavenderTownText3: ; 44150 (11:4150) +LavenderTownText3: TX_FAR _LavenderTownText3 db "@" -LavenderTownText4: ; 44155 (11:4155) +LavenderTownText4: TX_FAR _LavenderTownText4 db "@" -LavenderTownText5: ; 4415a (11:415a) +LavenderTownText5: TX_FAR _LavenderTownText5 db "@" -LavenderTownText8: ; 4415f (11:415f) +LavenderTownText8: TX_FAR _LavenderTownText8 db "@" -LavenderTownText9: ; 44164 (11:4164) +LavenderTownText9: TX_FAR _LavenderTownText9 db "@" diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index d50fc1dc..d85dc192 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -1,4 +1,4 @@ -LoreleiScript: ; 7617b (1d:617b) +LoreleiScript: call LoreleiScript_76191 call EnableAutoTextBoxDrawing ld hl, LoreleiTrainerHeaders @@ -8,7 +8,7 @@ LoreleiScript: ; 7617b (1d:617b) ld [W_LORELEICURSCRIPT], a ret -LoreleiScript_76191: ; 76191 (1d:6191) +LoreleiScript_76191: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -26,22 +26,22 @@ LoreleiScript_76191: ; 76191 (1d:6191) lb bc, 0, 2 predef_jump ReplaceTileBlock -LoreleiScript_761b6: ; 761b6 (1d:61b6) +LoreleiScript_761b6: xor a ld [W_LORELEICURSCRIPT], a ret -LoreleiScriptPointers: ; 761bb (1d:61bb) +LoreleiScriptPointers: dw LoreleiScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LoreleiScript2 dw LoreleiScript3 dw LoreleiScript4 -LoreleiScript4: ; 761c5 (1d:61c5) +LoreleiScript4: ret -LoreleiScript_761c6: ; 761c6 (1d:61c6) +LoreleiScript_761c6: ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -58,7 +58,7 @@ LoreleiScript_761c6: ; 761c6 (1d:61c6) ld [W_CURMAPSCRIPT], a ret -LoreleiScript0: ; 761e2 (1d:61e2) +LoreleiScript0: ld hl, CoordsData_76223 call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -86,14 +86,14 @@ LoreleiScript0: ; 761e2 (1d:61e2) ld [W_CURMAPSCRIPT], a ret -CoordsData_76223: ; 76223 (1d:6223) +CoordsData_76223: db $0A,$04 db $0A,$05 db $0B,$04 db $0B,$05 db $FF -LoreleiScript3: ; 7622c (1d:622c) +LoreleiScript3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -103,7 +103,7 @@ LoreleiScript3: ; 7622c (1d:622c) ld [W_LORELEICURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -LoreleiScript2: ; 7623f (1d:623f) +LoreleiScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff @@ -112,12 +112,12 @@ LoreleiScript2: ; 7623f (1d:623f) ld [hSpriteIndexOrTextID], a jp DisplayTextID -LoreleiTextPointers: ; 76251 (1d:6251) +LoreleiTextPointers: dw LoreleiText1 dw LoreleiDontRunAwayText -LoreleiTrainerHeaders: ; 76255 (1d:6255) -LoreleiTrainerHeader0: ; 76255 (1d:6255) +LoreleiTrainerHeaders: +LoreleiTrainerHeader0: dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 @@ -128,24 +128,24 @@ LoreleiTrainerHeader0: ; 76255 (1d:6255) db $ff -LoreleiText1: ; 76262 (1d:6262) +LoreleiText1: TX_ASM ld hl, LoreleiTrainerHeader0 call TalkToTrainer jp TextScriptEnd -LoreleiBeforeBattleText: ; 7626c (1d:626c) +LoreleiBeforeBattleText: TX_FAR _LoreleiBeforeBattleText db "@" -LoreleiEndBattleText: ; 76271 (1d:6271) +LoreleiEndBattleText: TX_FAR _LoreleiEndBattleText db "@" -LoreleiAfterBattleText: ; 76276 (1d:6276) +LoreleiAfterBattleText: TX_FAR _LoreleiAfterBattleText db "@" -LoreleiDontRunAwayText: ; 7627b (1d:627b) +LoreleiDontRunAwayText: TX_FAR _LoreleiDontRunAwayText db "@" diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index c6381678..6ee7984e 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -1,4 +1,4 @@ -Mansion1Script: ; 442af (11:42af) +Mansion1Script: call Mansion1Subscript1 call EnableAutoTextBoxDrawing ld hl, Mansion1TrainerHeaders @@ -8,7 +8,7 @@ Mansion1Script: ; 442af (11:42af) ld [W_MANSION1CURSCRIPT], a ret -Mansion1Subscript1: ; 442c5 (11:42c5) +Mansion1Subscript1: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -33,19 +33,19 @@ Mansion1Subscript1: ; 442c5 (11:42c5) lb bc, 13, 13 jp Mansion1Script_4430b -Mansion1Script_44304: ; 44304 (11:4304) +Mansion1Script_44304: ld a, $2d ld [wNewTileBlockID], a jr Mansion1ReplaceBlock -Mansion1Script_4430b: ; 4430b (11:430b) +Mansion1Script_4430b: ld a, $e ld [wNewTileBlockID], a -Mansion1ReplaceBlock: ; 44310 (11:4310) +Mansion1ReplaceBlock: predef ReplaceTileBlock ret -Mansion1Script_Switches: ; 44316 (11:4316) +Mansion1Script_Switches: ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP ret nz @@ -55,19 +55,19 @@ Mansion1Script_Switches: ; 44316 (11:4316) ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion1ScriptPointers: ; 44326 (11:4326) +Mansion1ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion1TextPointers: ; 4432c (11:432c) +Mansion1TextPointers: dw Mansion1Text1 dw PickUpItemText dw PickUpItemText dw Mansion1Text4 -Mansion1TrainerHeaders: ; 44334 (11:4334) -Mansion1TrainerHeader0: ; 44334 (11:4334) +Mansion1TrainerHeaders: +Mansion1TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MANSION_1_TRAINER_0 @@ -78,25 +78,25 @@ Mansion1TrainerHeader0: ; 44334 (11:4334) db $ff -Mansion1Text1: ; 44341 (11:4341) +Mansion1Text1: TX_ASM ld hl, Mansion1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion1BattleText2: ; 4434b (11:434b) +Mansion1BattleText2: TX_FAR _Mansion1BattleText2 db "@" -Mansion1EndBattleText2: ; 44350 (11:4350) +Mansion1EndBattleText2: TX_FAR _Mansion1EndBattleText2 db "@" -Mansion1AfterBattleText2: ; 44355 (11:4355) +Mansion1AfterBattleText2: TX_FAR _Mansion1AfterBattleText2 db "@" -Mansion1Text4: ; 4435a (11:435a) +Mansion1Text4: TX_ASM ld hl, MansionSwitchText call PrintText @@ -122,14 +122,14 @@ Mansion1Text4: ; 4435a (11:435a) .asm_44392 jp TextScriptEnd -MansionSwitchText: ; 44395 (11:4395) +MansionSwitchText: TX_FAR _MansionSwitchText db "@" -MansionSwitchPressedText: ; 4439a (11:439a) +MansionSwitchPressedText: TX_FAR _MansionSwitchPressedText db "@" -MansionSwitchNotPressedText: ; 4439f (11:439f) +MansionSwitchNotPressedText: TX_FAR _MansionSwitchNotPressedText db "@" diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 2162b3fc..df0d0c36 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -1,4 +1,4 @@ -Mansion2Script: ; 51fd8 (14:5fd8) +Mansion2Script: call Mansion2Script_51fee call EnableAutoTextBoxDrawing ld hl, Mansion2TrainerHeaders @@ -8,7 +8,7 @@ Mansion2Script: ; 51fd8 (14:5fd8) ld [W_MANSION2CURSCRIPT], a ret -Mansion2Script_51fee: ; 51fee (14:5fee) +Mansion2Script_51fee: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -37,11 +37,11 @@ Mansion2Script_51fee: ; 51fee (14:5fee) call Mansion2Script_5202f ret -Mansion2Script_5202f: ; 5202f (14:602f) +Mansion2Script_5202f: ld [wNewTileBlockID], a predef_jump ReplaceTileBlock -Mansion2Script_Switches: ; 52037 (14:6037) +Mansion2Script_Switches: ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP ret nz @@ -51,20 +51,20 @@ Mansion2Script_Switches: ; 52037 (14:6037) ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion2ScriptPointers: ; 52047 (14:6047) +Mansion2ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion2TextPointers: ; 5204d (14:604d) +Mansion2TextPointers: dw Mansion2Text1 dw PickUpItemText dw Mansion2Text3 dw Mansion2Text4 dw Mansion2Text5 -Mansion2TrainerHeaders: ; 52057 (14:6057) -Mansion2TrainerHeader0: ; 52057 (14:6057) +Mansion2TrainerHeaders: +Mansion2TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MANSION_2_TRAINER_0 @@ -75,34 +75,34 @@ Mansion2TrainerHeader0: ; 52057 (14:6057) db $ff -Mansion2Text1: ; 52064 (14:6064) +Mansion2Text1: TX_ASM ld hl, Mansion2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion2BattleText1: ; 5206e (14:606e) +Mansion2BattleText1: TX_FAR _Mansion2BattleText1 db "@" -Mansion2EndBattleText1: ; 52073 (14:6073) +Mansion2EndBattleText1: TX_FAR _Mansion2EndBattleText1 db "@" -Mansion2AfterBattleText1: ; 52078 (14:6078) +Mansion2AfterBattleText1: TX_FAR _Mansion2AfterBattleText1 db "@" -Mansion2Text3: ; 5207d (14:607d) +Mansion2Text3: TX_FAR _Mansion2Text3 db "@" -Mansion2Text4: ; 52082 (14:6082) +Mansion2Text4: TX_FAR _Mansion2Text4 db "@" -Mansion3Text6: ; 52087 (14:6087) -Mansion2Text5: ; 52087 (14:6087) +Mansion3Text6: +Mansion2Text5: TX_ASM ld hl, Mansion2Text_520c2 call PrintText @@ -128,14 +128,14 @@ Mansion2Text5: ; 52087 (14:6087) .asm_520bf jp TextScriptEnd -Mansion2Text_520c2: ; 520c2 (14:60c2) +Mansion2Text_520c2: TX_FAR _Mansion2Text_520c2 db "@" -Mansion2Text_520c7: ; 520c7 (14:60c7) +Mansion2Text_520c7: TX_FAR _Mansion2Text_520c7 db "@" -Mansion2Text_520cc: ; 520cc (14:60cc) +Mansion2Text_520cc: TX_FAR _Mansion2Text_520cc db "@" diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index 9333912d..e0ad97c2 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -1,4 +1,4 @@ -Mansion3Script: ; 521ee (14:61ee) +Mansion3Script: call Mansion3Script_52204 call EnableAutoTextBoxDrawing ld hl, Mansion3TrainerHeader0 @@ -8,7 +8,7 @@ Mansion3Script: ; 521ee (14:61ee) ld [W_MANSION3CURSCRIPT], a ret -Mansion3Script_52204: ; 52204 (14:6204) +Mansion3Script_52204: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -31,12 +31,12 @@ Mansion3Script_52204: ; 52204 (14:6204) call Mansion2Script_5202f ret -Mansion3ScriptPointers: ; 52235 (14:6235) +Mansion3ScriptPointers: dw Mansion3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion3Script0: ; 5223b (14:623b) +Mansion3Script0: ld hl, CoordsData_52254 call Mansion3Script_5225b ld a, [wWhichDungeonWarp] @@ -50,13 +50,13 @@ Mansion3Script0: ; 5223b (14:623b) ld [wDungeonWarpDestinationMap], a ret -CoordsData_52254: ; 52254 (14:6254) +CoordsData_52254: db $0E,$10 db $0E,$11 db $0E,$13 db $FF -Mansion3Script_5225b: ; 5225b (14:625b) +Mansion3Script_5225b: xor a ld [wWhichDungeonWarp], a ld a, [wd72d] @@ -72,7 +72,7 @@ Mansion3Script_5225b: ; 5225b (14:625b) set 4, [hl] ret -Mansion3Script_Switches: ; 5227a (14:627a) +Mansion3Script_Switches: ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP ret nz @@ -82,7 +82,7 @@ Mansion3Script_Switches: ; 5227a (14:627a) ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion3TextPointers: ; 5228a (14:628a) +Mansion3TextPointers: dw Mansion3Text1 dw Mansion3Text2 dw PickUpItemText @@ -90,8 +90,8 @@ Mansion3TextPointers: ; 5228a (14:628a) dw Mansion3Text5 dw Mansion3Text6 -Mansion3TrainerHeaders: ; 52296 (14:6296) -Mansion3TrainerHeader0: ; 52296 (14:6296) +Mansion3TrainerHeaders: +Mansion3TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_0 @@ -100,7 +100,7 @@ Mansion3TrainerHeader0: ; 52296 (14:6296) dw Mansion3EndBattleText1 ; TextEndBattle dw Mansion3EndBattleText1 ; TextEndBattle -Mansion3TrainerHeader2: ; 522a2 (14:62a2) +Mansion3TrainerHeader2: dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_2 @@ -111,42 +111,42 @@ Mansion3TrainerHeader2: ; 522a2 (14:62a2) db $ff -Mansion3Text1: ; 522af (14:62af) +Mansion3Text1: TX_ASM ld hl, Mansion3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion3Text2: ; 522b9 (14:62b9) +Mansion3Text2: TX_ASM ld hl, Mansion3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Mansion3BattleText1: ; 522c3 (14:62c3) +Mansion3BattleText1: TX_FAR _Mansion3BattleText1 db "@" -Mansion3EndBattleText1: ; 522c8 (14:62c8) +Mansion3EndBattleText1: TX_FAR _Mansion3EndBattleText1 db "@" -Mansion3AfterBattleText1: ; 522cd (14:62cd) +Mansion3AfterBattleText1: TX_FAR _Mansion3AfterBattleText1 db "@" -Mansion3BattleText2: ; 522d2 (14:62d2) +Mansion3BattleText2: TX_FAR _Mansion3BattleText2 db "@" -Mansion3EndBattleText2: ; 522d7 (14:62d7) +Mansion3EndBattleText2: TX_FAR _Mansion3EndBattleText2 db "@" -Mansion3AfterBattleText2: ; 522dc (14:62dc) +Mansion3AfterBattleText2: TX_FAR _Mansion3AfterBattleText2 db "@" -Mansion3Text5: ; 522e1 (14:62e1) +Mansion3Text5: TX_FAR _Mansion3Text5 db "@" diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index d3a1ded6..028ecc32 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -1,4 +1,4 @@ -Mansion4Script: ; 523b9 (14:63b9) +Mansion4Script: call Mansion4Script_523cf call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeader0 @@ -8,7 +8,7 @@ Mansion4Script: ; 523b9 (14:63b9) ld [W_MANSION4CURSCRIPT], a ret -Mansion4Script_523cf: ; 523cf (14:63cf) +Mansion4Script_523cf: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -43,7 +43,7 @@ Mansion4Script_523cf: ; 523cf (14:63cf) call Mansion2Script_5202f ret -Mansion4Script_Switches: ; 52420 (14:6420) +Mansion4Script_Switches: ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP ret nz @@ -53,12 +53,12 @@ Mansion4Script_Switches: ; 52420 (14:6420) ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion4ScriptPointers: ; 52430 (14:6430) +Mansion4ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion4TextPointers: ; 52436 (14:6436) +Mansion4TextPointers: dw Mansion4Text1 dw Mansion4Text2 dw PickUpItemText @@ -69,8 +69,8 @@ Mansion4TextPointers: ; 52436 (14:6436) dw PickUpItemText dw Mansion3Text6 -Mansion4TrainerHeaders: ; 52448 (14:6448) -Mansion4TrainerHeader0: ; 52448 (14:6448) +Mansion4TrainerHeaders: +Mansion4TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_0 @@ -79,7 +79,7 @@ Mansion4TrainerHeader0: ; 52448 (14:6448) dw Mansion4EndBattleText1 ; TextEndBattle dw Mansion4EndBattleText1 ; TextEndBattle -Mansion4TrainerHeader2: ; 52454 (14:6454) +Mansion4TrainerHeader2: dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_2 @@ -90,42 +90,42 @@ Mansion4TrainerHeader2: ; 52454 (14:6454) db $ff -Mansion4Text1: ; 52461 (14:6461) +Mansion4Text1: TX_ASM ld hl, Mansion4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Mansion4Text2: ; 5246b (14:646b) +Mansion4Text2: TX_ASM ld hl, Mansion4TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Mansion4BattleText1: ; 52475 (14:6475) +Mansion4BattleText1: TX_FAR _Mansion4BattleText1 db "@" -Mansion4EndBattleText1: ; 5247a (14:647a) +Mansion4EndBattleText1: TX_FAR _Mansion4EndBattleText1 db "@" -Mansion4AfterBattleText1: ; 5247f (14:647f) +Mansion4AfterBattleText1: TX_FAR _Mansion4AfterBattleText1 db "@" -Mansion4BattleText2: ; 52484 (14:6484) +Mansion4BattleText2: TX_FAR _Mansion4BattleText2 db "@" -Mansion4EndBattleText2: ; 52489 (14:6489) +Mansion4EndBattleText2: TX_FAR _Mansion4EndBattleText2 db "@" -Mansion4AfterBattleText2: ; 5248e (14:648e) +Mansion4AfterBattleText2: TX_FAR _Mansion4AfterBattleText2 db "@" -Mansion4Text7: ; 52493 (14:6493) +Mansion4Text7: TX_FAR _Mansion4Text7 db "@" diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm index a649481c..c8a43a66 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/mtmoon1.asm @@ -1,4 +1,4 @@ -MtMoon1Script: ; 499c8 (12:59c8) +MtMoon1Script: call EnableAutoTextBoxDrawing ld hl, MtMoon1TrainerHeader0 ld de, MtMoon1ScriptPointers @@ -7,12 +7,12 @@ MtMoon1Script: ; 499c8 (12:59c8) ld [W_MTMOON1CURSCRIPT], a ret -MtMoon1ScriptPointers: ; 499db (12:59db) +MtMoon1ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -MtMoon1TextPointers: ; 499e1 (12:59e1) +MtMoon1TextPointers: dw MtMoon1Text1 dw MtMoon1Text2 dw MtMoon1Text3 @@ -28,8 +28,8 @@ MtMoon1TextPointers: ; 499e1 (12:59e1) dw PickUpItemText dw MtMoon1Text14 -MtMoon1TrainerHeaders: ; 499fd (12:59fd) -MtMoon1TrainerHeader0: ; 499fd (12:59fd) +MtMoon1TrainerHeaders: +MtMoon1TrainerHeader0: dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_0 @@ -38,7 +38,7 @@ MtMoon1TrainerHeader0: ; 499fd (12:59fd) dw MtMoon1EndBattleText2 ; TextEndBattle dw MtMoon1EndBattleText2 ; TextEndBattle -MtMoon1TrainerHeader2: ; 49a09 (12:5a09) +MtMoon1TrainerHeader2: dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2 @@ -47,7 +47,7 @@ MtMoon1TrainerHeader2: ; 49a09 (12:5a09) dw MtMoon1EndBattleText3 ; TextEndBattle dw MtMoon1EndBattleText3 ; TextEndBattle -MtMoon1TrainerHeader3: ; 49a15 (12:5a15) +MtMoon1TrainerHeader3: dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3 @@ -56,7 +56,7 @@ MtMoon1TrainerHeader3: ; 49a15 (12:5a15) dw MtMoon1EndBattleText4 ; TextEndBattle dw MtMoon1EndBattleText4 ; TextEndBattle -MtMoon1TrainerHeader4: ; 49a21 (12:5a21) +MtMoon1TrainerHeader4: dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4 @@ -65,7 +65,7 @@ MtMoon1TrainerHeader4: ; 49a21 (12:5a21) dw MtMoon1EndBattleText5 ; TextEndBattle dw MtMoon1EndBattleText5 ; TextEndBattle -MtMoon1TrainerHeader5: ; 49a2d (12:5a2d) +MtMoon1TrainerHeader5: dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5 @@ -74,7 +74,7 @@ MtMoon1TrainerHeader5: ; 49a2d (12:5a2d) dw MtMoon1EndBattleText6 ; TextEndBattle dw MtMoon1EndBattleText6 ; TextEndBattle -MtMoon1TrainerHeader6: ; 49a39 (12:5a39) +MtMoon1TrainerHeader6: dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6 @@ -83,7 +83,7 @@ MtMoon1TrainerHeader6: ; 49a39 (12:5a39) dw MtMoon1EndBattleText7 ; TextEndBattle dw MtMoon1EndBattleText7 ; TextEndBattle -MtMoon1TrainerHeader7: ; 49a45 (12:5a45) +MtMoon1TrainerHeader7: dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_7 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_7 @@ -94,127 +94,127 @@ MtMoon1TrainerHeader7: ; 49a45 (12:5a45) db $ff -MtMoon1Text1: ; 49a52 (12:5a52) +MtMoon1Text1: TX_ASM ld hl, MtMoon1TrainerHeader0 jr MtMoon1TalkToTrainer -MtMoon1Text2: ; 49a5c (12:5a5c) +MtMoon1Text2: TX_ASM ld hl, MtMoon1TrainerHeader2 jr MtMoon1TalkToTrainer -MtMoon1Text3: ; 49a66 (12:5a66) +MtMoon1Text3: TX_ASM ld hl, MtMoon1TrainerHeader3 jr MtMoon1TalkToTrainer -MtMoon1Text4: ; 49a70 (12:5a70) +MtMoon1Text4: TX_ASM ld hl, MtMoon1TrainerHeader4 jr MtMoon1TalkToTrainer -MtMoon1Text5: ; 49a7a (12:5a7a) +MtMoon1Text5: TX_ASM ld hl, MtMoon1TrainerHeader5 jr MtMoon1TalkToTrainer -MtMoon1Text6: ; 49a84 (12:5a84) +MtMoon1Text6: TX_ASM ld hl, MtMoon1TrainerHeader6 jr MtMoon1TalkToTrainer -MtMoon1Text7: ; 49a8e (12:5a8e) +MtMoon1Text7: TX_ASM ld hl, MtMoon1TrainerHeader7 MtMoon1TalkToTrainer: call TalkToTrainer jp TextScriptEnd -MtMoon1BattleText2: ; 49a98 (12:5a98) +MtMoon1BattleText2: TX_FAR _MtMoon1BattleText2 db "@" -MtMoon1EndBattleText2: ; 49a9d (12:5a9d) +MtMoon1EndBattleText2: TX_FAR _MtMoon1EndBattleText2 db "@" -MtMoon1AfterBattleText2: ; 49aa2 (12:5aa2) +MtMoon1AfterBattleText2: TX_FAR _MtMoon1AfterBattleText2 db "@" -MtMoon1BattleText3: ; 49aa7 (12:5aa7) +MtMoon1BattleText3: TX_FAR _MtMoon1BattleText3 db "@" -MtMoon1EndBattleText3: ; 49aac (12:5aac) +MtMoon1EndBattleText3: TX_FAR _MtMoon1EndBattleText3 db "@" -MtMoon1AfterBattleText3: ; 49ab1 (12:5ab1) +MtMoon1AfterBattleText3: TX_FAR _MtMoon1AfterBattleText3 db "@" -MtMoon1BattleText4: ; 49ab6 (12:5ab6) +MtMoon1BattleText4: TX_FAR _MtMoon1BattleText4 db "@" -MtMoon1EndBattleText4: ; 49abb (12:5abb) +MtMoon1EndBattleText4: TX_FAR _MtMoon1EndBattleText4 db "@" -MtMoon1AfterBattleText4: ; 49ac0 (12:5ac0) +MtMoon1AfterBattleText4: TX_FAR _MtMoon1AfterBattleText4 db "@" -MtMoon1BattleText5: ; 49ac5 (12:5ac5) +MtMoon1BattleText5: TX_FAR _MtMoon1BattleText5 db "@" -MtMoon1EndBattleText5: ; 49aca (12:5aca) +MtMoon1EndBattleText5: TX_FAR _MtMoon1EndBattleText5 db "@" -MtMoon1AfterBattleText5: ; 49acf (12:5acf) +MtMoon1AfterBattleText5: TX_FAR _MtMoon1AfterBattleText5 db "@" -MtMoon1BattleText6: ; 49ad4 (12:5ad4) +MtMoon1BattleText6: TX_FAR _MtMoon1BattleText6 db "@" -MtMoon1EndBattleText6: ; 49ad9 (12:5ad9) +MtMoon1EndBattleText6: TX_FAR _MtMoon1EndBattleText6 db "@" -MtMoon1AfterBattleText6: ; 49ade (12:5ade) +MtMoon1AfterBattleText6: TX_FAR _MtMoon1AfterBattleText6 db "@" -MtMoon1BattleText7: ; 49ae3 (12:5ae3) +MtMoon1BattleText7: TX_FAR _MtMoon1BattleText7 db "@" -MtMoon1EndBattleText7: ; 49ae8 (12:5ae8) +MtMoon1EndBattleText7: TX_FAR _MtMoon1EndBattleText7 db "@" -MtMoon1AfterBattleText7: ; 49aed (12:5aed) +MtMoon1AfterBattleText7: TX_FAR _MtMoon1AfterBattleText7 db "@" -MtMoon1BattleText8: ; 49af2 (12:5af2) +MtMoon1BattleText8: TX_FAR _MtMoon1BattleText8 db "@" -MtMoon1EndBattleText8: ; 49af7 (12:5af7) +MtMoon1EndBattleText8: TX_FAR _MtMoon1EndBattleText8 db "@" -MtMoon1AfterBattleText8: ; 49afc (12:5afc) +MtMoon1AfterBattleText8: TX_FAR _MtMoon1AfterBattleText8 db "@" -MtMoon1Text14: ; 49b01 (12:5b01) +MtMoon1Text14: TX_FAR _MtMoon1Text14 db "@" diff --git a/scripts/mtmoon2.asm b/scripts/mtmoon2.asm index 03e9d9cb..6d1e5339 100755 --- a/scripts/mtmoon2.asm +++ b/scripts/mtmoon2.asm @@ -1,10 +1,10 @@ -MtMoon2Script: ; 51a42 (14:5a42) +MtMoon2Script: call EnableAutoTextBoxDrawing ret -MtMoon2TextPointers: ; 51a46 (14:5a46) +MtMoon2TextPointers: dw MtMoonText1 -MtMoonText1: ; 51a48 (14:5a48) +MtMoonText1: TX_FAR _MtMoonText1 db "@" diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 8aee239c..ab6ce1c2 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -1,4 +1,4 @@ -MtMoon3Script: ; 49d0b (12:5d0b) +MtMoon3Script: call EnableAutoTextBoxDrawing ld hl, MtMoon3TrainerHeaders ld de, MtMoon3ScriptPointers @@ -18,7 +18,7 @@ MtMoon3Script: ; 49d0b (12:5d0b) res 4, [hl] ret -CoordsData_49d37: ; 49d37 (12:5d37) +CoordsData_49d37: db $05,$0B db $05,$0C db $05,$0D @@ -37,7 +37,7 @@ CoordsData_49d37: ; 49d37 (12:5d37) db $08,$0E db $FF -MtMoon3Script_49cd7: ; 49d58 (12:5d58) +MtMoon3Script_49cd7: CheckAndResetEvent EVENT_57E call nz, MtMoon3Script_49cec xor a @@ -54,7 +54,7 @@ MtMoon3Script_49cec: call MtMoon3Script_49f93 ret -MtMoon3ScriptPointers: ; 49d63 (12:5d63) +MtMoon3ScriptPointers: dw MtMoon3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -72,7 +72,7 @@ MtMoon3ScriptPointers: ; 49d63 (12:5d63) dw MtMoon3Script14 dw MtMoon3Script15 -MtMoon3Script0: ; 49d6f (12:5d6f) +MtMoon3Script0: CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL call z, MtMoon3Script_49d28 CheckEvent EVENT_BEAT_MT_MOON_3_TRAINER_0 @@ -100,7 +100,7 @@ MtMoon3Script_49d28: jp z, CheckFightingMapTrainers ret -MtMoon3Script3: ; 49d9a (12:5d9a) +MtMoon3Script3: ld a, [wIsInBattle] cp $ff jp z, MtMoon3Script_49cd7 @@ -113,7 +113,7 @@ MtMoon3Script3: ; 49d9a (12:5d9a) call MtMoon3Script_49ce5 ret -MtMoon3Script4: ; 49dba (12:5dba) +MtMoon3Script4: ld a, $1 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF @@ -185,13 +185,13 @@ PikachuMovementData_49dd8: db $34 db $3f -MovementData_49ddc: ; 49df8 (12:5df8) +MovementData_49ddc: db NPC_MOVEMENT_RIGHT -MovementData_49ddd: ; 49df9 (12:5df9) +MovementData_49ddd: db NPC_MOVEMENT_UP db $FF -MtMoon3Script5: ; 49dfb (12:5dfb) +MtMoon3Script5: ld a, [wd730] bit 0, a ret nz @@ -408,7 +408,7 @@ MtMoon3Script_49f93: predef HideObject ret -MtMoon3TextPointers: ; 49e34 (12:5e34) +MtMoon3TextPointers: dw MtMoon3Text1 dw MtMoon3Text2 dw MtMoon3Text3 diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index 9c35686f..a2f2c82b 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -1,8 +1,8 @@ -MtMoonPokecenterScript: ; 492cf (12:52cf) +MtMoonPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -MtMoonPokecenterTextPointers: ; 492d5 (12:52d5) +MtMoonPokecenterTextPointers: dw MtMoonPokecenterText1 dw MtMoonPokecenterText2 dw MtMoonPokecenterText3 @@ -11,27 +11,27 @@ MtMoonPokecenterTextPointers: ; 492d5 (12:52d5) dw MtMoonPokecenterText6 dw MtMoonPokecenterText7 -MtMoonPokecenterText1: ; 492e1 (12:52e1) +MtMoonPokecenterText1: TX_POKECENTER_NURSE -MtMoonPokecenterText2: ; 492e2 (12:52e2) +MtMoonPokecenterText2: TX_FAR _MtMoonPokecenterText1 db "@" -MtMoonPokecenterText3: ; 492e7 (12:52e7) +MtMoonPokecenterText3: TX_FAR _MtMoonPokecenterText3 db "@" -MtMoonPokecenterText4: ; 492ec (12:52ec) +MtMoonPokecenterText4: TX_ASM callab Func_f218c jp TextScriptEnd -MtMoonPokecenterText5: ; 49370 (12:5370) +MtMoonPokecenterText5: TX_FAR _MtMoonPokecenterText5 db "@" -MtMoonPokecenterText6: ; 49375 (12:5375) +MtMoonPokecenterText6: TX_CABLE_CLUB_RECEPTIONIST MtMoonPokecenterText7: diff --git a/scripts/mtmoonpokecenter2.asm b/scripts/mtmoonpokecenter2.asm index fa42f440..f01b7218 100755 --- a/scripts/mtmoonpokecenter2.asm +++ b/scripts/mtmoonpokecenter2.asm @@ -49,18 +49,18 @@ Func_f218c: .done ret -MtMoonPokecenterText_4935c: ; 4935c (12:535c) +MtMoonPokecenterText_4935c: TX_FAR _MtMoonPokecenterText_4935c db "@" -MtMoonPokecenterText_49361: ; 49361 (12:5361) +MtMoonPokecenterText_49361: TX_FAR _MtMoonPokecenterText_49361 db "@" -MtMoonPokecenterText_49366: ; 49366 (12:5366) +MtMoonPokecenterText_49366: TX_FAR _MtMoonPokecenterText_49366 db "@" -MtMoonPokecenterText_4936b: ; 4936b (12:536b) +MtMoonPokecenterText_4936b: TX_FAR _MtMoonPokecenterText_4936b db "@" diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 75c0d74e..47959247 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -1,4 +1,4 @@ -Museum1FScript: ; 5c0f7 (17:40f7) +Museum1FScript: ld a, $1 ld [wAutoTextBoxDrawingControl], a xor a @@ -8,11 +8,11 @@ Museum1FScript: ; 5c0f7 (17:40f7) call JumpTable ret -Museum1FScriptPointers: ; 5c109 (17:4109) +Museum1FScriptPointers: dw Museum1FScript0 dw Museum1FScript1 -Museum1FScript0: ; 5c10d (17:410d) +Museum1FScript0: ld a, [wYCoord] cp $4 ret nz @@ -29,37 +29,37 @@ Museum1FScript0: ; 5c10d (17:410d) ld [hSpriteIndexOrTextID], a jp DisplayTextID -Museum1FScript1: ; 5c12a (17:412a) +Museum1FScript1: ret -Museum1FTextPointers: ; 5c12b (17:412b) +Museum1FTextPointers: dw Museum1FText1 dw Museum1FText2 dw Museum1FText3 dw Museum1FText4 dw Museum1FText5 -Museum1FText1: ; 5c135 (17:4135) +Museum1FText1: TX_ASM callba Func_f1c1b jp TextScriptEnd -Museum1FText2: ; 5c135 (17:4135) +Museum1FText2: TX_ASM callba Func_f1d2a jp TextScriptEnd -Museum1FText3: ; 5c135 (17:4135) +Museum1FText3: TX_ASM callba Func_f1d36 jp TextScriptEnd -Museum1FText4: ; 5c135 (17:4135) +Museum1FText4: TX_ASM callba Func_f1d80 jp TextScriptEnd -Museum1FText5: ; 5c135 (17:4135) +Museum1FText5: TX_ASM callba Func_f1d8c jp TextScriptEnd diff --git a/scripts/museum2f.asm b/scripts/museum2f.asm index 56d113ae..93a8396e 100755 --- a/scripts/museum2f.asm +++ b/scripts/museum2f.asm @@ -1,8 +1,8 @@ -Museum2FScript: ; 5c317 (17:4317) +Museum2FScript: call EnableAutoTextBoxDrawing ret -Museum2FTextPointers: ; 5c31a (17:431a) +Museum2FTextPointers: dw Museum2FText1 dw Museum2FText2 dw Museum2FText3 @@ -11,23 +11,23 @@ Museum2FTextPointers: ; 5c31a (17:431a) dw Museum2FText6 dw Museum2FText7 -Museum2FText1: ; 5c328 (17:4328) +Museum2FText1: TX_FAR _Museum2FText1 db "@" -Museum2FText2: ; 5c32d (17:432d) +Museum2FText2: TX_FAR _Museum2FText2 db "@" -Museum2FText3: ; 5c332 (17:4332) +Museum2FText3: TX_FAR _Museum2FText3 db "@" -Museum2FText4: ; 5c337 (17:4337) +Museum2FText4: TX_FAR _Museum2FText4 db "@" -Museum2FText5: ; 5c33c (17:433c) +Museum2FText5: TX_ASM ld a, [wd472] bit 7, a @@ -62,10 +62,10 @@ Museum2FText_5c218: TX_FAR _Museum2FPikachuText2 db "@" -Museum2FText6: ; 5c341 (17:4341) +Museum2FText6: TX_FAR _Museum2FText6 db "@" -Museum2FText7: ; 5c346 (17:4346) +Museum2FText7: TX_FAR _Museum2FText7 db "@" diff --git a/scripts/namerater.asm b/scripts/namerater.asm index 42b82b62..160948ac 100755 --- a/scripts/namerater.asm +++ b/scripts/namerater.asm @@ -1,14 +1,14 @@ -NameRaterScript: ; 1da12 (7:5a12) +NameRaterScript: jp EnableAutoTextBoxDrawing -NameRaterScript_1da15: ; 1da15 (7:5a15) +NameRaterScript_1da15: call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a ret -NameRaterScript_1da20: ; 1da20 (7:5a20) +NameRaterScript_1da20: ld hl, wPartyMonOT ld bc, NAME_LENGTH ld a, [wWhichPokemon] @@ -37,10 +37,10 @@ NameRaterScript_1da20: ; 1da20 (7:5a20) scf ret -NameRaterTextPointers: ; 1da54 (7:5a54) +NameRaterTextPointers: dw NameRaterText1 -NameRaterText1: ; 1da56 (7:5a56) +NameRaterText1: TX_ASM call SaveScreenTilesToBuffer2 ld hl, NameRaterText_1dab3 @@ -78,30 +78,30 @@ NameRaterText1: ; 1da56 (7:5a56) ld hl, NameRaterText_1dacc jr .asm_1daa8 -NameRaterText_1dab3: ; 1dab3 (7:5ab3) +NameRaterText_1dab3: TX_FAR _NameRaterText_1dab3 db "@" -NameRaterText_1dab8: ; 1dab8 (7:5ab8) +NameRaterText_1dab8: TX_FAR _NameRaterText_1dab8 db "@" -NameRaterText_1dabd: ; 1dabd (7:5abd) +NameRaterText_1dabd: TX_FAR _NameRaterText_1dabd db "@" -NameRaterText_1dac2: ; 1dac2 (7:5ac2) +NameRaterText_1dac2: TX_FAR _NameRaterText_1dac2 db "@" -NameRaterText_1dac7: ; 1dac7 (7:5ac7) +NameRaterText_1dac7: TX_FAR _NameRaterText_1dac7 db "@" -NameRaterText_1dacc: ; 1dacc (7:5acc) +NameRaterText_1dacc: TX_FAR _NameRaterText_1dacc db "@" -NameRaterText_1dad1: ; 1dad1 (7:5ad1) +NameRaterText_1dad1: TX_FAR _NameRaterText_1dad1 db "@" diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 6648acb1..63f09015 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -1,4 +1,4 @@ -OaksLabScript: ; 1cb0e (7:4b0e) +OaksLabScript: CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 call nz, OaksLabScript_1d076 ld a, $1 @@ -10,7 +10,7 @@ OaksLabScript: ; 1cb0e (7:4b0e) call JumpTable ret -OaksLabScriptPointers: ; 1cb28 (7:4b28) +OaksLabScriptPointers: dw OaksLabScript0 dw OaksLabScript1 dw OaksLabScript2 @@ -35,7 +35,7 @@ OaksLabScriptPointers: ; 1cb28 (7:4b28) dw OaksLabScript21 dw OaksLabScript22 -OaksLabScript0: ; 1cb4e (7:4b4e) +OaksLabScript0: CheckEvent EVENT_OAK_APPEARED_IN_PALLET ret z ld a, [wNPCMovementScriptFunctionNum] @@ -51,7 +51,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e) ld [W_OAKSLABCURSCRIPT], a ret -OaksLabScript1: ; 1cb6e (7:4b6e) +OaksLabScript1: ld a, $6 ld [H_SPRITEINDEX], a ld de, OakEntryMovement @@ -61,13 +61,13 @@ OaksLabScript1: ; 1cb6e (7:4b6e) ld [W_OAKSLABCURSCRIPT], a ret -OakEntryMovement: ; 1cb7e (7:4b7e) +OakEntryMovement: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db $FF -OaksLabScript2: ; 1cb82 (7:4b82) +OaksLabScript2: ld a, [wd730] bit 0, a ret nz @@ -82,7 +82,7 @@ OaksLabScript2: ; 1cb82 (7:4b82) ld [W_OAKSLABCURSCRIPT], a ret -OaksLabScript3: ; 1cba2 (7:4ba2) +OaksLabScript3: call Delay3 ld hl, wSimulatedJoypadStatesEnd ld de, PlayerEntryMovementRLE @@ -105,11 +105,11 @@ OaksLabScript3: ; 1cba2 (7:4ba2) ld [W_OAKSLABCURSCRIPT], a ret -PlayerEntryMovementRLE: ; 1cbcf (7:4bcf) +PlayerEntryMovementRLE: db D_UP,$8 db $ff -OaksLabScript4: ; 1cbd2 (7:445f) +OaksLabScript4: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -128,7 +128,7 @@ OaksLabScript4: ; 1cbd2 (7:445f) ld [W_OAKSLABCURSCRIPT], a ret -OaksLabScript5: ; 1cbfd (7:4bfd) +OaksLabScript5: SetEvent EVENT_OAK_ASKED_TO_CHOOSE_MON ld a, $fc ld [wJoyIgnore], a @@ -158,7 +158,7 @@ OaksLabScript5: ; 1cbfd (7:4bfd) ld [W_OAKSLABCURSCRIPT], a ret -OaksLabScript6: ; 1cc36 (7:4c36) +OaksLabScript6: ld a, [wYCoord] cp $6 ret nz @@ -188,7 +188,7 @@ OaksLabScript6: ; 1cc36 (7:4c36) ld [W_OAKSLABCURSCRIPT], a ret -OaksLabScript7: ; 1cc72 (7:4c72) +OaksLabScript7: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -198,7 +198,7 @@ OaksLabScript7: ; 1cc72 (7:4c72) ld [W_OAKSLABCURSCRIPT], a ret -OaksLabScript8: ; 1cc80 (7:4c80) +OaksLabScript8: ld a, $1 ld [hSpriteIndexOrTextID], a ld de, .SonyPushesPlayerAwayFromEeveeBall @@ -214,7 +214,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) db $07 db $FF -OaksLabScript9: ; 1cd00 (7:4d00) +OaksLabScript9: ld a, [wd730] bit 0, a jr nz, .asm_1c564 @@ -258,7 +258,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) call StartSimulatingJoypadStates ret -OaksLabScript10: ; 1cd6d (7:4d6d) +OaksLabScript10: ld a, [wYCoord] cp $4 jr z, .asm_1c599 @@ -705,7 +705,7 @@ OaksLabScript_1d076: ld [wMapTextPtr + 1], a ret -OaksLabTextPointers: ; 1d082 (7:5082) +OaksLabTextPointers: dw OaksLabText1 dw OaksLabText2 dw OaksLabText3 diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index 41b3eb4f..ad7ca079 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -1,4 +1,4 @@ -PalletTownScript: ; 18e5b (6:4e5b) +PalletTownScript: CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK jr z, .next SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS @@ -8,7 +8,7 @@ PalletTownScript: ; 18e5b (6:4e5b) ld a, [W_PALLETTOWNCURSCRIPT] jp JumpTable -PalletTownScriptPointers: ; 18e73 (6:4e73) +PalletTownScriptPointers: dw PalletTownScript0 dw PalletTownScript1 dw PalletTownScript2 @@ -20,7 +20,7 @@ PalletTownScriptPointers: ; 18e73 (6:4e73) dw PalletTownScript8 dw PalletTownScript9 -PalletTownScript0: ; 18e81 (6:4e81) +PalletTownScript0: CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB ret nz ld a, [wYCoord] @@ -41,7 +41,7 @@ PalletTownScript0: ; 18e81 (6:4e81) call StopAllMusic ld a, BANK(Music_MeetProfOak) ld c, a - ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music + ld a, MUSIC_MEET_PROF_OAK call PlayMusic SetEvent EVENT_OAK_APPEARED_IN_PALLET @@ -50,7 +50,7 @@ PalletTownScript0: ; 18e81 (6:4e81) ld [W_PALLETTOWNCURSCRIPT], a ret -PalletTownScript1: ; 18eb2 (6:4eb2) +PalletTownScript1: ld a, $FF ^ (A_BUTTON | B_BUTTON) ld [wJoyIgnore], a xor a @@ -78,7 +78,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2) ld [W_PALLETTOWNCURSCRIPT], a ret -PalletTownScript2: ; 18ed2 (6:4ed2) +PalletTownScript2: call Delay3 ld a, 0 ld [wYCoord], a @@ -101,7 +101,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ld [W_PALLETTOWNCURSCRIPT], a ret -PalletTownScript3: ; 18f12 (6:4f12) +PalletTownScript3: ld a, [wd730] bit 0, a ret nz @@ -133,7 +133,7 @@ PalletTownScript3: ; 18f12 (6:4f12) ld [W_PALLETTOWNCURSCRIPT], a ret -PalletTownScript4: ; 18f4b (6:4f4b) +PalletTownScript4: ; start the pikachu battle ld a, $FF ^ (A_BUTTON | B_BUTTON) ld [wJoyIgnore], a @@ -151,7 +151,7 @@ PalletTownScript4: ; 18f4b (6:4f4b) ld [W_PALLETTOWNCURSCRIPT], a ret -PalletTownScript5: ; 18f56 (6:4f56) +PalletTownScript5: ld a, $2 ld [wcf0d], a ld a, $1 @@ -172,7 +172,7 @@ PalletTownScript5: ; 18f56 (6:4f56) ld [W_PALLETTOWNCURSCRIPT], a ret -PalletTownScript6: ; 18f87 (6:4f87) +PalletTownScript6: xor a ld [wPlayerFacingDirection], a ld a, $1 @@ -220,7 +220,7 @@ PalletTownScript8: PalletTownScript9: ret -PalletTownTextPointers: ; 18f88 (6:4f88) +PalletTownTextPointers: dw PalletTownText1 dw PalletTownText2 dw PalletTownText3 @@ -230,7 +230,7 @@ PalletTownTextPointers: ; 18f88 (6:4f88) dw PalletTownText7 dw PalletTownText8 -PalletTownText1: ; 18f96 (6:4f96) +PalletTownText1: TX_ASM ld a, [wcf0d] and a @@ -251,7 +251,7 @@ PalletTownText1: ; 18f96 (6:4f96) call PrintText jp TextScriptEnd -OakAppearsText: ; 18fb0 (6:4fb0) +OakAppearsText: TX_FAR _OakAppearsText TX_ASM ld c, 10 @@ -265,7 +265,7 @@ OakAppearsText: ; 18fb0 (6:4fb0) predef EmotionBubble jp TextScriptEnd -OakWalksUpText: ; 18fce (6:4fce) +OakWalksUpText: TX_FAR _OakWalksUpText db "@" @@ -273,27 +273,27 @@ PalletTownText_19002: TX_FAR _OakWhewText db "@" -PalletTownText8: ; 0x18fd3 girl +PalletTownText8: ; girl TX_FAR _OakGrassText db "@" -PalletTownText2: ; 0x18fd8 fat man +PalletTownText2: ; fat man TX_FAR _PalletTownText2 db "@" -PalletTownText3: ; 0x18fdd sign by lab +PalletTownText3: ; sign by lab TX_FAR _PalletTownText3 db "@" -PalletTownText4: ; 0x18fe2 sign by fence +PalletTownText4: ; sign by fence TX_FAR _PalletTownText4 db "@" -PalletTownText5: ; 0x18fe7 sign by Red’s house +PalletTownText5: ; sign by Red’s house TX_FAR _PalletTownText5 db "@" -PalletTownText6: ; 0x18fec sign by Blue’s house +PalletTownText6: ; sign by Blue’s house TX_FAR _PalletTownText6 db "@" diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 93806878..da29d814 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -1,4 +1,4 @@ -PewterCityScript: ; 192f5 (6:52f5) +PewterCityScript: call EnableAutoTextBoxDrawing ld hl, wd492 res 7, [hl] @@ -7,7 +7,7 @@ PewterCityScript: ; 192f5 (6:52f5) call JumpTable ret -PewterCityScriptPointers: ; 19307 (6:5307) +PewterCityScriptPointers: dw PewterCityScript0 dw PewterCityScript1 dw PewterCityScript2 @@ -16,14 +16,14 @@ PewterCityScriptPointers: ; 19307 (6:5307) dw PewterCityScript5 dw PewterCityScript6 -PewterCityScript0: ; 19315 (6:5315) +PewterCityScript0: xor a ld [W_MUSEUM1FCURSCRIPT], a ResetEvent EVENT_BOUGHT_MUSEUM_TICKET call PewterCityScript_1925e ret -PewterCityScript_1925e: ; 1925e (6:525e) +PewterCityScript_1925e: CheckEvent EVENT_BEAT_BROCK ret nz ld hl, CoordsData_19277 @@ -35,14 +35,14 @@ PewterCityScript_1925e: ; 1925e (6:525e) ld [hSpriteIndexOrTextID], a jp DisplayTextID -CoordsData_19277: ; 19277 (6:5277) +CoordsData_19277: db $11,$23 db $11,$24 db $12,$25 db $13,$25 db $ff -PewterCityScript1: ; 19280 (6:5280) +PewterCityScript1: ld a, [wNPCMovementScriptPointerTableNum] and a ret nz @@ -79,14 +79,14 @@ PewterCityScript1: ; 19280 (6:5280) ld [W_PEWTERCITYCURSCRIPT], a ret -MovementData_PewterMuseumGuyExit: ; 192ce (6:52ce) +MovementData_PewterMuseumGuyExit: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db $FF -PewterCityScript2: ; 192d3 (6:52d3) +PewterCityScript2: ld a, [wd730] bit 0, a ret nz @@ -97,7 +97,7 @@ PewterCityScript2: ; 192d3 (6:52d3) ld [W_PEWTERCITYCURSCRIPT], a ret -PewterCityScript3: ; 192e9 (6:52e9) +PewterCityScript3: ld a, $3 ld [wSpriteIndex], a call SetSpritePosition2 @@ -110,7 +110,7 @@ PewterCityScript3: ; 192e9 (6:52e9) ld [W_PEWTERCITYCURSCRIPT], a ret -PewterCityScript4: ; 19305 (6:5305) +PewterCityScript4: ld a, [wNPCMovementScriptPointerTableNum] and a ret nz @@ -144,7 +144,7 @@ PewterCityScript4: ; 19305 (6:5305) ld [W_PEWTERCITYCURSCRIPT], a ret -MovementData_PewterGymGuyExit: ; 19353 (6:5353) +MovementData_PewterGymGuyExit: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -152,7 +152,7 @@ MovementData_PewterGymGuyExit: ; 19353 (6:5353) db NPC_MOVEMENT_RIGHT db $FF -PewterCityScript5: ; 19359 (6:5359) +PewterCityScript5: ld a, [wd730] bit 0, a ret nz @@ -163,7 +163,7 @@ PewterCityScript5: ; 19359 (6:5359) ld [W_PEWTERCITYCURSCRIPT], a ret -PewterCityScript6: ; 1936f (6:536f) +PewterCityScript6: ld a, $5 ld [wSpriteIndex], a call SetSpritePosition2 @@ -176,7 +176,7 @@ PewterCityScript6: ; 1936f (6:536f) ld [W_PEWTERCITYCURSCRIPT], a ret -PewterCityTextPointers: ; 1938b (6:538b) +PewterCityTextPointers: dw PewterCityText1 dw PewterCityText2 dw PewterCityText3 @@ -192,15 +192,15 @@ PewterCityTextPointers: ; 1938b (6:538b) dw PewterCityText13 dw PewterCityText14 -PewterCityText1: ; 193a7 (6:53a7) +PewterCityText1: TX_FAR _PewterCityText1 db "@" -PewterCityText2: ; 193ac (6:53ac) +PewterCityText2: TX_FAR _PewterCityText2 db "@" -PewterCityText3: ; 193b1 (6:53b1) +PewterCityText3: TX_ASM ld hl, PewterCityText_193f1 call PrintText @@ -230,23 +230,23 @@ PewterCityText3: ; 193b1 (6:53b1) .asm_193ee jp TextScriptEnd -PewterCityText_193f1: ; 193f1 (6:53f1) +PewterCityText_193f1: TX_FAR _PewterCityText_193f1 db "@" -PewterCityText_193f6: ; 193f6 (6:53f6) +PewterCityText_193f6: TX_FAR _PewterCityText_193f6 db "@" -PewterCityText_193fb: ; 193fb (6:53fb) +PewterCityText_193fb: TX_FAR _PewterCityText_193fb db "@" -PewterCityText13: ; 19400 (6:5400) +PewterCityText13: TX_FAR _PewterCityText13 db "@" -PewterCityText4: ; 19405 (6:5405) +PewterCityText4: TX_ASM ld hl, PewterCityText_19427 call PrintText @@ -263,19 +263,19 @@ PewterCityText4: ; 19405 (6:5405) .asm_19424 jp TextScriptEnd -PewterCityText_19427: ; 19427 (6:5427) +PewterCityText_19427: TX_FAR _PewterCityText_19427 db "@" -PewterCityText_1942c: ; 1942c (6:542c) +PewterCityText_1942c: TX_FAR _PewterCityText_1942c db "@" -PewterCityText_19431: ; 19431 (6:5431) +PewterCityText_19431: TX_FAR _PewterCityText_19431 db "@" -PewterCityText5: ; 19436 (6:5436) +PewterCityText5: TX_ASM ld hl, PewterCityText_1945d call PrintText @@ -293,32 +293,32 @@ PewterCityText5: ; 19436 (6:5436) ld [W_PEWTERCITYCURSCRIPT], a jp TextScriptEnd -PewterCityText_1945d: ; 1945d (6:545d) +PewterCityText_1945d: TX_FAR _PewterCityText_1945d db "@" -PewterCityText14: ; 19462 (6:5462) +PewterCityText14: -PewterCityText_19462: ; 19462 (6:5462) +PewterCityText_19462: TX_FAR _PewterCityText_19462 db "@" -PewterCityText6: ; 19467 (6:5467) +PewterCityText6: TX_FAR _PewterCityText6 db "@" -PewterCityText7: ; 1946c (6:546c) +PewterCityText7: TX_FAR _PewterCityText7 db "@" -PewterCityText10: ; 19471 (6:5471) +PewterCityText10: TX_FAR _PewterCityText10 db "@" -PewterCityText11: ; 19476 (6:5476) +PewterCityText11: TX_FAR _PewterCityText11 db "@" -PewterCityText12: ; 1947b (6:547b) +PewterCityText12: TX_FAR _PewterCityText12 db "@" diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 3e9ab693..922a3d3e 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -1,4 +1,4 @@ -PewterGymScript: ; 5c387 (17:4387) +PewterGymScript: ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -11,38 +11,38 @@ PewterGymScript: ; 5c387 (17:4387) ld [W_PEWTERGYMCURSCRIPT], a ret -PewterGymScript_5c3a4: ; 5c3a4 (17:43a4) +PewterGymScript_5c3a4: ld hl, Gym1CityName ld de, Gym1LeaderName call LoadGymLeaderAndCityName ret -Gym1CityName: ; 5c3ad (17:43ad) +Gym1CityName: db "PEWTER CITY@" -Gym1LeaderName: ; 5c3b9 (17:43b9) +Gym1LeaderName: db "BROCK@" -PewterGymScript_5c3bf: ; 5c3bf (17:43bf) +PewterGymScript_5c3bf: xor a ld [wJoyIgnore], a ld [W_PEWTERGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -PewterGymScriptPointers: ; 5c3ca (17:43ca) +PewterGymScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw PewterGymScript3 -PewterGymScript3: ; 5c3d2 (17:43d2) +PewterGymScript3: ld a, [wIsInBattle] cp $ff jp z, PewterGymScript_5c3bf ld a, $f0 ld [wJoyIgnore], a -PewterGymScript_5c3df: ; 5c3df (17:43df) +PewterGymScript_5c3df: ld a, $4 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -80,7 +80,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) jp PewterGymScript_5c3bf -PewterGymTextPointers: ; 5c435 (17:4435) +PewterGymTextPointers: dw PewterGymText1 dw PewterGymText2 dw PewterGymText3 @@ -88,8 +88,8 @@ PewterGymTextPointers: ; 5c435 (17:4435) dw PewterGymText5 dw PewterGymText6 -PewterGymTrainerHeaders: ; 5c441 (17:4441) -PewterGymTrainerHeader0: ; 5c441 (17:4441) +PewterGymTrainerHeaders: +PewterGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0 db ($5 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_PEWTER_GYM_TRAINER_0 @@ -100,7 +100,7 @@ PewterGymTrainerHeader0: ; 5c441 (17:4441) db $ff -PewterGymText1: ; 5c44e (17:444e) +PewterGymText1: TX_ASM CheckEvent EVENT_BEAT_BROCK jr z, .asm_5c46a @@ -136,53 +136,53 @@ PewterGymText1: ; 5c44e (17:444e) .asm_5c49b jp TextScriptEnd -PewterGymText_5c49e: ; 5c49e (17:449e) +PewterGymText_5c49e: TX_FAR _PewterGymText_5c49e db "@" -PewterGymText_5c4a3: ; 5c4a3 (17:44a3) +PewterGymText_5c4a3: TX_FAR _PewterGymText_5c4a3 db "@" -PewterGymText4: ; 5c4a8 (17:44a8) +PewterGymText4: TX_FAR _TM34PreReceiveText db "@" -PewterGymText5: ; 5c4ad (17:44ad) +PewterGymText5: TX_FAR _ReceivedTM34Text TX_SFX_ITEM TX_FAR _TM34ExplanationText db "@" -PewterGymText6: ; 5c4b7 (17:44b7) +PewterGymText6: TX_FAR _TM34NoRoomText db "@" -PewterGymText_5c4bc: ; 5c4bc (17:44bc) +PewterGymText_5c4bc: TX_FAR _PewterGymText_5c4bc TX_SFX_ITEM TX_FAR _PewterGymText_5c4c1 db "@" -PewterGymText2: ; 5c4c6 (17:44c6) +PewterGymText2: TX_ASM ld hl, PewterGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -PewterGymBattleText1: ; 5c4d0 (17:44d0) +PewterGymBattleText1: TX_FAR _PewterGymBattleText1 db "@" -PewterGymEndBattleText1: ; 5c4d5 (17:44d5) +PewterGymEndBattleText1: TX_FAR _PewterGymEndBattleText1 db "@" -PewterGymAfterBattleText1: ; 5c4da (17:44da) +PewterGymAfterBattleText1: TX_FAR _PewterGymAfterBattleText1 db "@" -PewterGymText3: ; 5c4df (17:44df) +PewterGymText3: TX_ASM ld a, [wBeatGymFlags] bit 0, a @@ -217,23 +217,23 @@ PewterGymText3: ; 5c4df (17:44df) call PrintText jp TextScriptEnd -PewterGymText_5c515: ; 5c515 (17:4515) +PewterGymText_5c515: TX_FAR _PewterGymText_5c515 db "@" -PewterGymText_5c51a: ; 5c51a (17:451a) +PewterGymText_5c51a: TX_FAR _PewterGymText_5c51a db "@" -PewterGymText_5c51f: ; 5c51f (17:451f) +PewterGymText_5c51f: TX_FAR _PewterGymText_5c51f db "@" -PewterGymText_5c524: ; 5c524 (17:4524) +PewterGymText_5c524: TX_FAR _PewterGymText_5c524 db "@" -PewterGymText_5c529: ; 5c529 (17:4529) +PewterGymText_5c529: TX_FAR _PewterGymText_5c529 db "@" diff --git a/scripts/pewterhouse1.asm b/scripts/pewterhouse1.asm index a825b303..ba0f631f 100755 --- a/scripts/pewterhouse1.asm +++ b/scripts/pewterhouse1.asm @@ -1,13 +1,13 @@ -PewterHouse1Script: ; 1d5f3 (7:55f3) +PewterHouse1Script: call EnableAutoTextBoxDrawing ret -PewterHouse1TextPointers: ; 1d5f6 (7:55f6) +PewterHouse1TextPointers: dw PewterHouse1Text1 dw PewterHouse1Text2 dw PewterHouse1Text3 -PewterHouse1Text1: ; 1d5fc (7:55fc) +PewterHouse1Text1: TX_FAR _PewterHouse1Text1 TX_ASM ld a, NIDORAN_M @@ -15,10 +15,10 @@ PewterHouse1Text1: ; 1d5fc (7:55fc) call WaitForSoundToFinish jp TextScriptEnd -PewterHouse1Text2: ; 1d60c (7:560c) +PewterHouse1Text2: TX_FAR _PewterHouse1Text2 db "@" -PewterHouse1Text3: ; 1d611 (7:5611) +PewterHouse1Text3: TX_FAR _PewterHouse1Text3 db "@" diff --git a/scripts/pewterhouse2.asm b/scripts/pewterhouse2.asm index 92e40de2..e3bbe01e 100755 --- a/scripts/pewterhouse2.asm +++ b/scripts/pewterhouse2.asm @@ -1,14 +1,14 @@ -PewterHouse2Script: ; 1d648 (7:5648) +PewterHouse2Script: jp EnableAutoTextBoxDrawing -PewterHouse2TextPointers: ; 1d64b (7:564b) +PewterHouse2TextPointers: dw PewterHouse2Text1 dw PewterHouse2Text2 -PewterHouse2Text1: ; 1d64f (7:564f) +PewterHouse2Text1: TX_FAR _PewterHouse2Text1 db "@" -PewterHouse2Text2: ; 1d654 (7:5654) +PewterHouse2Text2: TX_FAR _PewterHouse2Text2 db "@" diff --git a/scripts/pewtermart.asm b/scripts/pewtermart.asm index 62831d1b..33a0a4c2 100755 --- a/scripts/pewtermart.asm +++ b/scripts/pewtermart.asm @@ -1,30 +1,30 @@ -PewterMartScript: ; 74cad (1d:4cad) +PewterMartScript: call EnableAutoTextBoxDrawing ld a, $1 ld [wAutoTextBoxDrawingControl], a ret -PewterMartTextPointers: ; 74cb6 (1d:4cb6) +PewterMartTextPointers: dw PewterMartText1 dw PewterMartText2 dw PewterMartText3 -PewterMartText2: ; 74cbc (1d:4cbc) +PewterMartText2: TX_ASM ld hl, PewterMartText_74cc6 call PrintText jp TextScriptEnd -PewterMartText_74cc6: ; 74cc6 (1d:4cc6) +PewterMartText_74cc6: TX_FAR _PewterMartText_74cc6 db "@" -PewterMartText3: ; 74ccb (1d:4ccb) +PewterMartText3: TX_ASM ld hl, PewterMartText_74cd5 call PrintText jp TextScriptEnd -PewterMartText_74cd5: ; 74cd5 (1d:4cd5) +PewterMartText_74cd5: TX_FAR _PewterMartText_74cd5 db "@" diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 3835c0c9..2d7f8713 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -1,11 +1,11 @@ -PewterPokecenterScript: ; 5c587 (17:4587) +PewterPokecenterScript: ld hl, wd492 set 7, [hl] call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing ret -PewterPokecenterTextPointers: ; 5c58d (17:458d) +PewterPokecenterTextPointers: dw PewterPokecenterText1 dw PewterPokecenterText2 dw PewterPokecenterText3 @@ -13,22 +13,22 @@ PewterPokecenterTextPointers: ; 5c58d (17:458d) dw PewterPokecenterText5 dw PewterPokecenterText6 -PewterPokecenterText1: ; 5c595 (17:4595) +PewterPokecenterText1: TX_POKECENTER_NURSE -PewterPokecenterText2: ; 5c596 (17:4596) +PewterPokecenterText2: TX_FAR _PewterPokecenterText1 db "@" -PewterPokecenterText3: ; 5c59b (17:459b) +PewterPokecenterText3: TX_ASM callba Func_f1da4 jp TextScriptEnd -PewterPokecenterText4: ; 5c60c (17:460c) +PewterPokecenterText4: TX_CABLE_CLUB_RECEPTIONIST -PewterPokecenterText5: ; 5c603 (17:4603) +PewterPokecenterText5: TX_ASM callba Func_f1d98 jp TextScriptEnd diff --git a/scripts/pokemontower1.asm b/scripts/pokemontower1.asm index 99b8efef..1209b875 100755 --- a/scripts/pokemontower1.asm +++ b/scripts/pokemontower1.asm @@ -1,30 +1,30 @@ -PokemonTower1Script: ; 6042c (18:442c) +PokemonTower1Script: call EnableAutoTextBoxDrawing ret -PokemonTower1TextPointers: ; 6042f (18:442f) +PokemonTower1TextPointers: dw PokemonTower1Text1 dw PokemonTower1Text2 dw PokemonTower1Text3 dw PokemonTower1Text4 dw PokemonTower1Text5 -PokemonTower1Text1: ; 60439 (18:4439) +PokemonTower1Text1: TX_FAR _PokemonTower1Text1 db "@" -PokemonTower1Text2: ; 6043e (18:443e) +PokemonTower1Text2: TX_FAR _PokemonTower1Text2 db "@" -PokemonTower1Text3: ; 60443 (18:4443) +PokemonTower1Text3: TX_FAR _PokemonTower1Text3 db "@" -PokemonTower1Text4: ; 60448 (18:4448) +PokemonTower1Text4: TX_FAR _PokemonTower1Text4 db "@" -PokemonTower1Text5: ; 6044d (18:444d) +PokemonTower1Text5: TX_FAR _PokemonTower1Text5 db "@" diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 6b0c1f00..28e57d22 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -1,22 +1,22 @@ -PokemonTower2Script: ; 604f2 (18:44f2) +PokemonTower2Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower2ScriptPointers ld a, [W_POKEMONTOWER2CURSCRIPT] jp JumpTable -PokemonTower2Script_604fe: ; 604fe (18:44fe) +PokemonTower2Script_604fe: xor a ld [wJoyIgnore], a ld [W_POKEMONTOWER2CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -PokemonTower2ScriptPointers: ; 60509 (18:4509) +PokemonTower2ScriptPointers: dw PokemonTower2Script0 dw PokemonTower2Script1 dw PokemonTower2Script2 -PokemonTower2Script0: ; 6050f (18:450f) +PokemonTower2Script0: CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL ret nz ld hl, CoordsData_6055e @@ -51,12 +51,12 @@ PokemonTower2Script0: ; 6050f (18:450f) ld [hJoyPressed], a ret -CoordsData_6055e: ; 6055e (18:455e) +CoordsData_6055e: db $05,$0F db $06,$0E db $0F ; isn't this supposed to end in $ff? -PokemonTower2Script1: ; 60563 (18:4563) +PokemonTower2Script1: ld a, [wIsInBattle] cp $ff jp z, PokemonTower2Script_604fe @@ -82,7 +82,7 @@ PokemonTower2Script1: ; 60563 (18:4563) ld [W_CURMAPSCRIPT], a ret -MovementData_605a9: ; 605a9 (18:45a9) +MovementData_605a9: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -93,7 +93,7 @@ MovementData_605a9: ; 605a9 (18:45a9) db NPC_MOVEMENT_RIGHT db $FF -MovementData_605b2: ; 605b2 (18:45b2) +MovementData_605b2: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT @@ -104,7 +104,7 @@ MovementData_605b2: ; 605b2 (18:45b2) db NPC_MOVEMENT_DOWN db $FF -PokemonTower2Script2: ; 605bb (18:45bb) +PokemonTower2Script2: ld a, [wd730] bit 0, a ret nz @@ -119,11 +119,11 @@ PokemonTower2Script2: ; 605bb (18:45bb) ld [W_CURMAPSCRIPT], a ret -PokemonTower2TextPointers: ; 605db (18:45db) +PokemonTower2TextPointers: dw PokemonTower2Text1 dw PokemonTower2Text2 -PokemonTower2Text1: ; 605df (18:45df) +PokemonTower2Text1: TX_ASM CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL jr z, .asm_16f24 @@ -151,22 +151,22 @@ PokemonTower2Text1: ; 605df (18:45df) .asm_41852 jp TextScriptEnd -PokemonTower2Text_6062d: ; 6062d (18:462d) +PokemonTower2Text_6062d: TX_FAR _PokemonTower2Text_6062d db "@" -PokemonTower2Text_60632: ; 60632 (18:4632) +PokemonTower2Text_60632: TX_FAR _PokemonTower2Text_60632 db "@" -PokemonTower2Text_60637: ; 60637 (18:4637) +PokemonTower2Text_60637: TX_FAR _PokemonTower2Text_60637 db "@" -PokemonTower2Text_6063c: ; 6063c (18:463c) +PokemonTower2Text_6063c: TX_FAR _PokemonTower2Text_6063c db "@" -PokemonTower2Text2: ; 60641 (18:4641) +PokemonTower2Text2: TX_FAR _PokemonTower2Text2 db "@" diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm index a4fbbf18..453f6baa 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -1,4 +1,4 @@ -PokemonTower3Script: ; 606cc (18:46cc) +PokemonTower3Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower3TrainerHeaders ld de, PokemonTower3ScriptPointers @@ -7,19 +7,19 @@ PokemonTower3Script: ; 606cc (18:46cc) ld [W_POKEMONTOWER3CURSCRIPT], a ret -PokemonTower3ScriptPointers: ; 606df (18:46df) +PokemonTower3ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PokemonTower3TextPointers: ; 606e5 (18:46e5) +PokemonTower3TextPointers: dw PokemonTower3Text1 dw PokemonTower3Text2 dw PokemonTower3Text3 dw PickUpItemText -PokemonTower3TrainerHeaders: ; 606ed (18:46ed) -PokemonTower3TrainerHeader0: ; 606ed (18:46ed) +PokemonTower3TrainerHeaders: +PokemonTower3TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_0 @@ -28,7 +28,7 @@ PokemonTower3TrainerHeader0: ; 606ed (18:46ed) dw PokemonTower3EndBattleText1 ; TextEndBattle dw PokemonTower3EndBattleText1 ; TextEndBattle -PokemonTower3TrainerHeader1: ; 606f9 (18:46f9) +PokemonTower3TrainerHeader1: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_1 @@ -37,7 +37,7 @@ PokemonTower3TrainerHeader1: ; 606f9 (18:46f9) dw PokemonTower3EndBattleText2 ; TextEndBattle dw PokemonTower3EndBattleText2 ; TextEndBattle -PokemonTower3TrainerHeader2: ; 60705 (18:4705) +PokemonTower3TrainerHeader2: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_3_TRAINER_2 @@ -47,56 +47,56 @@ PokemonTower3TrainerHeader2: ; 60705 (18:4705) dw PokemonTower3EndBattleText3 ; TextEndBattle db $ff -PokemonTower3Text1: ; 60712 (18:4712) +PokemonTower3Text1: TX_ASM ld hl, PokemonTower3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower3Text2: ; 6071c (18:471c) +PokemonTower3Text2: TX_ASM ld hl, PokemonTower3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower3Text3: ; 60726 (18:4726) +PokemonTower3Text3: TX_ASM ld hl, PokemonTower3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower3BattleText1: ; 60730 (18:4730) +PokemonTower3BattleText1: TX_FAR _PokemonTower3BattleText1 db "@" -PokemonTower3EndBattleText1: ; 60735 (18:4735) +PokemonTower3EndBattleText1: TX_FAR _PokemonTower3EndBattleText1 db "@" -PokemonTower3AfterBattleText1: ; 6073a (18:473a) +PokemonTower3AfterBattleText1: TX_FAR _PokemonTower3AfterBattleText1 db "@" -PokemonTower3BattleText2: ; 6073f (18:473f) +PokemonTower3BattleText2: TX_FAR _PokemonTower3BattleText2 db "@" -PokemonTower3EndBattleText2: ; 60744 (18:4744) +PokemonTower3EndBattleText2: TX_FAR _PokemonTower3EndBattleText2 db "@" -PokemonTower3AfterBattleText2: ; 60749 (18:4749) +PokemonTower3AfterBattleText2: TX_FAR _PokemonTower3AfterBattleText2 db "@" -PokemonTower3BattleText3: ; 6074e (18:474e) +PokemonTower3BattleText3: TX_FAR _PokemonTower3BattleText3 db "@" -PokemonTower3EndBattleText3: ; 60753 (18:4753) +PokemonTower3EndBattleText3: TX_FAR _PokemonTower3EndBattleText3 db "@" -PokemonTower3AfterBattleText3: ; 60758 (18:4758) +PokemonTower3AfterBattleText3: TX_FAR _PokemonTower3AfterBattleText3 db "@" diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm index 2638bdc2..2264f6d8 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/pokemontower4.asm @@ -1,4 +1,4 @@ -PokemonTower4Script: ; 607f6 (18:47f6) +PokemonTower4Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower4TrainerHeaders ld de, PokemonTower4ScriptPointers @@ -7,12 +7,12 @@ PokemonTower4Script: ; 607f6 (18:47f6) ld [W_POKEMONTOWER4CURSCRIPT], a ret -PokemonTower4ScriptPointers: ; 60809 (18:4809) +PokemonTower4ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PokemonTower4TextPointers: ; 6080f (18:480f) +PokemonTower4TextPointers: dw PokemonTower4Text1 dw PokemonTower4Text2 dw PokemonTower4Text3 @@ -20,8 +20,8 @@ PokemonTower4TextPointers: ; 6080f (18:480f) dw PickUpItemText dw PickUpItemText -PokemonTower4TrainerHeaders: ; 6081b (18:481b) -PokemonTower4TrainerHeader0: ; 6081b (18:481b) +PokemonTower4TrainerHeaders: +PokemonTower4TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_0 @@ -30,7 +30,7 @@ PokemonTower4TrainerHeader0: ; 6081b (18:481b) dw PokemonTower4EndBattleText1 ; TextEndBattle dw PokemonTower4EndBattleText1 ; TextEndBattle -PokemonTower4TrainerHeader1: ; 60827 (18:4827) +PokemonTower4TrainerHeader1: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_1 @@ -39,7 +39,7 @@ PokemonTower4TrainerHeader1: ; 60827 (18:4827) dw PokemonTower4EndBattleText2 ; TextEndBattle dw PokemonTower4EndBattleText2 ; TextEndBattle -PokemonTower4TrainerHeader2: ; 60833 (18:4833) +PokemonTower4TrainerHeader2: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_4_TRAINER_2 @@ -50,56 +50,56 @@ PokemonTower4TrainerHeader2: ; 60833 (18:4833) db $ff -PokemonTower4Text1: ; 60840 (18:4840) +PokemonTower4Text1: TX_ASM ld hl, PokemonTower4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower4Text2: ; 6084a (18:484a) +PokemonTower4Text2: TX_ASM ld hl, PokemonTower4TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower4Text3: ; 60854 (18:4854) +PokemonTower4Text3: TX_ASM ld hl, PokemonTower4TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower4BattleText1: ; 6085e (18:485e) +PokemonTower4BattleText1: TX_FAR _PokemonTower4BattleText1 db "@" -PokemonTower4EndBattleText1: ; 60863 (18:4863) +PokemonTower4EndBattleText1: TX_FAR _PokemonTower4EndBattleText1 db "@" -PokemonTower4AfterBattleText1: ; 60868 (18:4868) +PokemonTower4AfterBattleText1: TX_FAR _PokemonTower4AfterBattleText1 db "@" -PokemonTower4BattleText2: ; 6086d (18:486d) +PokemonTower4BattleText2: TX_FAR _PokemonTower4BattleText2 db "@" -PokemonTower4EndBattleText2: ; 60872 (18:4872) +PokemonTower4EndBattleText2: TX_FAR _PokemonTower4EndBattleText2 db "@" -PokemonTower4AfterBattleText2: ; 60877 (18:4877) +PokemonTower4AfterBattleText2: TX_FAR _PokemonTower4AfterBattleText2 db "@" -PokemonTower4BattleText3: ; 6087c (18:487c) +PokemonTower4BattleText3: TX_FAR _PokemonTower4BattleText3 db "@" -PokemonTower4EndBattleText3: ; 60881 (18:4881) +PokemonTower4EndBattleText3: TX_FAR _PokemonTower4EndBattleText3 db "@" -PokemonTower4AfterBattleText3: ; 60886 (18:4886) +PokemonTower4AfterBattleText3: TX_FAR _PokemonTower4AfterBattleText3 db "@" diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index c4e9eed9..d5d5e1b7 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -1,4 +1,4 @@ -PokemonTower5Script: ; 60932 (18:4932) +PokemonTower5Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower5TrainerHeaders ld de, PokemonTower5ScriptPointers @@ -7,12 +7,12 @@ PokemonTower5Script: ; 60932 (18:4932) ld [W_POKEMONTOWER5CURSCRIPT], a ret -PokemonTower5ScriptPointers: ; 60945 (18:4945) +PokemonTower5ScriptPointers: dw PokemonTower5Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PokemonTower5Script0: ; 6094b (18:494b) +PokemonTower5Script0: ld hl, CoordsData_60992 call ArePlayerCoordsInArray jr c, .asm_60960 @@ -41,14 +41,14 @@ PokemonTower5Script0: ; 6094b (18:494b) ld [wJoyIgnore], a ret -CoordsData_60992: ; 60992 (18:4992) +CoordsData_60992: db $08,$0A db $08,$0B db $09,$0A db $09,$0B db $FF -PokemonTower5TextPointers: ; 6099b (18:499b) +PokemonTower5TextPointers: dw PokemonTower5Text1 dw PokemonTower5Text2 dw PokemonTower5Text3 @@ -57,8 +57,8 @@ PokemonTower5TextPointers: ; 6099b (18:499b) dw PickUpItemText dw PokemonTower5Text7 -PokemonTower5TrainerHeaders: ; 609a9 (18:49a9) -PokemonTower5TrainerHeader0: ; 609a9 (18:49a9) +PokemonTower5TrainerHeaders: +PokemonTower5TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_0 @@ -67,7 +67,7 @@ PokemonTower5TrainerHeader0: ; 609a9 (18:49a9) dw PokemonTower5EndBattleText1 ; TextEndBattle dw PokemonTower5EndBattleText1 ; TextEndBattle -PokemonTower5TrainerHeader1: ; 609b5 (18:49b5) +PokemonTower5TrainerHeader1: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_1 @@ -76,7 +76,7 @@ PokemonTower5TrainerHeader1: ; 609b5 (18:49b5) dw PokemonTower5EndBattleText2 ; TextEndBattle dw PokemonTower5EndBattleText2 ; TextEndBattle -PokemonTower5TrainerHeader2: ; 609c1 (18:49c1) +PokemonTower5TrainerHeader2: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_2 @@ -85,7 +85,7 @@ PokemonTower5TrainerHeader2: ; 609c1 (18:49c1) dw PokemonTower5EndBattleText3 ; TextEndBattle dw PokemonTower5EndBattleText3 ; TextEndBattle -PokemonTower5TrainerHeader3: ; 609cd (18:49cd) +PokemonTower5TrainerHeader3: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_5_TRAINER_3 @@ -96,82 +96,82 @@ PokemonTower5TrainerHeader3: ; 609cd (18:49cd) db $ff -PokemonTower5Text1: ; 609da (18:49da) +PokemonTower5Text1: TX_FAR _PokemonTower5Text1 db "@" -PokemonTower5Text2: ; 609df (18:49df) +PokemonTower5Text2: TX_ASM ld hl, PokemonTower5TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower5BattleText1: ; 609e9 (18:49e9) +PokemonTower5BattleText1: TX_FAR _PokemonTower5BattleText1 db "@" -PokemonTower5EndBattleText1: ; 609ee (18:49ee) +PokemonTower5EndBattleText1: TX_FAR _PokemonTower5EndBattleText1 db "@" -PokemonTower5AfterBattleText1: ; 609f3 (18:49f3) +PokemonTower5AfterBattleText1: TX_FAR _PokemonTower5AfterBattleText1 db "@" -PokemonTower5Text3: ; 609f8 (18:49f8) +PokemonTower5Text3: TX_ASM ld hl, PokemonTower5TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower5BattleText2: ; 60a02 (18:4a02) +PokemonTower5BattleText2: TX_FAR _PokemonTower5BattleText2 db "@" -PokemonTower5EndBattleText2: ; 60a07 (18:4a07) +PokemonTower5EndBattleText2: TX_FAR _PokemonTower5EndBattleText2 db "@" -PokemonTower5AfterBattleText2: ; 60a0c (18:4a0c) +PokemonTower5AfterBattleText2: TX_FAR _PokemonTower5AfterBattleText2 db "@" -PokemonTower5Text4: ; 60a11 (18:4a11) +PokemonTower5Text4: TX_ASM ld hl, PokemonTower5TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower5BattleText3: ; 60a1b (18:4a1b) +PokemonTower5BattleText3: TX_FAR _PokemonTower5BattleText3 db "@" -PokemonTower5EndBattleText3: ; 60a20 (18:4a20) +PokemonTower5EndBattleText3: TX_FAR _PokemonTower5EndBattleText3 db "@" -PokemonTower5AfterBattleText3: ; 60a25 (18:4a25) +PokemonTower5AfterBattleText3: TX_FAR _PokemonTower5AfterBattleText3 db "@" -PokemonTower5Text5: ; 60a2a (18:4a2a) +PokemonTower5Text5: TX_ASM ld hl, PokemonTower5TrainerHeader3 call TalkToTrainer jp TextScriptEnd -PokemonTower5BattleText4: ; 60a34 (18:4a34) +PokemonTower5BattleText4: TX_FAR _PokemonTower5BattleText4 db "@" -PokemonTower5EndBattleText4: ; 60a39 (18:4a39) +PokemonTower5EndBattleText4: TX_FAR _PokemonTower5EndBattleText4 db "@" -PokemonTower5AfterBattleText4: ; 60a3e (18:4a3e) +PokemonTower5AfterBattleText4: TX_FAR _PokemonTower5AfterBattleText4 db "@" -PokemonTower5Text7: ; 60a43 (18:4a43) +PokemonTower5Text7: TX_FAR _PokemonTower5Text7 db "@" diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index 1c3b1050..a9b21a89 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -1,4 +1,4 @@ -PokemonTower6Script: ; 60aef (18:4aef) +PokemonTower6Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower6TrainerHeaders ld de, PokemonTower6ScriptPointers @@ -7,21 +7,21 @@ PokemonTower6Script: ; 60aef (18:4aef) ld [W_POKEMONTOWER6CURSCRIPT], a ret -PokemonTower6Script_60b02: ; 60b02 (18:4b02) +PokemonTower6Script_60b02: xor a ld [wJoyIgnore], a ld [W_POKEMONTOWER6CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -PokemonTower6ScriptPointers: ; 60b0d (18:4b0d) +PokemonTower6ScriptPointers: dw PokemonTower6Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw PokemonTower6Script3 dw PokemonTower6Script4 -PokemonTower6Script0: ; 60b17 (18:4b17) +PokemonTower6Script0: CheckEvent EVENT_BEAT_GHOST_MAROWAK jp nz, CheckFightingMapTrainers ld hl, CoordsData_60b45 @@ -41,10 +41,10 @@ PokemonTower6Script0: ; 60b17 (18:4b17) ld [W_CURMAPSCRIPT], a ret -CoordsData_60b45: ; 60b45 (18:4b45) +CoordsData_60b45: db $10,$0A,$FF -PokemonTower6Script4: ; 60b48 (18:4b48) +PokemonTower6Script4: ld a, [wIsInBattle] cp $ff jp z, PokemonTower6Script_60b02 @@ -84,7 +84,7 @@ PokemonTower6Script4: ; 60b48 (18:4b48) ld [W_CURMAPSCRIPT], a ret -PokemonTower6Script3: ; 60ba1 (18:4ba1) +PokemonTower6Script3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -94,7 +94,7 @@ PokemonTower6Script3: ; 60ba1 (18:4ba1) ld [W_CURMAPSCRIPT], a ret -PokemonTower6TextPointers: ; 60bb1 (18:4bb1) +PokemonTower6TextPointers: dw PokemonTower6Text1 dw PokemonTower6Text2 dw PokemonTower6Text3 @@ -103,8 +103,8 @@ PokemonTower6TextPointers: ; 60bb1 (18:4bb1) dw PokemonTower6Text6 dw PokemonTower6Text7 -PokemonTower6TrainerHeaders: ; 60bbf (18:4bbf) -PokemonTower6TrainerHeader0: ; 60bbf (18:4bbf) +PokemonTower6TrainerHeaders: +PokemonTower6TrainerHeader0: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_0 @@ -113,7 +113,7 @@ PokemonTower6TrainerHeader0: ; 60bbf (18:4bbf) dw PokemonTower6EndBattleText1 ; TextEndBattle dw PokemonTower6EndBattleText1 ; TextEndBattle -PokemonTower6TrainerHeader1: ; 60bcb (18:4bcb) +PokemonTower6TrainerHeader1: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_1 @@ -122,7 +122,7 @@ PokemonTower6TrainerHeader1: ; 60bcb (18:4bcb) dw PokemonTower6EndBattleText2 ; TextEndBattle dw PokemonTower6EndBattleText2 ; TextEndBattle -PokemonTower6TrainerHeader2: ; 60bd7 (18:4bd7) +PokemonTower6TrainerHeader2: dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_POKEMONTOWER_6_TRAINER_2 @@ -133,25 +133,25 @@ PokemonTower6TrainerHeader2: ; 60bd7 (18:4bd7) db $ff -PokemonTower6Text1: ; 60be4 (18:4be4) +PokemonTower6Text1: TX_ASM ld hl, PokemonTower6TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower6Text2: ; 60bee (18:4bee) +PokemonTower6Text2: TX_ASM ld hl, PokemonTower6TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower6Text3: ; 60bf8 (18:4bf8) +PokemonTower6Text3: TX_ASM ld hl, PokemonTower6TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower6Text7: ; 60c02 (18:4c02) +PokemonTower6Text7: TX_ASM ld hl, PokemonTower2Text_60c1f call PrintText @@ -164,50 +164,50 @@ PokemonTower6Text7: ; 60c02 (18:4c02) call PrintText jp TextScriptEnd -PokemonTower2Text_60c1f: ; 60c1f (18:4c1f) +PokemonTower2Text_60c1f: TX_FAR _PokemonTower2Text_60c1f db "@" -PokemonTower2Text_60c24: ; 60c24 (18:4c24) +PokemonTower2Text_60c24: TX_FAR _PokemonTower2Text_60c24 db "@" -PokemonTower6BattleText1: ; 60c29 (18:4c29) +PokemonTower6BattleText1: TX_FAR _PokemonTower6BattleText1 db "@" -PokemonTower6EndBattleText1: ; 60c2e (18:4c2e) +PokemonTower6EndBattleText1: TX_FAR _PokemonTower6EndBattleText1 db "@" -PokemonTower6AfterBattleText1: ; 60c33 (18:4c33) +PokemonTower6AfterBattleText1: TX_FAR _PokemonTower6AfterBattleText1 db "@" -PokemonTower6BattleText2: ; 60c38 (18:4c38) +PokemonTower6BattleText2: TX_FAR _PokemonTower6BattleText2 db "@" -PokemonTower6EndBattleText2: ; 60c3d (18:4c3d) +PokemonTower6EndBattleText2: TX_FAR _PokemonTower6EndBattleText2 db "@" -PokemonTower6AfterBattleText2: ; 60c42 (18:4c42) +PokemonTower6AfterBattleText2: TX_FAR _PokemonTower6AfterBattleText2 db "@" -PokemonTower6BattleText3: ; 60c47 (18:4c47) +PokemonTower6BattleText3: TX_FAR _PokemonTower6BattleText3 db "@" -PokemonTower6EndBattleText3: ; 60c4c (18:4c4c) +PokemonTower6EndBattleText3: TX_FAR _PokemonTower6EndBattleText3 db "@" -PokemonTower6AfterBattleText3: ; 60c51 (18:4c51) +PokemonTower6AfterBattleText3: TX_FAR _PokemonTower6AfterBattleText3 db "@" -PokemonTower6Text6: ; 60c56 (18:4c56) +PokemonTower6Text6: TX_FAR _PokemonTower6Text6 db "@" diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 32050e25..34345db9 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -1,11 +1,11 @@ -PokemonTower7Script: ; 60d05 (18:4d05) +PokemonTower7Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower7ScriptPointers ld a, [W_POKEMONTOWER7CURSCRIPT] call JumpTable ret -PokemonTower7Script_60d01: ; 60d18 (18:4d18) +PokemonTower7Script_60d01: xor a ld [wJoyIgnore], a PokemonTower7Script_60d05: @@ -13,18 +13,18 @@ PokemonTower7Script_60d05: ret PokemonTower7ScriptPointers: - dw PokemonTower7Script0 ; $4d21 - dw PokemonTower7Script1 ; $4d7f - dw PokemonTower7Script2 ; $4d9e - dw PokemonTower7Script3 ; $4da9 - dw PokemonTower7Script4 ; $4dbf - dw PokemonTower7Script5 ; $4dde - dw PokemonTower7Script6 ; $4de9 - dw PokemonTower7Script7 ; $4e0e - dw PokemonTower7Script8 ; $4e34 - dw PokemonTower7Script9 ; $4e7a - dw PokemonTower7Script10 ; $4e9b - dw PokemonTower7Script11 ; $4ec7 + dw PokemonTower7Script0 + dw PokemonTower7Script1 + dw PokemonTower7Script2 + dw PokemonTower7Script3 + dw PokemonTower7Script4 + dw PokemonTower7Script5 + dw PokemonTower7Script6 + dw PokemonTower7Script7 + dw PokemonTower7Script8 + dw PokemonTower7Script9 + dw PokemonTower7Script10 + dw PokemonTower7Script11 PokemonTower7Script0: CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_0 @@ -146,8 +146,8 @@ PokemonTower7Script7: ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, PokemonTower7JessieJamesEndBattleText ; 60f2c - ld de, PokemonTower7JessieJamesEndBattleText ; 60f2c + ld hl, PokemonTower7JessieJamesEndBattleText + ld de, PokemonTower7JessieJamesEndBattleText call SaveEndBattleTextPointers ld a, OPP_ROCKET ld [wCurOpponent], a diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index 48f291e1..353ab2f4 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -1,4 +1,4 @@ -PowerPlantScript: ; 1e2c6 (7:62c6) +PowerPlantScript: call EnableAutoTextBoxDrawing ld hl, PowerPlantTrainerHeaders ld de, PowerPlantScriptPointers @@ -7,12 +7,12 @@ PowerPlantScript: ; 1e2c6 (7:62c6) ld [W_POWERPLANTCURSCRIPT], a ret -PowerPlantScriptPointers: ; 1e2d9 (7:62d9) +PowerPlantScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PowerPlantTextPointers: ; 1e2df (7:62df) +PowerPlantTextPointers: dw PowerPlantText1 dw PowerPlantText2 dw PowerPlantText3 @@ -28,8 +28,8 @@ PowerPlantTextPointers: ; 1e2df (7:62df) dw PickUpItemText dw PickUpItemText -PowerPlantTrainerHeaders: ; 1e2fb (7:62fb) -PowerPlantTrainerHeader0: ; 1e2fb (7:62fb) +PowerPlantTrainerHeaders: +PowerPlantTrainerHeader0: dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_0 db 0 ; view range dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_0 @@ -38,7 +38,7 @@ PowerPlantTrainerHeader0: ; 1e2fb (7:62fb) dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader1: ; 1e307 (7:6307) +PowerPlantTrainerHeader1: dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_1 db 0 ; view range dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_1 @@ -47,7 +47,7 @@ PowerPlantTrainerHeader1: ; 1e307 (7:6307) dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader2: ; 1e313 (7:6313) +PowerPlantTrainerHeader2: dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_2 db 0 ; view range dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_2 @@ -56,7 +56,7 @@ PowerPlantTrainerHeader2: ; 1e313 (7:6313) dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader3: ; 1e31f (7:631f) +PowerPlantTrainerHeader3: dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_3 db 0 ; view range dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_3 @@ -65,7 +65,7 @@ PowerPlantTrainerHeader3: ; 1e31f (7:631f) dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader4: ; 1e32b (7:632b) +PowerPlantTrainerHeader4: dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_4 db 0 ; view range dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_4 @@ -74,7 +74,7 @@ PowerPlantTrainerHeader4: ; 1e32b (7:632b) dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader5: ; 1e337 (7:6337) +PowerPlantTrainerHeader5: dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_5 db 0 ; view range dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_5 @@ -83,7 +83,7 @@ PowerPlantTrainerHeader5: ; 1e337 (7:6337) dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader6: ; 1e343 (7:6343) +PowerPlantTrainerHeader6: dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_6 db 0 ; view range dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_6 @@ -92,7 +92,7 @@ PowerPlantTrainerHeader6: ; 1e343 (7:6343) dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader7: ; 1e34f (7:634f) +PowerPlantTrainerHeader7: dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_7, 1 db 0 ; view range dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_7, 1 @@ -101,7 +101,7 @@ PowerPlantTrainerHeader7: ; 1e34f (7:634f) dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader8: ; 1e35b (7:635b) +PowerPlantTrainerHeader8: dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_8, 1 db 0 ; view range dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_8, 1 @@ -112,62 +112,62 @@ PowerPlantTrainerHeader8: ; 1e35b (7:635b) db $ff -InitVoltorbBattle: ; 1e368 (7:6368) +InitVoltorbBattle: call TalkToTrainer ld a, [W_CURMAPSCRIPT] ld [W_POWERPLANTCURSCRIPT], a jp TextScriptEnd -PowerPlantText1: ; 1e374 (7:6374) +PowerPlantText1: TX_ASM ld hl, PowerPlantTrainerHeader0 jr InitVoltorbBattle -PowerPlantText2: ; 1e37a (7:637a) +PowerPlantText2: TX_ASM ld hl, PowerPlantTrainerHeader1 jr InitVoltorbBattle -PowerPlantText3: ; 1e380 (7:6380) +PowerPlantText3: TX_ASM ld hl, PowerPlantTrainerHeader2 jr InitVoltorbBattle -PowerPlantText4: ; 1e386 (7:6386) +PowerPlantText4: TX_ASM ld hl, PowerPlantTrainerHeader3 jr InitVoltorbBattle -PowerPlantText5: ; 1e38c (7:638c) +PowerPlantText5: TX_ASM ld hl, PowerPlantTrainerHeader4 jr InitVoltorbBattle -PowerPlantText6: ; 1e392 (7:6392) +PowerPlantText6: TX_ASM ld hl, PowerPlantTrainerHeader5 jr InitVoltorbBattle -PowerPlantText7: ; 1e398 (7:6398) +PowerPlantText7: TX_ASM ld hl, PowerPlantTrainerHeader6 jr InitVoltorbBattle -PowerPlantText8: ; 1e39e (7:639e) +PowerPlantText8: TX_ASM ld hl, PowerPlantTrainerHeader7 jr InitVoltorbBattle -PowerPlantText9: ; 1e3a4 (7:63a4) +PowerPlantText9: TX_ASM ld hl, PowerPlantTrainerHeader8 jr InitVoltorbBattle -VoltorbBattleText: ; 1e3aa (7:63aa) +VoltorbBattleText: TX_FAR _VoltorbBattleText db "@" -ZapdosBattleText: ; 1e3af (7:63af) +ZapdosBattleText: TX_FAR _ZapdosBattleText TX_ASM ld a, ZAPDOS diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index 602e8ecf..c302462d 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -1,17 +1,17 @@ -RedsHouse1FScript: ; 48168 (12:4168) +RedsHouse1FScript: call EnableAutoTextBoxDrawing ret -RedsHouse1FTextPointers: ; 4816b (12:416b) +RedsHouse1FTextPointers: dw RedsHouse1FText1 dw RedsHouse1FText2 -RedsHouse1FText1: ; 4816f (12:416f) Mom +RedsHouse1FText1: ; Mom TX_ASM callab Func_f1b73 jp TextScriptEnd -RedsHouse1FText2: ; 0x481c6 TV +RedsHouse1FText2: ; TV TX_ASM callab Func_f1bc4 jp TextScriptEnd diff --git a/scripts/redshouse1f2.asm b/scripts/redshouse1f2.asm index 7fd98d41..871f2e31 100755 --- a/scripts/redshouse1f2.asm +++ b/scripts/redshouse1f2.asm @@ -6,11 +6,11 @@ Func_f1b73: call PrintText ret -MomWakeUpText: ; 48185 (12:4185) +MomWakeUpText: TX_FAR _MomWakeUpText db "@" -MomHealPokemon: ; 4818a (12:418a) +MomHealPokemon: ld hl, MomHealText1 call PrintText call GBFadeOutToWhite @@ -31,10 +31,10 @@ MomHealPokemon: ; 4818a (12:418a) call PrintText ret -MomHealText1: ; 481bc (12:41bc) +MomHealText1: TX_FAR _MomHealText1 db "@" -MomHealText2: ; 481c1 (12:41c1) +MomHealText2: TX_FAR _MomHealText2 db "@" @@ -48,11 +48,11 @@ Func_f1bc4: call PrintText ret -StandByMeText: ; 481da (12:41da) +StandByMeText: TX_FAR _StandByMeText db "@" -TVWrongSideText: ; 481df (12:41df) +TVWrongSideText: TX_FAR _TVWrongSideText db "@" diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm index 3a0421a6..0945e901 100755 --- a/scripts/redshouse2f.asm +++ b/scripts/redshouse2f.asm @@ -1,23 +1,23 @@ -RedsHouse2FScript: ; 5c0b0 (17:40b0) +RedsHouse2FScript: call EnableAutoTextBoxDrawing ld hl, RedsHouse2FScriptPointers ld a, 0 call JumpTable ret -RedsHouse2FScriptPointers: ; 5c0bc (17:40bc) +RedsHouse2FScriptPointers: dw RedsHouse2FScript0 dw RedsHouse2FScript1 dw RedsHouse2FScript2 dw RedsHouse2FScript3 dw RedsHouse2FScript4 -RedsHouse2FScript0: ; 5c0ce (17:40ce) -RedsHouse2FScript1: ; 5c0ce (17:40ce) -RedsHouse2FScript2: ; 5c0ce (17:40ce) -RedsHouse2FScript3: ; 5c0ce (17:40ce) -RedsHouse2FScript4: ; 5c0ce (17:40ce) +RedsHouse2FScript0: +RedsHouse2FScript1: +RedsHouse2FScript2: +RedsHouse2FScript3: +RedsHouse2FScript4: ret -RedsHouse2FTextPointers: ; 5c0cf (17:40cf) +RedsHouse2FTextPointers: db "@" diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 82561577..ac699aba 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -1,4 +1,4 @@ -RocketHideout1Script: ; 44bca (11:4bca) +RocketHideout1Script: call RocketHideout1Script_44be0 call EnableAutoTextBoxDrawing ld hl, RocketHideout1TrainerHeaders @@ -8,7 +8,7 @@ RocketHideout1Script: ; 44bca (11:4bca) ld [W_ROCKETHIDEOUT1CURSCRIPT], a ret -RocketHideout1Script_44be0: ; 44be0 (11:4be0) +RocketHideout1Script_44be0: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -30,12 +30,12 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0) lb bc, 8, 12 predef_jump ReplaceTileBlock -RocketHideout1ScriptPointers: ; 44c0e (11:4c0e) +RocketHideout1ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -RocketHideout1TextPointers: ; 44c14 (11:4c14) +RocketHideout1TextPointers: dw RocketHideout1Text1 dw RocketHideout1Text2 dw RocketHideout1Text3 @@ -44,8 +44,8 @@ RocketHideout1TextPointers: ; 44c14 (11:4c14) dw PickUpItemText dw PickUpItemText -RocketHideout1TrainerHeaders: ; 44c22 (11:4c22) -RocketHideout1TrainerHeader0: ; 44c22 (11:4c22) +RocketHideout1TrainerHeaders: +RocketHideout1TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 @@ -54,7 +54,7 @@ RocketHideout1TrainerHeader0: ; 44c22 (11:4c22) dw RocketHideout1EndBattleText2 ; TextEndBattle dw RocketHideout1EndBattleText2 ; TextEndBattle -RocketHideout1TrainerHeader2: ; 44c2e (11:4c2e) +RocketHideout1TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 @@ -63,7 +63,7 @@ RocketHideout1TrainerHeader2: ; 44c2e (11:4c2e) dw RocketHideout1EndBattleText3 ; TextEndBattle dw RocketHideout1EndBattleText3 ; TextEndBattle -RocketHideout1TrainerHeader3: ; 44c3a (11:4c3a) +RocketHideout1TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 @@ -72,7 +72,7 @@ RocketHideout1TrainerHeader3: ; 44c3a (11:4c3a) dw RocketHideout1EndBattleText4 ; TextEndBattle dw RocketHideout1EndBattleText4 ; TextEndBattle -RocketHideout1TrainerHeader4: ; 44c46 (11:4c46) +RocketHideout1TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 @@ -81,7 +81,7 @@ RocketHideout1TrainerHeader4: ; 44c46 (11:4c46) dw RocketHideout1EndBattleText5 ; TextEndBattle dw RocketHideout1EndBattleText5 ; TextEndBattle -RocketHideout1TrainerHeader5: ; 44c52 (11:4c52) +RocketHideout1TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 @@ -92,98 +92,98 @@ RocketHideout1TrainerHeader5: ; 44c52 (11:4c52) db $ff -RocketHideout1Text1: ; 44c5f (11:4c5f) +RocketHideout1Text1: TX_ASM ld hl, RocketHideout1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text2: ; 44c69 (11:4c69) +RocketHideout1Text2: TX_ASM ld hl, RocketHideout1TrainerHeader2 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text3: ; 44c73 (11:4c73) +RocketHideout1Text3: TX_ASM ld hl, RocketHideout1TrainerHeader3 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text4: ; 44c7d (11:4c7d) +RocketHideout1Text4: TX_ASM ld hl, RocketHideout1TrainerHeader4 call TalkToTrainer jp TextScriptEnd -RocketHideout1Text5: ; 44c87 (11:4c87) +RocketHideout1Text5: TX_ASM ld hl, RocketHideout1TrainerHeader5 call TalkToTrainer jp TextScriptEnd -RocketHideout1EndBattleText6: ; 44c91 (11:4c91) +RocketHideout1EndBattleText6: TX_FAR _RocketHideout1EndBattleText6 TX_ASM SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 ld hl, RocketHideout1Text_44c9f ret -RocketHideout1Text_44c9f: ; 44c9f (11:4c9f) +RocketHideout1Text_44c9f: db $6, "@" -RocketHideout1BattleText2: ; 44ca1 (11:4ca1) +RocketHideout1BattleText2: TX_FAR _RocketHideout1BattleText2 db "@" -RocketHideout1EndBattleText2: ; 44ca6 (11:4ca6) +RocketHideout1EndBattleText2: TX_FAR _RocketHideout1EndBattleText2 db "@" -RocketHideout1AfterBattleTxt2: ; 44cab (11:4cab) +RocketHideout1AfterBattleTxt2: TX_FAR _RocketHideout1AfterBattleTxt2 db "@" -RocketHideout1BattleText3: ; 44cb0 (11:4cb0) +RocketHideout1BattleText3: TX_FAR _RocketHideout1BattleText3 db "@" -RocketHideout1EndBattleText3: ; 44cb5 (11:4cb5) +RocketHideout1EndBattleText3: TX_FAR _RocketHideout1EndBattleText3 db "@" -RocketHideout1AfterBattleTxt3: ; 44cba (11:4cba) +RocketHideout1AfterBattleTxt3: TX_FAR _RocketHideout1AfterBattleTxt3 db "@" -RocketHideout1BattleText4: ; 44cbf (11:4cbf) +RocketHideout1BattleText4: TX_FAR _RocketHideout1BattleText4 db "@" -RocketHideout1EndBattleText4: ; 44cc4 (11:4cc4) +RocketHideout1EndBattleText4: TX_FAR _RocketHideout1EndBattleText4 db "@" -RocketHideout1AfterBattleTxt4: ; 44cc9 (11:4cc9) +RocketHideout1AfterBattleTxt4: TX_FAR _RocketHideout1AfterBattleTxt4 db "@" -RocketHideout1BattleText5: ; 44cce (11:4cce) +RocketHideout1BattleText5: TX_FAR _RocketHideout1BattleText5 db "@" -RocketHideout1EndBattleText5: ; 44cd3 (11:4cd3) +RocketHideout1EndBattleText5: TX_FAR _RocketHideout1EndBattleText5 db "@" -RocketHideout1AfterBattleTxt5: ; 44cd8 (11:4cd8) +RocketHideout1AfterBattleTxt5: TX_FAR _RocketHideout1AfterBattleTxt5 db "@" -RocketHideout1BattleText6: ; 44cdd (11:4cdd) +RocketHideout1BattleText6: TX_FAR _RocketHideout1BattleText6 db "@" -RocketHideout1AfterBattleTxt6: ; 44ce2 (11:4ce2) +RocketHideout1AfterBattleTxt6: TX_FAR _RocketHideout1AfterBattleTxt6 db "@" diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index 621e19e6..1436f7c4 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -1,4 +1,4 @@ -RocketHideout2Script: ; 44e27 (11:4e27) +RocketHideout2Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout2TrainerHeaders ld de, RocketHideout2ScriptPointers @@ -7,13 +7,13 @@ RocketHideout2Script: ; 44e27 (11:4e27) ld [W_ROCKETHIDEOUT2CURSCRIPT], a ret -RocketHideout2ScriptPointers: ; 44e3a (11:4e3a) +RocketHideout2ScriptPointers: dw RocketHideout2Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw RocketHideout2Script3 -RocketHideout2Script0: ; 44e42 (11:4e42) +RocketHideout2Script0: ld a, [wYCoord] ld b, a ld a, [wXCoord] @@ -36,7 +36,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42) ;format: ;db y,x ;dw pointer to movement -RocketHideout2ArrowTilePlayerMovement: ; 44e6d (11:4e6d) +RocketHideout2ArrowTilePlayerMovement: db $9,$4 dw RocketHideout2ArrowMovement1 db $b,$4 @@ -127,181 +127,181 @@ RocketHideout2ArrowTilePlayerMovement: ; 44e6d (11:4e6d) ;format: direction, count ;each list is read starting from the $FF and working backwards -RocketHideout2ArrowMovement1: ; 44f1a (11:4f1a) +RocketHideout2ArrowMovement1: db D_LEFT,$02 db $FF -RocketHideout2ArrowMovement2: ; 44f1d (11:4f1d) +RocketHideout2ArrowMovement2: db D_RIGHT,$04 db $FF -RocketHideout2ArrowMovement3: ; 44f20 (11:4f20) +RocketHideout2ArrowMovement3: db D_UP,$04 db D_RIGHT,$04 db $FF -RocketHideout2ArrowMovement4: ; 44f25 (11:4f25) +RocketHideout2ArrowMovement4: db D_UP,$04 db D_RIGHT,$04 db D_UP,$01 db $FF -RocketHideout2ArrowMovement5: ; 44f2c (11:4f2c) +RocketHideout2ArrowMovement5: db D_LEFT,$02 db D_UP,$03 db $FF -RocketHideout2ArrowMovement6: ; 44f31 (11:4f31) +RocketHideout2ArrowMovement6: db D_DOWN,$02 db D_RIGHT,$04 db $FF -RocketHideout2ArrowMovement7: ; 44f36 (11:4f36) +RocketHideout2ArrowMovement7: db D_UP,$02 db $FF -RocketHideout2ArrowMovement8: ; 44f39 (11:4f39) +RocketHideout2ArrowMovement8: db D_UP,$04 db $FF -RocketHideout2ArrowMovement9: ; 44f3c (11:4f3c) +RocketHideout2ArrowMovement9: db D_LEFT,$06 db $FF -RocketHideout2ArrowMovement10: ; 44f3f (11:4f3f) +RocketHideout2ArrowMovement10: db D_UP,$01 db $FF -RocketHideout2ArrowMovement11: ; 44f42 (11:4f42) +RocketHideout2ArrowMovement11: db D_LEFT,$06 db D_UP,$04 db $FF -RocketHideout2ArrowMovement12: ; 44f47 (11:4f47) +RocketHideout2ArrowMovement12: db D_DOWN,$02 db $FF -RocketHideout2ArrowMovement13: ; 44f4a (11:4f4a) +RocketHideout2ArrowMovement13: db D_LEFT,$08 db $FF -RocketHideout2ArrowMovement14: ; 44f4d (11:4f4d) +RocketHideout2ArrowMovement14: db D_LEFT,$08 db D_UP,$01 db $FF -RocketHideout2ArrowMovement15: ; 44f52 (11:4f52) +RocketHideout2ArrowMovement15: db D_LEFT,$08 db D_UP,$06 db $FF -RocketHideout2ArrowMovement16: ; 44f57 (11:4f57) +RocketHideout2ArrowMovement16: db D_UP,$02 db D_RIGHT,$04 db $FF -RocketHideout2ArrowMovement17: ; 44f5c (11:4f5c) +RocketHideout2ArrowMovement17: db D_UP,$02 db D_RIGHT,$04 db D_UP,$02 db $FF -RocketHideout2ArrowMovement18: ; 44f63 (11:4f63) +RocketHideout2ArrowMovement18: db D_DOWN,$02 db D_RIGHT,$04 db D_DOWN,$02 db $FF -RocketHideout2ArrowMovement19: ; 44f6a (11:4f6a) +RocketHideout2ArrowMovement19: db D_DOWN,$02 db D_RIGHT,$04 db $FF -RocketHideout2ArrowMovement20: ; 44f6f (11:4f6f) +RocketHideout2ArrowMovement20: db D_LEFT,$0A db $FF -RocketHideout2ArrowMovement21: ; 44f72 (11:4f72) +RocketHideout2ArrowMovement21: db D_LEFT,$0A db D_UP,$02 db $FF -RocketHideout2ArrowMovement22: ; 44f77 (11:4f77) +RocketHideout2ArrowMovement22: db D_LEFT,$0A db D_UP,$04 db $FF -RocketHideout2ArrowMovement23: ; 44f7c (11:4f7c) +RocketHideout2ArrowMovement23: db D_UP,$02 db D_RIGHT,$02 db $FF -RocketHideout2ArrowMovement24: ; 44f81 (11:4f81) +RocketHideout2ArrowMovement24: db D_RIGHT,$01 db D_DOWN,$02 db $FF -RocketHideout2ArrowMovement25: ; 44f86 (11:4f86) +RocketHideout2ArrowMovement25: db D_RIGHT,$01 db $FF -RocketHideout2ArrowMovement26: ; 44f89 (11:4f89) +RocketHideout2ArrowMovement26: db D_DOWN,$02 db D_RIGHT,$02 db $FF -RocketHideout2ArrowMovement27: ; 44f8e (11:4f8e) +RocketHideout2ArrowMovement27: db D_DOWN,$02 db D_LEFT,$02 db $FF -RocketHideout2ArrowMovement28: ; 44f93 (11:4f93) +RocketHideout2ArrowMovement28: db D_UP,$02 db D_RIGHT,$04 db D_UP,$02 db D_LEFT,$03 db $FF -RocketHideout2ArrowMovement29: ; 44f9c (11:4f9c) +RocketHideout2ArrowMovement29: db D_DOWN,$02 db D_LEFT,$04 db $FF -RocketHideout2ArrowMovement30: ; 44fa1 (11:4fa1) +RocketHideout2ArrowMovement30: db D_LEFT,$06 db D_UP,$04 db D_LEFT,$05 db $FF -RocketHideout2ArrowMovement31: ; 44fa8 (11:4fa8) +RocketHideout2ArrowMovement31: db D_UP,$02 db $FF -RocketHideout2ArrowMovement32: ; 44fab (11:4fab) +RocketHideout2ArrowMovement32: db D_UP,$01 db $FF -RocketHideout2ArrowMovement33: ; 44fae (11:4fae) +RocketHideout2ArrowMovement33: db D_UP,$03 db $FF -RocketHideout2ArrowMovement34: ; 44fb1 (11:4fb1) +RocketHideout2ArrowMovement34: db D_UP,$05 db $FF -RocketHideout2ArrowMovement35: ; 44fb4 (11:4fb4) +RocketHideout2ArrowMovement35: db D_RIGHT,$01 db D_DOWN,$02 db D_LEFT,$04 db $FF -RocketHideout2ArrowMovement36: ; 44fbb (11:4fbb) +RocketHideout2ArrowMovement36: db D_LEFT,$0A db D_UP,$02 db D_LEFT,$05 db $FF -RocketHideout2Script3: ; 44fc2 (11:4fc2) +RocketHideout2Script3: ld a, [wSimulatedJoypadStatesIndex] and a jr nz, LoadSpinnerArrowTiles @@ -313,7 +313,7 @@ RocketHideout2Script3: ; 44fc2 (11:4fc2) ld [W_CURMAPSCRIPT], a ret -LoadSpinnerArrowTiles: ; 45077 (11:5077) +LoadSpinnerArrowTiles: ld a, [wSpriteStateData1 + 2] srl a srl a @@ -400,7 +400,7 @@ vGymSpinner EQU vTileset + GYM_SPINNER spinner Gym_GFX, GYM_SPINNER + $100, 1, vGymSpinner + $100 spinner Gym_GFX, GYM_SPINNER + $110, 1, vGymSpinner + $110 -SpinnerPlayerFacingDirections: ; 45083 (11:5083) +SpinnerPlayerFacingDirections: ; This isn't the order of the facing directions. Rather, it's a list of ; the facing directions that come next. For example, when the player is ; facing down (00), the next facing direction is left (08). @@ -410,18 +410,18 @@ SpinnerPlayerFacingDirections: ; 45083 (11:5083) db $00 ; right -> down ; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ -SpinnerArrowAnimTiles: ; 45087 (11:5087) +SpinnerArrowAnimTiles: INCBIN "gfx/spinner_arrow.2bpp" -RocketHideout2TextPointers: ; 450c7 (11:50c7) +RocketHideout2TextPointers: dw RocketHideout2Text1 dw PickUpItemText dw PickUpItemText dw PickUpItemText dw PickUpItemText -RocketHideout2TrainerHeaders: ; 450d1 (11:50d1) -RocketHideout2TrainerHeader0: ; 450d1 (11:50d1) +RocketHideout2TrainerHeaders: +RocketHideout2TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 @@ -432,20 +432,20 @@ RocketHideout2TrainerHeader0: ; 450d1 (11:50d1) db $ff -RocketHideout2Text1: ; 450de (11:50de) +RocketHideout2Text1: TX_ASM ld hl, RocketHideout2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout2BattleText2: ; 450e8 (11:50e8) +RocketHideout2BattleText2: TX_FAR _RocketHideout2BattleText2 db "@" -RocketHideout2EndBattleText2: ; 450ed (11:50ed) +RocketHideout2EndBattleText2: TX_FAR _RocketHideout2EndBattleText2 db "@" -RocketHideout2AfterBattleTxt2: ; 450f2 (11:50f2) +RocketHideout2AfterBattleTxt2: TX_FAR _RocketHideout2AfterBattleTxt2 db "@" diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index 4cdacea3..4e83b32a 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -1,4 +1,4 @@ -RocketHideout3Script: ; 45225 (11:5225) +RocketHideout3Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout3TrainerHeaders ld de, RocketHideout3ScriptPointers @@ -7,13 +7,13 @@ RocketHideout3Script: ; 45225 (11:5225) ld [W_ROCKETHIDEOUT3CURSCRIPT], a ret -RocketHideout3ScriptPointers: ; 45238 (11:5238) +RocketHideout3ScriptPointers: dw RocketHideout3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw RocketHideout3Script3 -RocketHideout3Script0: ; 45240 (11:5240) +RocketHideout3Script0: ld a, [wYCoord] ld b, a ld a, [wXCoord] @@ -36,7 +36,7 @@ RocketHideout3Script0: ; 45240 (11:5240) ;format: ;db y,x ;dw pointer to movement -RocketHideout3ArrowTilePlayerMovement: ; 4526b (11:526b) +RocketHideout3ArrowTilePlayerMovement: db $d,$a dw RocketHideout3ArrowMovement6 db $13,$a @@ -73,65 +73,65 @@ RocketHideout3ArrowTilePlayerMovement: ; 4526b (11:526b) ;format: direction, count ;each list is read starting from the $FF and working backwards -RocketHideout3ArrowMovement1: ; 452ac (11:52ac) +RocketHideout3ArrowMovement1: db D_RIGHT,$04 db D_UP,$04 db D_RIGHT,$04 db $FF -RocketHideout3ArrowMovement2: ; 452b3 (11:52b3) +RocketHideout3ArrowMovement2: db D_DOWN,$04 db D_RIGHT,$04 db $FF -RocketHideout3ArrowMovement3: ; 452b8 (11:52b8) +RocketHideout3ArrowMovement3: db D_LEFT,$02 db $FF -RocketHideout3ArrowMovement4: ; 452bb (11:52bb) +RocketHideout3ArrowMovement4: db D_RIGHT,$04 db D_UP,$02 db D_RIGHT,$02 db $FF -RocketHideout3ArrowMovement5: ; 452c2 (11:52c2) +RocketHideout3ArrowMovement5: db D_RIGHT,$04 db D_UP,$02 db D_RIGHT,$02 db D_UP,$03 db $FF -RocketHideout3ArrowMovement6: ; 452cb (11:52cb) +RocketHideout3ArrowMovement6: db D_RIGHT,$04 db $FF -RocketHideout3ArrowMovement7: ; 452ce (11:52ce) +RocketHideout3ArrowMovement7: db D_RIGHT,$02 db $FF -RocketHideout3ArrowMovement8: ; 452d1 (11:52d1) +RocketHideout3ArrowMovement8: db D_RIGHT,$04 db D_UP,$02 db $FF -RocketHideout3ArrowMovement9: ; 452d6 (11:52d6) +RocketHideout3ArrowMovement9: db D_RIGHT,$04 db D_UP,$04 db $FF -RocketHideout3ArrowMovement10: ; 452db (11:52db) +RocketHideout3ArrowMovement10: db D_DOWN,$04 db $FF -RocketHideout3ArrowMovement11: ; 452de (11:52de) +RocketHideout3ArrowMovement11: db D_UP,$02 db $FF -RocketHideout3ArrowMovement12: ; 452e1 (11:52e1) +RocketHideout3ArrowMovement12: db D_UP,$01 db $FF -RocketHideout3Script3: ; 452e4 (11:452e4) +RocketHideout3Script3: ld a, [wSimulatedJoypadStatesIndex] and a jp nz, LoadSpinnerArrowTiles @@ -143,14 +143,14 @@ RocketHideout3Script3: ; 452e4 (11:452e4) ld [W_CURMAPSCRIPT], a ret -RocketHideout3TextPointers: ; 452fa (11:52fa) +RocketHideout3TextPointers: dw RocketHideout3Text1 dw RocketHideout3Text2 dw PickUpItemText dw PickUpItemText -RocketHideout3TrainerHeaders: ; 45302 (11:5302) -RocketHideout3TrainerHeader0: ; 45302 (11:5302) +RocketHideout3TrainerHeaders: +RocketHideout3TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 @@ -159,7 +159,7 @@ RocketHideout3TrainerHeader0: ; 45302 (11:5302) dw RocketHideout3EndBattleText2 ; TextEndBattle dw RocketHideout3EndBattleText2 ; TextEndBattle -RocketHideout3TrainerHeader2: ; 4530e (11:530e) +RocketHideout3TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 @@ -170,38 +170,38 @@ RocketHideout3TrainerHeader2: ; 4530e (11:530e) db $ff -RocketHideout3Text1: ; 4531b (11:531b) +RocketHideout3Text1: TX_ASM ld hl, RocketHideout3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout3BattleText2: ; 45325 (11:5325) +RocketHideout3BattleText2: TX_FAR _RocketHideout3BattleText2 db "@" -RocketHideout3EndBattleText2: ; 4532a (11:532a) +RocketHideout3EndBattleText2: TX_FAR _RocketHideout3EndBattleText2 db "@" -RocketHideout3AfterBattleTxt2: ; 4532f (11:532f) +RocketHideout3AfterBattleTxt2: TX_FAR _RocketHideout3AfterBattleTxt2 db "@" -RocketHideout3Text2: ; 45334 (11:5334) +RocketHideout3Text2: TX_ASM ld hl, RocketHideout3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -RocketHideout3BattleTxt: ; 4533e (11:533e) +RocketHideout3BattleTxt: TX_FAR _RocketHideout3BattleTxt db "@" -RocketHideout3EndBattleText3: ; 45343 (11:5343) +RocketHideout3EndBattleText3: TX_FAR _RocketHideout3EndBattleText3 db "@" -RocketHideout3AfterBattleText3: ; 45348 (11:5348) +RocketHideout3AfterBattleText3: TX_FAR _RocketHide3AfterBattleText3 db "@" diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index d0e6f567..9c2c4d82 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -1,4 +1,4 @@ -RocketHideout4Script: ; 4545d (11:545d) +RocketHideout4Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout4TrainerHeader0 ld de, RocketHideout4ScriptPointers @@ -7,7 +7,7 @@ RocketHideout4Script: ; 4545d (11:545d) ld [W_ROCKETHIDEOUT4CURSCRIPT], a ret -RocketHideout4Script_45510: ; 45510 (11:54a3) +RocketHideout4Script_45510: CheckAndResetEvent EVENT_6A0 call nz, RocketHideout4Script_45525 xor a @@ -24,7 +24,7 @@ RocketHideout4Script_45525: call RocketHideout4Script_45756 ret -RocketHideout4ScriptPointers: ; 454ae (11:54ae)c +RocketHideout4ScriptPointers: dw RocketHideout4Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -40,7 +40,7 @@ RocketHideout4ScriptPointers: ; 454ae (11:54ae)c dw RocketHideout4Script12 dw RocketHideout4Script13 -RocketHideout4Script3: ; 454b6 (11:54b6) +RocketHideout4Script3: ld a, [wIsInBattle] cp $ff jp z, RocketHideout4Script_45510 @@ -200,8 +200,8 @@ RocketHideout4Script10: ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, RocketHideout4JessieJamesEndBattleText ; 457b2 - ld de, RocketHideout4JessieJamesEndBattleText ; 457b2 + ld hl, RocketHideout4JessieJamesEndBattleText + ld de, RocketHideout4JessieJamesEndBattleText call SaveEndBattleTextPointers ld a, OPP_ROCKET ld [wCurOpponent], a @@ -283,7 +283,7 @@ RocketHideout4Script_45756: predef HideObject ret -RocketHideout4TextPointers: ; 45501 (11:5501) +RocketHideout4TextPointers: dw RocketHideout4Text0 dw RocketHideout4Text1 dw RocketHideout4Text2 @@ -303,10 +303,10 @@ RocketHideout4TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 db ($1 << 4) dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 - dw RocketHideout4Trainer0BeforeText ; 4581d - dw RocketHideout4Trainer0AfterText ; 4583a - dw RocketHideout4Trainer0EndBattleText ; 45822 - dw RocketHideout4Trainer0EndBattleText ; 45822 + dw RocketHideout4Trainer0BeforeText + dw RocketHideout4Trainer0AfterText + dw RocketHideout4Trainer0EndBattleText + dw RocketHideout4Trainer0EndBattleText db $ff RocketHideout4Text1: diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index 8a0ca049..5a5e7ae2 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevatorScript: ; 45710 (11:5710) +RocketHideoutElevatorScript: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -14,7 +14,7 @@ RocketHideoutElevatorScript: ; 45710 (11:5710) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -RocketHideoutElevatorScript_4572c: ; 4572c (11:572c) +RocketHideoutElevatorScript_4572c: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a @@ -22,7 +22,7 @@ RocketHideoutElevatorScript_4572c: ; 4572c (11:572c) ld c, a call RocketHideoutElevatorScript_4573a -RocketHideoutElevatorScript_4573a: ; 4573a (11:573a) +RocketHideoutElevatorScript_4573a: inc hl inc hl ld a, b @@ -31,7 +31,7 @@ RocketHideoutElevatorScript_4573a: ; 4573a (11:573a) ld [hli], a ret -RocketHideoutElevatorScript_45741: ; 45741 (11:5741) +RocketHideoutElevatorScript_45741: ld hl, RocketHideoutElavatorFloors call LoadItemList ld hl, RocketHideoutElevatorWarpMaps @@ -40,14 +40,14 @@ RocketHideoutElevatorScript_45741: ; 45741 (11:5741) call CopyData ret -RocketHideoutElavatorFloors: ; 45754 (11:5754) +RocketHideoutElavatorFloors: db $03 ; num elements in list db FLOOR_B1F db FLOOR_B2F db FLOOR_B4F db $FF ; terminator -RocketHideoutElevatorWarpMaps: ; 45759 (11:5759) +RocketHideoutElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. @@ -56,15 +56,15 @@ RocketHideoutElevatorWarpMaps: ; 45759 (11:5759) db $02, ROCKET_HIDEOUT_4 RocketHideoutElevatorWarpMapsEnd: -RocketHideoutElevatorScript_4575f: ; 4575f (11:575f) +RocketHideoutElevatorScript_4575f: call Delay3 callba ShakeElevator ret -RocketHideoutElevatorTextPointers: ; 4576b (11:576b) +RocketHideoutElevatorTextPointers: dw RocketHideoutElevatorText1 -RocketHideoutElevatorText1: ; 4576d (11:576d) +RocketHideoutElevatorText1: TX_ASM ld b, LIFT_KEY call IsItemInBag @@ -79,6 +79,6 @@ RocketHideoutElevatorText1: ; 4576d (11:576d) .asm_45788 jp TextScriptEnd -RocketHideoutElevatorText_4578b: ; 4578b (11:578b) +RocketHideoutElevatorText_4578b: TX_FAR _RocketElevatorText_4578b db $d, "@" diff --git a/scripts/rocktunnel1.asm b/scripts/rocktunnel1.asm index d03a5ba1..c32c1036 100755 --- a/scripts/rocktunnel1.asm +++ b/scripts/rocktunnel1.asm @@ -1,4 +1,4 @@ -RockTunnel1Script: ; 444dc (11:44dc) +RockTunnel1Script: call EnableAutoTextBoxDrawing ld hl, RockTunnel1TrainerHeaders ld de, RockTunnel1ScriptPointers @@ -7,12 +7,12 @@ RockTunnel1Script: ; 444dc (11:44dc) ld [W_ROCKTUNNEL1CURSCRIPT], a ret -RockTunnel1ScriptPointers: ; 444ef (11:44ef) +RockTunnel1ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -RockTunnel1TextPointers: ; 444f5 (11:44f5) +RockTunnel1TextPointers: dw RockTunnel1Text1 dw RockTunnel1Text2 dw RockTunnel1Text3 @@ -22,8 +22,8 @@ RockTunnel1TextPointers: ; 444f5 (11:44f5) dw RockTunnel1Text7 dw RockTunnel1Text8 -RockTunnel1TrainerHeaders: ; 44505 (11:4505) -RockTunnel1TrainerHeader1: ; 44505 (11:4505) +RockTunnel1TrainerHeaders: +RockTunnel1TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1 @@ -32,7 +32,7 @@ RockTunnel1TrainerHeader1: ; 44505 (11:4505) dw RockTunnel1EndBattleText1 ; TextEndBattle dw RockTunnel1EndBattleText1 ; TextEndBattle -RockTunnel1TrainerHeader2: ; 44511 (11:4511) +RockTunnel1TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2 @@ -41,7 +41,7 @@ RockTunnel1TrainerHeader2: ; 44511 (11:4511) dw RockTunnel1EndBattleText2 ; TextEndBattle dw RockTunnel1EndBattleText2 ; TextEndBattle -RockTunnel1TrainerHeader3: ; 4451d (11:451d) +RockTunnel1TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3 @@ -50,7 +50,7 @@ RockTunnel1TrainerHeader3: ; 4451d (11:451d) dw RockTunnel1EndBattleText3 ; TextEndBattle dw RockTunnel1EndBattleText3 ; TextEndBattle -RockTunnel1TrainerHeader4: ; 44529 (11:4529) +RockTunnel1TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4 @@ -59,7 +59,7 @@ RockTunnel1TrainerHeader4: ; 44529 (11:4529) dw RockTunnel1EndBattleText4 ; TextEndBattle dw RockTunnel1EndBattleText4 ; TextEndBattle -RockTunnel1TrainerHeader5: ; 44535 (11:4535) +RockTunnel1TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5 @@ -68,7 +68,7 @@ RockTunnel1TrainerHeader5: ; 44535 (11:4535) dw RockTunnel1EndBattleText5 ; TextEndBattle dw RockTunnel1EndBattleText5 ; TextEndBattle -RockTunnel1TrainerHeader6: ; 44541 (11:4541) +RockTunnel1TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6 @@ -77,7 +77,7 @@ RockTunnel1TrainerHeader6: ; 44541 (11:4541) dw RockTunnel1EndBattleText6 ; TextEndBattle dw RockTunnel1EndBattleText6 ; TextEndBattle -RockTunnel1TrainerHeader7: ; 4454d (11:454d) +RockTunnel1TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7 @@ -88,127 +88,127 @@ RockTunnel1TrainerHeader7: ; 4454d (11:454d) db $ff -RockTunnel1Text1: ; 4455a (11:455a) +RockTunnel1Text1: TX_ASM ld hl, RockTunnel1TrainerHeader1 jr RockTunnel1TalkToTrainer -RockTunnel1Text2: ; 44560 (11:4560) +RockTunnel1Text2: TX_ASM ld hl, RockTunnel1TrainerHeader2 jr RockTunnel1TalkToTrainer -RockTunnel1Text3: ; 44566 (11:4566) +RockTunnel1Text3: TX_ASM ld hl, RockTunnel1TrainerHeader3 jr RockTunnel1TalkToTrainer -RockTunnel1Text4: ; 4456c (11:456c) +RockTunnel1Text4: TX_ASM ld hl, RockTunnel1TrainerHeader4 jr RockTunnel1TalkToTrainer -RockTunnel1Text5: ; 44572 (11:4572) +RockTunnel1Text5: TX_ASM ld hl, RockTunnel1TrainerHeader5 jr RockTunnel1TalkToTrainer -RockTunnel1Text6: ; 44578 (11:4578) +RockTunnel1Text6: TX_ASM ld hl, RockTunnel1TrainerHeader6 jr RockTunnel1TalkToTrainer -RockTunnel1Text7: ; 4457e (11:457e) +RockTunnel1Text7: TX_ASM ld hl, RockTunnel1TrainerHeader7 -RockTunnel1TalkToTrainer: ; 44582 (11:4582) +RockTunnel1TalkToTrainer: call TalkToTrainer jp TextScriptEnd -RockTunnel1BattleText1: ; 44588 (11:4588) +RockTunnel1BattleText1: TX_FAR _RockTunnel1BattleText1 db "@" -RockTunnel1EndBattleText1: ; 4458d (11:458d) +RockTunnel1EndBattleText1: TX_FAR _RockTunnel1EndBattleText1 db "@" -RockTunnel1AfterBattleText1: ; 44592 (11:4592) +RockTunnel1AfterBattleText1: TX_FAR _RockTunnel1AfterBattleText1 db "@" -RockTunnel1BattleText2: ; 44597 (11:4597) +RockTunnel1BattleText2: TX_FAR _RockTunnel1BattleText2 db "@" -RockTunnel1EndBattleText2: ; 4459c (11:459c) +RockTunnel1EndBattleText2: TX_FAR _RockTunnel1EndBattleText2 db "@" -RockTunnel1AfterBattleText2: ; 445a1 (11:45a1) +RockTunnel1AfterBattleText2: TX_FAR _RockTunnel1AfterBattleText2 db "@" -RockTunnel1BattleText3: ; 445a6 (11:45a6) +RockTunnel1BattleText3: TX_FAR _RockTunnel1BattleText3 db "@" -RockTunnel1EndBattleText3: ; 445ab (11:45ab) +RockTunnel1EndBattleText3: TX_FAR _RockTunnel1EndBattleText3 db "@" -RockTunnel1AfterBattleText3: ; 445b0 (11:45b0) +RockTunnel1AfterBattleText3: TX_FAR _RockTunnel1AfterBattleText3 db "@" -RockTunnel1BattleText4: ; 445b5 (11:45b5) +RockTunnel1BattleText4: TX_FAR _RockTunnel1BattleText4 db "@" -RockTunnel1EndBattleText4: ; 445ba (11:45ba) +RockTunnel1EndBattleText4: TX_FAR _RockTunnel1EndBattleText4 db "@" -RockTunnel1AfterBattleText4: ; 445bf (11:45bf) +RockTunnel1AfterBattleText4: TX_FAR _RockTunnel1AfterBattleText4 db "@" -RockTunnel1BattleText5: ; 445c4 (11:45c4) +RockTunnel1BattleText5: TX_FAR _RockTunnel1BattleText5 db "@" -RockTunnel1EndBattleText5: ; 445c9 (11:45c9) +RockTunnel1EndBattleText5: TX_FAR _RockTunnel1EndBattleText5 db "@" -RockTunnel1AfterBattleText5: ; 445ce (11:45ce) +RockTunnel1AfterBattleText5: TX_FAR _RockTunnel1AfterBattleText5 db "@" -RockTunnel1BattleText6: ; 445d3 (11:45d3) +RockTunnel1BattleText6: TX_FAR _RockTunnel1BattleText6 db "@" -RockTunnel1EndBattleText6: ; 445d8 (11:45d8) +RockTunnel1EndBattleText6: TX_FAR _RockTunnel1EndBattleText6 db "@" -RockTunnel1AfterBattleText6: ; 445dd (11:45dd) +RockTunnel1AfterBattleText6: TX_FAR _RockTunnel1AfterBattleText6 db "@" -RockTunnel1BattleText7: ; 445e2 (11:45e2) +RockTunnel1BattleText7: TX_FAR _RockTunnel1BattleText7 db "@" -RockTunnel1EndBattleText7: ; 445e7 (11:45e7) +RockTunnel1EndBattleText7: TX_FAR _RockTunnel1EndBattleText7 db "@" -RockTunnel1AfterBattleText7: ; 445ec (11:45ec) +RockTunnel1AfterBattleText7: TX_FAR _RockTunnel1AfterBattleText7 db "@" -RockTunnel1Text8: ; 445f1 (11:45f1) +RockTunnel1Text8: TX_FAR _RockTunnel1Text8 db "@" diff --git a/scripts/rocktunnel2.asm b/scripts/rocktunnel2.asm index 2082394a..d522ba0e 100755 --- a/scripts/rocktunnel2.asm +++ b/scripts/rocktunnel2.asm @@ -1,4 +1,4 @@ -RockTunnel2Script: ; 45feb (11:5feb) +RockTunnel2Script: call EnableAutoTextBoxDrawing ld hl, RockTunnel2TrainerHeaders ld de, RockTunnel2ScriptPointers @@ -7,12 +7,12 @@ RockTunnel2Script: ; 45feb (11:5feb) ld [W_ROCKTUNNEL2CURSCRIPT], a ret -RockTunnel2ScriptPointers: ; 45ffe (11:5ffe) +RockTunnel2ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -RockTunnel2TextPointers: ; 46004 (11:6004) +RockTunnel2TextPointers: dw RockTunnel2Text1 dw RockTunnel2Text2 dw RockTunnel2Text3 @@ -22,8 +22,8 @@ RockTunnel2TextPointers: ; 46004 (11:6004) dw RockTunnel2Text7 dw RockTunnel2Text8 -RockTunnel2TrainerHeaders: ; 46014 (11:6014) -RockTunnel2TrainerHeader0: ; 46014 (11:6014) +RockTunnel2TrainerHeaders: +RockTunnel2TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0 @@ -32,7 +32,7 @@ RockTunnel2TrainerHeader0: ; 46014 (11:6014) dw RockTunnel2EndBattleText2 ; TextEndBattle dw RockTunnel2EndBattleText2 ; TextEndBattle -RockTunnel2TrainerHeader2: ; 46020 (11:6020) +RockTunnel2TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2 @@ -41,7 +41,7 @@ RockTunnel2TrainerHeader2: ; 46020 (11:6020) dw RockTunnel2EndBattleText3 ; TextEndBattle dw RockTunnel2EndBattleText3 ; TextEndBattle -RockTunnel2TrainerHeader3: ; 4602c (11:602c) +RockTunnel2TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3 @@ -50,7 +50,7 @@ RockTunnel2TrainerHeader3: ; 4602c (11:602c) dw RockTunnel2EndBattleText4 ; TextEndBattle dw RockTunnel2EndBattleText4 ; TextEndBattle -RockTunnel2TrainerHeader4: ; 46038 (11:6038) +RockTunnel2TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4 @@ -59,7 +59,7 @@ RockTunnel2TrainerHeader4: ; 46038 (11:6038) dw RockTunnel2EndBattleText5 ; TextEndBattle dw RockTunnel2EndBattleText5 ; TextEndBattle -RockTunnel2TrainerHeader5: ; 46044 (11:6044) +RockTunnel2TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5 @@ -68,7 +68,7 @@ RockTunnel2TrainerHeader5: ; 46044 (11:6044) dw RockTunnel2EndBattleText6 ; TextEndBattle dw RockTunnel2EndBattleText6 ; TextEndBattle -RockTunnel2TrainerHeader6: ; 46050 (11:6050) +RockTunnel2TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6 @@ -77,7 +77,7 @@ RockTunnel2TrainerHeader6: ; 46050 (11:6050) dw RockTunnel2EndBattleText7 ; TextEndBattle dw RockTunnel2EndBattleText7 ; TextEndBattle -RockTunnel2TrainerHeader7: ; 4605c (11:605c) +RockTunnel2TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7 @@ -86,7 +86,7 @@ RockTunnel2TrainerHeader7: ; 4605c (11:605c) dw RockTunnel2EndBattleText8 ; TextEndBattle dw RockTunnel2EndBattleText8 ; TextEndBattle -RockTunnel2TrainerHeader8: ; 46068 (11:6068) +RockTunnel2TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1 @@ -97,146 +97,146 @@ RockTunnel2TrainerHeader8: ; 46068 (11:6068) db $ff -RockTunnel2Text1: ; 46075 (11:6075) +RockTunnel2Text1: TX_ASM ld hl, RockTunnel2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text2: ; 4607f (11:607f) +RockTunnel2Text2: TX_ASM ld hl, RockTunnel2TrainerHeader2 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text3: ; 46089 (11:6089) +RockTunnel2Text3: TX_ASM ld hl, RockTunnel2TrainerHeader3 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text4: ; 46093 (11:6093) +RockTunnel2Text4: TX_ASM ld hl, RockTunnel2TrainerHeader4 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text5: ; 4609d (11:609d) +RockTunnel2Text5: TX_ASM ld hl, RockTunnel2TrainerHeader5 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text6: ; 460a7 (11:60a7) +RockTunnel2Text6: TX_ASM ld hl, RockTunnel2TrainerHeader6 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text7: ; 460b1 (11:60b1) +RockTunnel2Text7: TX_ASM ld hl, RockTunnel2TrainerHeader7 call TalkToTrainer jp TextScriptEnd -RockTunnel2Text8: ; 460bb (11:60bb) +RockTunnel2Text8: TX_ASM ld hl, RockTunnel2TrainerHeader8 call TalkToTrainer jp TextScriptEnd -RockTunnel2BattleText2: ; 460c5 (11:60c5) +RockTunnel2BattleText2: TX_FAR _RockTunnel2BattleText2 db "@" -RockTunnel2EndBattleText2: ; 460ca (11:60ca) +RockTunnel2EndBattleText2: TX_FAR _RockTunnel2EndBattleText2 db "@" -RockTunnel2AfterBattleText2: ; 460cf (11:60cf) +RockTunnel2AfterBattleText2: TX_FAR _RockTunnel2AfterBattleText2 db "@" -RockTunnel2BattleText3: ; 460d4 (11:60d4) +RockTunnel2BattleText3: TX_FAR _RockTunnel2BattleText3 db "@" -RockTunnel2EndBattleText3: ; 460d9 (11:60d9) +RockTunnel2EndBattleText3: TX_FAR _RockTunnel2EndBattleText3 db "@" -RockTunnel2AfterBattleText3: ; 460de (11:60de) +RockTunnel2AfterBattleText3: TX_FAR _RockTunnel2AfterBattleText3 db "@" -RockTunnel2BattleText4: ; 460e3 (11:60e3) +RockTunnel2BattleText4: TX_FAR _RockTunnel2BattleText4 db "@" -RockTunnel2EndBattleText4: ; 460e8 (11:60e8) +RockTunnel2EndBattleText4: TX_FAR _RockTunnel2EndBattleText4 db "@" -RockTunnel2AfterBattleText4: ; 460ed (11:60ed) +RockTunnel2AfterBattleText4: TX_FAR _RockTunnel2AfterBattleText4 db "@" -RockTunnel2BattleText5: ; 460f2 (11:60f2) +RockTunnel2BattleText5: TX_FAR _RockTunnel2BattleText5 db "@" -RockTunnel2EndBattleText5: ; 460f7 (11:60f7) +RockTunnel2EndBattleText5: TX_FAR _RockTunnel2EndBattleText5 db "@" -RockTunnel2AfterBattleText5: ; 460fc (11:60fc) +RockTunnel2AfterBattleText5: TX_FAR _RockTunnel2AfterBattleText5 db "@" -RockTunnel2BattleText6: ; 46101 (11:6101) +RockTunnel2BattleText6: TX_FAR _RockTunnel2BattleText6 db "@" -RockTunnel2EndBattleText6: ; 46106 (11:6106) +RockTunnel2EndBattleText6: TX_FAR _RockTunnel2EndBattleText6 db "@" -RockTunnel2AfterBattleText6: ; 4610b (11:610b) +RockTunnel2AfterBattleText6: TX_FAR _RockTunnel2AfterBattleText6 db "@" -RockTunnel2BattleText7: ; 46110 (11:6110) +RockTunnel2BattleText7: TX_FAR _RockTunnel2BattleText7 db "@" -RockTunnel2EndBattleText7: ; 46115 (11:6115) +RockTunnel2EndBattleText7: TX_FAR _RockTunnel2EndBattleText7 db "@" -RockTunnel2AfterBattleText7: ; 4611a (11:611a) +RockTunnel2AfterBattleText7: TX_FAR _RockTunnel2AfterBattleText7 db "@" -RockTunnel2BattleText8: ; 4611f (11:611f) +RockTunnel2BattleText8: TX_FAR _RockTunnel2BattleText8 db "@" -RockTunnel2EndBattleText8: ; 46124 (11:6124) +RockTunnel2EndBattleText8: TX_FAR _RockTunnel2EndBattleText8 db "@" -RockTunnel2AfterBattleText8: ; 46129 (11:6129) +RockTunnel2AfterBattleText8: TX_FAR _RockTunnel2AfterBattleText8 db "@" -RockTunnel2BattleText9: ; 4612e (11:612e) +RockTunnel2BattleText9: TX_FAR _RockTunnel2BattleText9 db "@" -RockTunnel2EndBattleText9: ; 46133 (11:6133) +RockTunnel2EndBattleText9: TX_FAR _RockTunnel2EndBattleText9 db "@" -RockTunnel2AfterBattleText9: ; 46138 (11:6138) +RockTunnel2AfterBattleText9: TX_FAR _RockTunnel2AfterBattleText9 db "@" diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/rocktunnelpokecenter.asm index 3518bd8f..76336e5f 100755 --- a/scripts/rocktunnelpokecenter.asm +++ b/scripts/rocktunnelpokecenter.asm @@ -1,26 +1,26 @@ -RockTunnelPokecenterScript: ; 493ba (12:53ba) +RockTunnelPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -RockTunnelPokecenterTextPointers: ; 493c0 (12:53c0) +RockTunnelPokecenterTextPointers: dw RockTunnelPokecenterText1 dw RockTunnelPokecenterText2 dw RockTunnelPokecenterText3 dw RockTunnelPokecenterText4 dw RockTunnelPokecenterText5 -RockTunnelPokecenterText1: ; 493c8 (12:53c8) +RockTunnelPokecenterText1: TX_POKECENTER_NURSE -RockTunnelPokecenterText2: ; 493c9 (12:53c9) +RockTunnelPokecenterText2: TX_FAR _RockTunnelPokecenterText1 db "@" -RockTunnelPokecenterText3: ; 493ce (12:53ce) +RockTunnelPokecenterText3: TX_FAR _RockTunnelPokecenterText3 db "@" -RockTunnelPokecenterText4: ; 493d3 (12:53d3) +RockTunnelPokecenterText4: TX_CABLE_CLUB_RECEPTIONIST RockTunnelPokecenterText5: diff --git a/scripts/route1.asm b/scripts/route1.asm index 8c7cc0e9..4d046124 100755 --- a/scripts/route1.asm +++ b/scripts/route1.asm @@ -1,23 +1,23 @@ -Route1Script: ; 1caaf (7:4aaf) +Route1Script: call EnableAutoTextBoxDrawing ret -Route1TextPointers: ; 1cab2 (7:4ab2) +Route1TextPointers: dw Route1Text1 dw Route1Text2 dw Route1Text3 -Route1Text1: ; 1cab8 (7:4ab8) +Route1Text1: TX_ASM callba Func_f1ad2 jp TextScriptEnd -Route1Text2: ; 1caf8 (7:4af8) +Route1Text2: TX_ASM callba Func_f1b0f jp TextScriptEnd -Route1Text3: ; 1cafd (7:4afd) +Route1Text3: TX_ASM callba Func_f1b1b jp TextScriptEnd diff --git a/scripts/route10.asm b/scripts/route10.asm index 2d5d2ae4..3337f870 100755 --- a/scripts/route10.asm +++ b/scripts/route10.asm @@ -1,4 +1,4 @@ -Route10Script: ; 59336 (16:5336) +Route10Script: call EnableAutoTextBoxDrawing ld hl, Route10TrainerHeaders ld de, Route10ScriptPointers @@ -7,12 +7,12 @@ Route10Script: ; 59336 (16:5336) ld [W_ROUTE10CURSCRIPT], a ret -Route10ScriptPointers: ; 59349 (16:5349) +Route10ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route10TextPointers: ; 5934f (16:534f) +Route10TextPointers: dw Route10Text1 dw Route10Text2 dw Route10Text3 @@ -24,8 +24,8 @@ Route10TextPointers: ; 5934f (16:534f) dw Route10Text9 dw Route10Text10 -Route10TrainerHeaders: ; 59363 (16:5363) -Route10TrainerHeader0: ; 59363 (16:5363) +Route10TrainerHeaders: +Route10TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_0 @@ -34,7 +34,7 @@ Route10TrainerHeader0: ; 59363 (16:5363) dw Route10EndBattleText1 ; TextEndBattle dw Route10EndBattleText1 ; TextEndBattle -Route10TrainerHeader1: ; 5936f (16:536f) +Route10TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_1 @@ -43,7 +43,7 @@ Route10TrainerHeader1: ; 5936f (16:536f) dw Route10EndBattleText2 ; TextEndBattle dw Route10EndBattleText2 ; TextEndBattle -Route10TrainerHeader2: ; 5937b (16:537b) +Route10TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_2 @@ -52,7 +52,7 @@ Route10TrainerHeader2: ; 5937b (16:537b) dw Route10EndBattleText3 ; TextEndBattle dw Route10EndBattleText3 ; TextEndBattle -Route10TrainerHeader3: ; 59387 (16:5387) +Route10TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_3 @@ -61,7 +61,7 @@ Route10TrainerHeader3: ; 59387 (16:5387) dw Route10EndBattleText4 ; TextEndBattle dw Route10EndBattleText4 ; TextEndBattle -Route10TrainerHeader4: ; 59393 (16:5393) +Route10TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_4 @@ -70,7 +70,7 @@ Route10TrainerHeader4: ; 59393 (16:5393) dw Route10EndBattleText5 ; TextEndBattle dw Route10EndBattleText5 ; TextEndBattle -Route10TrainerHeader5: ; 5939f (16:539f) +Route10TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_5 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_5 @@ -81,119 +81,119 @@ Route10TrainerHeader5: ; 5939f (16:539f) db $ff -Route10Text1: ; 593ac (16:53ac) +Route10Text1: TX_ASM ld hl, Route10TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route10BattleText1: ; 593b6 (16:53b6) +Route10BattleText1: TX_FAR _Route10BattleText1 db "@" -Route10EndBattleText1: ; 593bb (16:53bb) +Route10EndBattleText1: TX_FAR _Route10EndBattleText1 db "@" -Route10AfterBattleText1: ; 593c0 (16:53c0) +Route10AfterBattleText1: TX_FAR _Route10AfterBattleText1 db "@" -Route10Text2: ; 593c5 (16:53c5) +Route10Text2: TX_ASM ld hl, Route10TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route10BattleText2: ; 593cf (16:53cf) +Route10BattleText2: TX_FAR _Route10BattleText2 db "@" -Route10EndBattleText2: ; 593d4 (16:53d4) +Route10EndBattleText2: TX_FAR _Route10EndBattleText2 db "@" -Route10AfterBattleText2: ; 593d9 (16:53d9) +Route10AfterBattleText2: TX_FAR _Route10AfterBattleText2 db "@" -Route10Text3: ; 593de (16:53de) +Route10Text3: TX_ASM ld hl, Route10TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route10BattleText3: ; 593e8 (16:53e8) +Route10BattleText3: TX_FAR _Route10BattleText3 db "@" -Route10EndBattleText3: ; 593ed (16:53ed) +Route10EndBattleText3: TX_FAR _Route10EndBattleText3 db "@" -Route10AfterBattleText3: ; 593f2 (16:53f2) +Route10AfterBattleText3: TX_FAR _Route10AfterBattleText3 db "@" -Route10Text4: ; 593f7 (16:53f7) +Route10Text4: TX_ASM ld hl, Route10TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route10BattleText4: ; 59401 (16:5401) +Route10BattleText4: TX_FAR _Route10BattleText4 db "@" -Route10EndBattleText4: ; 59406 (16:5406) +Route10EndBattleText4: TX_FAR _Route10EndBattleText4 db "@" -Route10AfterBattleText4: ; 5940b (16:540b) +Route10AfterBattleText4: TX_FAR _Route10AfterBattleText4 db "@" -Route10Text5: ; 59410 (16:5410) +Route10Text5: TX_ASM ld hl, Route10TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route10BattleText5: ; 5941a (16:541a) +Route10BattleText5: TX_FAR _Route10BattleText5 db "@" -Route10EndBattleText5: ; 5941f (16:541f) +Route10EndBattleText5: TX_FAR _Route10EndBattleText5 db "@" -Route10AfterBattleText5: ; 59424 (16:5424) +Route10AfterBattleText5: TX_FAR _Route10AfterBattleText5 db "@" -Route10Text6: ; 59429 (16:5429) +Route10Text6: TX_ASM ld hl, Route10TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route10BattleText6: ; 59433 (16:5433) +Route10BattleText6: TX_FAR _Route10BattleText6 db "@" -Route10EndBattleText6: ; 59438 (16:5438) +Route10EndBattleText6: TX_FAR _Route10EndBattleText6 db "@" -Route10AfterBattleText6: ; 5943d (16:543d) +Route10AfterBattleText6: TX_FAR _Route10AfterBattleText6 db "@" -Route10Text9: ; 59442 (16:5442) -Route10Text7: ; 59442 (16:5442) +Route10Text9: +Route10Text7: TX_FAR _Route10Text7 ; _Route10Text9 db "@" -Route10Text10: ; 59447 (16:5447) +Route10Text10: TX_FAR _Route10Text10 db "@" diff --git a/scripts/route11.asm b/scripts/route11.asm index 3a9f1e0d..0c41f113 100755 --- a/scripts/route11.asm +++ b/scripts/route11.asm @@ -1,4 +1,4 @@ -Route11Script: ; 5944c (16:544c) +Route11Script: call EnableAutoTextBoxDrawing ld hl, Route11TrainerHeaders ld de, Route11ScriptPointers @@ -7,12 +7,12 @@ Route11Script: ; 5944c (16:544c) ld [W_ROUTE11CURSCRIPT], a ret -Route11ScriptPointers: ; 5945f (16:545f) +Route11ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route11TextPointers: ; 59465 (16:5465) +Route11TextPointers: dw Route11Text1 dw Route11Text2 dw Route11Text3 @@ -25,8 +25,8 @@ Route11TextPointers: ; 59465 (16:5465) dw Route11Text10 dw Route11Text11 -Route11TrainerHeaders: ; 5947b (16:547b) -Route11TrainerHeader0: ; 5947b (16:547b) +Route11TrainerHeaders: +Route11TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_0 @@ -35,7 +35,7 @@ Route11TrainerHeader0: ; 5947b (16:547b) dw Route11EndBattleText1 ; TextEndBattle dw Route11EndBattleText1 ; TextEndBattle -Route11TrainerHeader1: ; 59487 (16:5487) +Route11TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_1 @@ -44,7 +44,7 @@ Route11TrainerHeader1: ; 59487 (16:5487) dw Route11EndBattleText2 ; TextEndBattle dw Route11EndBattleText2 ; TextEndBattle -Route11TrainerHeader2: ; 59493 (16:5493) +Route11TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_2 @@ -53,7 +53,7 @@ Route11TrainerHeader2: ; 59493 (16:5493) dw Route11EndBattleText3 ; TextEndBattle dw Route11EndBattleText3 ; TextEndBattle -Route11TrainerHeader3: ; 5949f (16:549f) +Route11TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_3 @@ -62,7 +62,7 @@ Route11TrainerHeader3: ; 5949f (16:549f) dw Route11EndBattleText4 ; TextEndBattle dw Route11EndBattleText4 ; TextEndBattle -Route11TrainerHeader4: ; 594ab (16:54ab) +Route11TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_4 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_4 @@ -71,7 +71,7 @@ Route11TrainerHeader4: ; 594ab (16:54ab) dw Route11EndBattleText5 ; TextEndBattle dw Route11EndBattleText5 ; TextEndBattle -Route11TrainerHeader5: ; 594b7 (16:54b7) +Route11TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_5 @@ -80,7 +80,7 @@ Route11TrainerHeader5: ; 594b7 (16:54b7) dw Route11EndBattleText6 ; TextEndBattle dw Route11EndBattleText6 ; TextEndBattle -Route11TrainerHeader6: ; 594c3 (16:54c3) +Route11TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_6 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_6 @@ -89,7 +89,7 @@ Route11TrainerHeader6: ; 594c3 (16:54c3) dw Route11EndBattleText7 ; TextEndBattle dw Route11EndBattleText7 ; TextEndBattle -Route11TrainerHeader7: ; 594cf (16:54cf) +Route11TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_7, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_7, 1 @@ -98,7 +98,7 @@ Route11TrainerHeader7: ; 594cf (16:54cf) dw Route11EndBattleText8 ; TextEndBattle dw Route11EndBattleText8 ; TextEndBattle -Route11TrainerHeader8: ; 594db (16:54db) +Route11TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_8, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_8, 1 @@ -107,7 +107,7 @@ Route11TrainerHeader8: ; 594db (16:54db) dw Route11EndBattleText9 ; TextEndBattle dw Route11EndBattleText9 ; TextEndBattle -Route11TrainerHeader9: ; 594e7 (16:54e7) +Route11TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_9, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_9, 1 @@ -118,186 +118,186 @@ Route11TrainerHeader9: ; 594e7 (16:54e7) db $ff -Route11Text1: ; 594f4 (16:54f4) +Route11Text1: TX_ASM ld hl, Route11TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route11BattleText1: ; 594fe (16:54fe) +Route11BattleText1: TX_FAR _Route11BattleText1 db "@" -Route11EndBattleText1: ; 59503 (16:5503) +Route11EndBattleText1: TX_FAR _Route11EndBattleText1 db "@" -Route11AfterBattleText1: ; 59508 (16:5508) +Route11AfterBattleText1: TX_FAR _Route11AfterBattleText1 db "@" -Route11Text2: ; 5950d (16:550d) +Route11Text2: TX_ASM ld hl, Route11TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route11BattleText2: ; 59517 (16:5517) +Route11BattleText2: TX_FAR _Route11BattleText2 db "@" -Route11EndBattleText2: ; 5951c (16:551c) +Route11EndBattleText2: TX_FAR _Route11EndBattleText2 db "@" -Route11AfterBattleText2: ; 59521 (16:5521) +Route11AfterBattleText2: TX_FAR _Route11AfterBattleText2 db "@" -Route11Text3: ; 59526 (16:5526) +Route11Text3: TX_ASM ld hl, Route11TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route11BattleText3: ; 59530 (16:5530) +Route11BattleText3: TX_FAR _Route11BattleText3 db "@" -Route11EndBattleText3: ; 59535 (16:5535) +Route11EndBattleText3: TX_FAR _Route11EndBattleText3 db "@" -Route11AfterBattleText3: ; 5953a (16:553a) +Route11AfterBattleText3: TX_FAR _Route11AfterBattleText3 db "@" -Route11Text4: ; 5953f (16:553f) +Route11Text4: TX_ASM ld hl, Route11TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route11BattleText4: ; 59549 (16:5549) +Route11BattleText4: TX_FAR _Route11BattleText4 db "@" -Route11EndBattleText4: ; 5954e (16:554e) +Route11EndBattleText4: TX_FAR _Route11EndBattleText4 db "@" -Route11AfterBattleText4: ; 59553 (16:5553) +Route11AfterBattleText4: TX_FAR _Route11AfterBattleText4 db "@" -Route11Text5: ; 59558 (16:5558) +Route11Text5: TX_ASM ld hl, Route11TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route11BattleText5: ; 59562 (16:5562) +Route11BattleText5: TX_FAR _Route11BattleText5 db "@" -Route11EndBattleText5: ; 59567 (16:5567) +Route11EndBattleText5: TX_FAR _Route11EndBattleText5 db "@" -Route11AfterBattleText5: ; 5956c (16:556c) +Route11AfterBattleText5: TX_FAR _Route11AfterBattleText5 db "@" -Route11Text6: ; 59571 (16:5571) +Route11Text6: TX_ASM ld hl, Route11TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route11BattleText6: ; 5957b (16:557b) +Route11BattleText6: TX_FAR _Route11BattleText6 db "@" -Route11EndBattleText6: ; 59580 (16:5580) +Route11EndBattleText6: TX_FAR _Route11EndBattleText6 db "@" -Route11AfterBattleText6: ; 59585 (16:5585) +Route11AfterBattleText6: TX_FAR _Route11AfterBattleText6 db "@" -Route11Text7: ; 5958a (16:558a) +Route11Text7: TX_ASM ld hl, Route11TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route11BattleText7: ; 59594 (16:5594) +Route11BattleText7: TX_FAR _Route11BattleText7 db "@" -Route11EndBattleText7: ; 59599 (16:5599) +Route11EndBattleText7: TX_FAR _Route11EndBattleText7 db "@" -Route11AfterBattleText7: ; 5959e (16:559e) +Route11AfterBattleText7: TX_FAR _Route11AfterBattleText7 db "@" -Route11Text8: ; 595a3 (16:55a3) +Route11Text8: TX_ASM ld hl, Route11TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route11BattleText8: ; 595ad (16:55ad) +Route11BattleText8: TX_FAR _Route11BattleText8 db "@" -Route11EndBattleText8: ; 595b2 (16:55b2) +Route11EndBattleText8: TX_FAR _Route11EndBattleText8 db "@" -Route11AfterBattleText8: ; 595b7 (16:55b7) +Route11AfterBattleText8: TX_FAR _Route11AfterBattleText8 db "@" -Route11Text9: ; 595bc (16:55bc) +Route11Text9: TX_ASM ld hl, Route11TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route11BattleText9: ; 595c6 (16:55c6) +Route11BattleText9: TX_FAR _Route11BattleText9 db "@" -Route11EndBattleText9: ; 595cb (16:55cb) +Route11EndBattleText9: TX_FAR _Route11EndBattleText9 db "@" -Route11AfterBattleText9: ; 595d0 (16:55d0) +Route11AfterBattleText9: TX_FAR _Route11AfterBattleText9 db "@" -Route11Text10: ; 595d5 (16:55d5) +Route11Text10: TX_ASM ld hl, Route11TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route11BattleText10: ; 595df (16:55df) +Route11BattleText10: TX_FAR _Route11BattleText10 db "@" -Route11EndBattleText10: ; 595e4 (16:55e4) +Route11EndBattleText10: TX_FAR _Route11EndBattleText10 db "@" -Route11AfterBattleText10: ; 595e9 (16:55e9) +Route11AfterBattleText10: TX_FAR _Route11AfterBattleText10 db "@" -Route11Text11: ; 595ee (16:55ee) +Route11Text11: TX_FAR _Route11Text11 db "@" diff --git a/scripts/route11gate.asm b/scripts/route11gate.asm index e53fc63a..9ecfe0ca 100755 --- a/scripts/route11gate.asm +++ b/scripts/route11gate.asm @@ -1,9 +1,9 @@ -Route11GateScript: ; 4940c (12:540c) +Route11GateScript: jp EnableAutoTextBoxDrawing -Route11GateTextPointers: ; 4940f (12:540f) +Route11GateTextPointers: dw Route11GateText1 -Route11GateText1: ; 49411 (12:5411) +Route11GateText1: TX_FAR _Route11GateText1 db "@" diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm index 320f8606..300b299a 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/route11gateupstairs.asm @@ -1,21 +1,21 @@ -Route11GateUpstairsScript: ; 49454 (12:5454) +Route11GateUpstairsScript: jp DisableAutoTextBoxDrawing -Route11GateUpstairsTextPointers: ; 49457 (12:5457) +Route11GateUpstairsTextPointers: dw Route11GateUpstairsText1 dw Route11GateUpstairsText2 dw Route11GateUpstairsText3 dw Route11GateUpstairsText4 -Route11GateUpstairsText1: ; 4945f (12:545f) +Route11GateUpstairsText1: TX_ASM ld a, $0 ld [wWhichTrade], a predef DoInGameTradeDialogue -Route11GateUpstairsScriptEnd: ; 49469 (12:5469) +Route11GateUpstairsScriptEnd: jp TextScriptEnd -Route11GateUpstairsText2: ; 4946c (12:546c) +Route11GateUpstairsText2: TX_ASM CheckEvent EVENT_GOT_ITEMFINDER, 1 jr c, .asm_4949b @@ -41,11 +41,11 @@ Route11GateUpstairsText2: ; 4946c (12:546c) .asm_494a1 jr Route11GateUpstairsScriptEnd -Route11GateUpstairsText_494a3: ; 494a3 (12:54a3) +Route11GateUpstairsText_494a3: TX_FAR _Route11GateUpstairsText_494a3 db "@" -Route11GateUpstairsText3: ; 494a8 (12:54a8) +Route11GateUpstairsText3: TX_ASM ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP @@ -66,11 +66,11 @@ BinocularsNoSnorlaxText: TX_FAR _BinocularsNoSnorlaxText db "@" -Route11GateUpstairsText4: ; 494ce (12:54ce) +Route11GateUpstairsText4: TX_ASM ld hl, Route11GateUpstairsText_494d5 jp GateUpstairsScript_PrintIfFacingUp -Route11GateUpstairsText_494d5: ; 494d5 (12:54d5) +Route11GateUpstairsText_494d5: TX_FAR _Route11GateUpstairsText_494d5 db "@" diff --git a/scripts/route12.asm b/scripts/route12.asm index 01a5e93c..5aad5bd0 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -1,4 +1,4 @@ -Route12Script: ; 595f3 (16:55f3) +Route12Script: call EnableAutoTextBoxDrawing ld hl, Route12TrainerHeaders ld de, Route12ScriptPointers @@ -7,20 +7,20 @@ Route12Script: ; 595f3 (16:55f3) ld [W_ROUTE12CURSCRIPT], a ret -Route12Script_59606: ; 59606 (16:5606) +Route12Script_59606: xor a ld [wJoyIgnore], a ld [W_ROUTE12CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -Route12ScriptPointers: ; 59611 (16:5611) +Route12ScriptPointers: dw Route12Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw Route12Script3 -Route12Script0: ; 59619 (16:5619) +Route12Script0: CheckEventHL EVENT_BEAT_ROUTE12_SNORLAX jp nz, CheckFightingMapTrainers CheckEventReuseHL EVENT_FIGHT_ROUTE12_SNORLAX @@ -41,7 +41,7 @@ Route12Script0: ; 59619 (16:5619) ld [W_CURMAPSCRIPT], a ret -Route12Script3: ; 5964c (16:564c) +Route12Script3: ld a, [wIsInBattle] cp $ff jr z, Route12Script_59606 @@ -60,7 +60,7 @@ Route12Script3: ; 5964c (16:564c) ld [W_CURMAPSCRIPT], a ret -Route12TextPointers: ; 59675 (16:5675) +Route12TextPointers: dw Route12Text1 dw Route12Text2 dw Route12Text3 @@ -76,8 +76,8 @@ Route12TextPointers: ; 59675 (16:5675) dw Route12Text13 dw Route12Text14 -Route12TrainerHeaders: ; 59691 (16:5691) -Route12TrainerHeader0: ; 59691 (16:5691) +Route12TrainerHeaders: +Route12TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_0 @@ -86,7 +86,7 @@ Route12TrainerHeader0: ; 59691 (16:5691) dw Route12EndBattleText1 ; TextEndBattle dw Route12EndBattleText1 ; TextEndBattle -Route12TrainerHeader1: ; 5969d (16:569d) +Route12TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_1 @@ -95,7 +95,7 @@ Route12TrainerHeader1: ; 5969d (16:569d) dw Route12EndBattleText2 ; TextEndBattle dw Route12EndBattleText2 ; TextEndBattle -Route12TrainerHeader2: ; 596a9 (16:56a9) +Route12TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_2 @@ -104,7 +104,7 @@ Route12TrainerHeader2: ; 596a9 (16:56a9) dw Route12EndBattleText3 ; TextEndBattle dw Route12EndBattleText3 ; TextEndBattle -Route12TrainerHeader3: ; 596b5 (16:56b5) +Route12TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_3 @@ -113,7 +113,7 @@ Route12TrainerHeader3: ; 596b5 (16:56b5) dw Route12EndBattleText4 ; TextEndBattle dw Route12EndBattleText4 ; TextEndBattle -Route12TrainerHeader4: ; 596c1 (16:56c1) +Route12TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_4 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_4 @@ -122,7 +122,7 @@ Route12TrainerHeader4: ; 596c1 (16:56c1) dw Route12EndBattleText5 ; TextEndBattle dw Route12EndBattleText5 ; TextEndBattle -Route12TrainerHeader5: ; 596cd (16:56cd) +Route12TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_5 @@ -131,7 +131,7 @@ Route12TrainerHeader5: ; 596cd (16:56cd) dw Route12EndBattleText6 ; TextEndBattle dw Route12EndBattleText6 ; TextEndBattle -Route12TrainerHeader6: ; 596d9 (16:56d9) +Route12TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_6, 1 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_12_TRAINER_6, 1 @@ -142,148 +142,148 @@ Route12TrainerHeader6: ; 596d9 (16:56d9) db $ff -Route12Text1: ; 596e6 (16:56e6) +Route12Text1: TX_FAR _Route12Text1 db "@" -Route12Text13: ; 596eb (16:56eb) +Route12Text13: TX_FAR _Route12Text13 db "@" -Route12Text14: ; 596f0 (16:56f0) +Route12Text14: TX_FAR _Route12Text14 db "@" -Route12Text2: ; 596f5 (16:56f5) +Route12Text2: TX_ASM ld hl, Route12TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route12BattleText1: ; 596ff (16:56ff) +Route12BattleText1: TX_FAR _Route12BattleText1 db "@" -Route12EndBattleText1: ; 59704 (16:5704) +Route12EndBattleText1: TX_FAR _Route12EndBattleText1 db "@" -Route12AfterBattleText1: ; 59709 (16:5709) +Route12AfterBattleText1: TX_FAR _Route12AfterBattleText1 db "@" -Route12Text3: ; 5970e (16:570e) +Route12Text3: TX_ASM ld hl, Route12TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route12BattleText2: ; 59718 (16:5718) +Route12BattleText2: TX_FAR _Route12BattleText2 db "@" -Route12EndBattleText2: ; 5971d (16:571d) +Route12EndBattleText2: TX_FAR _Route12EndBattleText2 db "@" -Route12AfterBattleText2: ; 59722 (16:5722) +Route12AfterBattleText2: TX_FAR _Route12AfterBattleText2 db "@" -Route12Text4: ; 59727 (16:5727) +Route12Text4: TX_ASM ld hl, Route12TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route12BattleText3: ; 59731 (16:5731) +Route12BattleText3: TX_FAR _Route12BattleText3 db "@" -Route12EndBattleText3: ; 59736 (16:5736) +Route12EndBattleText3: TX_FAR _Route12EndBattleText3 db "@" -Route12AfterBattleText3: ; 5973b (16:573b) +Route12AfterBattleText3: TX_FAR _Route12AfterBattleText3 db "@" -Route12Text5: ; 59740 (16:5740) +Route12Text5: TX_ASM ld hl, Route12TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route12BattleText4: ; 5974a (16:574a) +Route12BattleText4: TX_FAR _Route12BattleText4 db "@" -Route12EndBattleText4: ; 5974f (16:574f) +Route12EndBattleText4: TX_FAR _Route12EndBattleText4 db "@" -Route12AfterBattleText4: ; 59754 (16:5754) +Route12AfterBattleText4: TX_FAR _Route12AfterBattleText4 db "@" -Route12Text6: ; 59759 (16:5759) +Route12Text6: TX_ASM ld hl, Route12TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route12BattleText5: ; 59763 (16:5763) +Route12BattleText5: TX_FAR _Route12BattleText5 db "@" -Route12EndBattleText5: ; 59768 (16:5768) +Route12EndBattleText5: TX_FAR _Route12EndBattleText5 db "@" -Route12AfterBattleText5: ; 5976d (16:576d) +Route12AfterBattleText5: TX_FAR _Route12AfterBattleText5 db "@" -Route12Text7: ; 59772 (16:5772) +Route12Text7: TX_ASM ld hl, Route12TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route12BattleText6: ; 5977c (16:577c) +Route12BattleText6: TX_FAR _Route12BattleText6 db "@" -Route12EndBattleText6: ; 59781 (16:5781) +Route12EndBattleText6: TX_FAR _Route12EndBattleText6 db "@" -Route12AfterBattleText6: ; 59786 (16:5786) +Route12AfterBattleText6: TX_FAR _Route12AfterBattleText6 db "@" -Route12Text8: ; 5978b (16:578b) +Route12Text8: TX_ASM ld hl, Route12TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route12BattleText7: ; 59795 (16:5795) +Route12BattleText7: TX_FAR _Route12BattleText7 db "@" -Route12EndBattleText7: ; 5979a (16:579a) +Route12EndBattleText7: TX_FAR _Route12EndBattleText7 db "@" -Route12AfterBattleText7: ; 5979f (16:579f) +Route12AfterBattleText7: TX_FAR _Route12AfterBattleText7 db "@" -Route12Text11: ; 597a4 (16:57a4) +Route12Text11: TX_FAR _Route12Text11 db "@" -Route12Text12: ; 597a9 (16:57a9) +Route12Text12: TX_FAR _Route12Text12 db "@" diff --git a/scripts/route12gate.asm b/scripts/route12gate.asm index d8f09c92..8474100d 100755 --- a/scripts/route12gate.asm +++ b/scripts/route12gate.asm @@ -1,9 +1,9 @@ -Route12GateScript: ; 49504 (12:5504) +Route12GateScript: jp EnableAutoTextBoxDrawing -Route12GateTextPointers: ; 49507 (12:5507) +Route12GateTextPointers: dw Route12GateText1 -Route12GateText1: ; 49509 (12:5509) +Route12GateText1: TX_FAR _Route12GateText1 db "@" diff --git a/scripts/route12gateupstairs.asm b/scripts/route12gateupstairs.asm index 12b7b242..bdbbf526 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/route12gateupstairs.asm @@ -1,12 +1,12 @@ -Route12GateUpstairsScript: ; 49560 (12:5560) +Route12GateUpstairsScript: jp DisableAutoTextBoxDrawing -Route12GateUpstairsTextPointers: ; 49563 (12:5563) +Route12GateUpstairsTextPointers: dw Route12GateUpstairsText1 dw Route12GateUpstairsText2 dw Route12GateUpstairsText3 -Route12GateUpstairsText1: ; 49569 (12:5569) +Route12GateUpstairsText1: TX_ASM CheckEvent EVENT_GOT_TM39, 1 jr c, .asm_0ad3c @@ -29,41 +29,41 @@ Route12GateUpstairsText1: ; 49569 (12:5569) .asm_4ba56 jp TextScriptEnd -TM39PreReceiveText: ; 4959c (12:559c) +TM39PreReceiveText: TX_FAR _TM39PreReceiveText db "@" -ReceivedTM39Text: ; 495a1 (12:55a1) +ReceivedTM39Text: TX_FAR _ReceivedTM39Text db $0B, "@" -TM39ExplanationText: ; 495a7 (12:55a7) +TM39ExplanationText: TX_FAR _TM39ExplanationText db "@" -TM39NoRoomText: ; 495ac (12:55ac) +TM39NoRoomText: TX_FAR _TM39NoRoomText db "@" -Route12GateUpstairsText2: ; 495b1 (12:55b1) +Route12GateUpstairsText2: TX_ASM ld hl, Route12GateUpstairsText_495b8 jp GateUpstairsScript_PrintIfFacingUp -Route12GateUpstairsText_495b8: ; 495b8 (12:55b8) +Route12GateUpstairsText_495b8: TX_FAR _Route12GateUpstairsText_495b8 db "@" -Route12GateUpstairsText3: ; 495bd (12:55bd) +Route12GateUpstairsText3: TX_ASM ld hl, Route12GateUpstairsText_495c4 jp GateUpstairsScript_PrintIfFacingUp -Route12GateUpstairsText_495c4: ; 495c4 (12:55c4) +Route12GateUpstairsText_495c4: TX_FAR _Route12GateUpstairsText_495c4 db "@" -GateUpstairsScript_PrintIfFacingUp: ; 495c9 (12:55c9) +GateUpstairsScript_PrintIfFacingUp: ld a, [wPlayerFacingDirection] cp SPRITE_FACING_UP jr z, .up diff --git a/scripts/route12house.asm b/scripts/route12house.asm index bb065f1c..7ee86731 100755 --- a/scripts/route12house.asm +++ b/scripts/route12house.asm @@ -1,10 +1,10 @@ -Route12HouseScript: ; 5647f (15:647f) +Route12HouseScript: jp EnableAutoTextBoxDrawing -Route12HouseTextPointers: ; 56482 (15:6482) +Route12HouseTextPointers: dw Route12HouseText1 -Route12HouseText1: ; 56484 (15:6484) +Route12HouseText1: TX_ASM ld a, [wd728] bit 5, a @@ -34,24 +34,24 @@ Route12HouseText1: ; 56484 (15:6484) call PrintText jp TextScriptEnd -Route12HouseText_564c0: ; 564c0 (15:64c0) +Route12HouseText_564c0: TX_FAR _Route12HouseText_564c0 db "@" -Route12HouseText_564c5: ; 564c5 (15:64c5) +Route12HouseText_564c5: TX_FAR _Route12HouseText_564c5 db $0B TX_FAR _Route12HouseText_564ca db "@" -Route12HouseText_564cf: ; 564cf (15:64cf) +Route12HouseText_564cf: TX_FAR _Route12HouseText_564cf db "@" -Route12HouseText_564d4: ; 564d4 (15:64d4) +Route12HouseText_564d4: TX_FAR _Route12HouseText_564d4 db "@" -Route12HouseText_564d9: ; 564d9 (15:64d9) +Route12HouseText_564d9: TX_FAR _Route12HouseText_564d9 db "@" diff --git a/scripts/route13.asm b/scripts/route13.asm index ab061071..9c6cff5e 100755 --- a/scripts/route13.asm +++ b/scripts/route13.asm @@ -1,4 +1,4 @@ -Route13Script: ; 5581e (15:581e) +Route13Script: call EnableAutoTextBoxDrawing ld hl, Route13TrainerHeaders ld de, Route13ScriptPointers @@ -7,12 +7,12 @@ Route13Script: ; 5581e (15:581e) ld [W_ROUTE13CURSCRIPT], a ret -Route13ScriptPointers: ; 55831 (15:5831) +Route13ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route13TextPointers: ; 55837 (15:5837) +Route13TextPointers: dw Route13Text1 dw Route13Text2 dw Route13Text3 @@ -27,8 +27,8 @@ Route13TextPointers: ; 55837 (15:5837) dw Route13Text12 dw Route13Text13 -Route13TrainerHeaders: ; 55851 (15:5851) -Route13TrainerHeader0: ; 55851 (15:5851) +Route13TrainerHeaders: +Route13TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_0 @@ -37,7 +37,7 @@ Route13TrainerHeader0: ; 55851 (15:5851) dw Route13EndBattleText2 ; TextEndBattle dw Route13EndBattleText2 ; TextEndBattle -Route13TrainerHeader2: ; 5585d (15:585d) +Route13TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2 @@ -46,7 +46,7 @@ Route13TrainerHeader2: ; 5585d (15:585d) dw Route13EndBattleText3 ; TextEndBattle dw Route13EndBattleText3 ; TextEndBattle -Route13TrainerHeader3: ; 55869 (15:5869) +Route13TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3 @@ -55,7 +55,7 @@ Route13TrainerHeader3: ; 55869 (15:5869) dw Route13EndBattleText4 ; TextEndBattle dw Route13EndBattleText4 ; TextEndBattle -Route13TrainerHeader4: ; 55875 (15:5875) +Route13TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4 @@ -64,7 +64,7 @@ Route13TrainerHeader4: ; 55875 (15:5875) dw Route13EndBattleText5 ; TextEndBattle dw Route13EndBattleText5 ; TextEndBattle -Route13TrainerHeader5: ; 55881 (15:5881) +Route13TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5 @@ -73,7 +73,7 @@ Route13TrainerHeader5: ; 55881 (15:5881) dw Route13EndBattleText6 ; TextEndBattle dw Route13EndBattleText6 ; TextEndBattle -Route13TrainerHeader6: ; 5588d (15:588d) +Route13TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6 @@ -82,7 +82,7 @@ Route13TrainerHeader6: ; 5588d (15:588d) dw Route13EndBattleText7 ; TextEndBattle dw Route13EndBattleText7 ; TextEndBattle -Route13TrainerHeader7: ; 55899 (15:5899) +Route13TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7 @@ -91,7 +91,7 @@ Route13TrainerHeader7: ; 55899 (15:5899) dw Route13EndBattleText8 ; TextEndBattle dw Route13EndBattleText8 ; TextEndBattle -Route13TrainerHeader8: ; 558a5 (15:58a5) +Route13TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1 @@ -100,7 +100,7 @@ Route13TrainerHeader8: ; 558a5 (15:58a5) dw Route13EndBattleText9 ; TextEndBattle dw Route13EndBattleText9 ; TextEndBattle -Route13TrainerHeader9: ; 558b1 (15:58b1) +Route13TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1 @@ -109,7 +109,7 @@ Route13TrainerHeader9: ; 558b1 (15:58b1) dw Route13EndBattleText10 ; TextEndBattle dw Route13EndBattleText10 ; TextEndBattle -Route13TrainerHeader10: ; 558bd (15:58bd) +Route13TrainerHeader10: dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_10, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_10, 1 @@ -120,194 +120,194 @@ Route13TrainerHeader10: ; 558bd (15:58bd) db $ff -Route13Text1: ; 558ca (15:58ca) +Route13Text1: TX_ASM ld hl, Route13TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route13BattleText2: ; 558d4 (15:58d4) +Route13BattleText2: TX_FAR _Route13BattleText2 db "@" -Route13EndBattleText2: ; 558d9 (15:58d9) +Route13EndBattleText2: TX_FAR _Route13EndBattleText2 db "@" -Route13AfterBattleText2: ; 558de (15:58de) +Route13AfterBattleText2: TX_FAR _Route13AfterBattleText2 db "@" -Route13Text2: ; 558e3 (15:58e3) +Route13Text2: TX_ASM ld hl, Route13TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route13BattleText3: ; 558ed (15:58ed) +Route13BattleText3: TX_FAR _Route13BattleText3 db "@" -Route13EndBattleText3: ; 558f2 (15:58f2) +Route13EndBattleText3: TX_FAR _Route13EndBattleText3 db "@" -Route13AfterBattleText3: ; 558f7 (15:58f7) +Route13AfterBattleText3: TX_FAR _Route13AfterBattleText3 db "@" -Route13Text3: ; 558fc (15:58fc) +Route13Text3: TX_ASM ld hl, Route13TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route13BattleText4: ; 55906 (15:5906) +Route13BattleText4: TX_FAR _Route13BattleText4 db "@" -Route13EndBattleText4: ; 5590b (15:590b) +Route13EndBattleText4: TX_FAR _Route13EndBattleText4 db "@" -Route13AfterBattleText4: ; 55910 (15:5910) +Route13AfterBattleText4: TX_FAR _Route13AfterBattleText4 db "@" -Route13Text4: ; 55915 (15:5915) +Route13Text4: TX_ASM ld hl, Route13TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route13BattleText5: ; 5591f (15:591f) +Route13BattleText5: TX_FAR _Route13BattleText5 db "@" -Route13EndBattleText5: ; 55924 (15:5924) +Route13EndBattleText5: TX_FAR _Route13EndBattleText5 db "@" -Route13AfterBattleText5: ; 55929 (15:5929) +Route13AfterBattleText5: TX_FAR _Route13AfterBattleText5 db "@" -Route13Text5: ; 5592e (15:592e) +Route13Text5: TX_ASM ld hl, Route13TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route13BattleText6: ; 55938 (15:5938) +Route13BattleText6: TX_FAR _Route13BattleText6 db "@" -Route13EndBattleText6: ; 5593d (15:593d) +Route13EndBattleText6: TX_FAR _Route13EndBattleText6 db "@" -Route13AfterBattleText6: ; 55942 (15:5942) +Route13AfterBattleText6: TX_FAR _Route13AfterBattleText6 db "@" -Route13Text6: ; 55947 (15:5947) +Route13Text6: TX_ASM ld hl, Route13TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route13BattleText7: ; 55951 (15:5951) +Route13BattleText7: TX_FAR _Route13BattleText7 db "@" -Route13EndBattleText7: ; 55956 (15:5956) +Route13EndBattleText7: TX_FAR _Route13EndBattleText7 db "@" -Route13AfterBattleText7: ; 5595b (15:595b) +Route13AfterBattleText7: TX_FAR _Route13AfterBattleText7 db "@" -Route13Text7: ; 55960 (15:5960) +Route13Text7: TX_ASM ld hl, Route13TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route13BattleText8: ; 5596a (15:596a) +Route13BattleText8: TX_FAR _Route13BattleText8 db "@" -Route13EndBattleText8: ; 5596f (15:596f) +Route13EndBattleText8: TX_FAR _Route13EndBattleText8 db "@" -Route13AfterBattleText8: ; 55974 (15:5974) +Route13AfterBattleText8: TX_FAR _Route13AfterBattleText8 db "@" -Route13Text8: ; 55979 (15:5979) +Route13Text8: TX_ASM ld hl, Route13TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route13BattleText9: ; 55983 (15:5983) +Route13BattleText9: TX_FAR _Route13BattleText9 db "@" -Route13EndBattleText9: ; 55988 (15:5988) +Route13EndBattleText9: TX_FAR _Route13EndBattleText9 db "@" -Route13AfterBattleText9: ; 5598d (15:598d) +Route13AfterBattleText9: TX_FAR _Route13AfterBattleText9 db "@" -Route13Text9: ; 55992 (15:5992) +Route13Text9: TX_ASM ld hl, Route13TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route13BattleText10: ; 5599c (15:599c) +Route13BattleText10: TX_FAR _Route13BattleText10 db "@" -Route13EndBattleText10: ; 559a1 (15:59a1) +Route13EndBattleText10: TX_FAR _Route13EndBattleText10 db "@" -Route13AfterBattleText10: ; 559a6 (15:59a6) +Route13AfterBattleText10: TX_FAR _Route13AfterBattleText10 db "@" -Route13Text10: ; 559ab (15:59ab) +Route13Text10: TX_ASM ld hl, Route13TrainerHeader10 call TalkToTrainer jp TextScriptEnd -Route13BattleText11: ; 559b5 (15:59b5) +Route13BattleText11: TX_FAR _Route13BattleText11 db "@" -Route13EndBattleText11: ; 559ba (15:59ba) +Route13EndBattleText11: TX_FAR _Route13EndBattleText11 db "@" -Route13AfterBattleText11: ; 559bf (15:59bf) +Route13AfterBattleText11: TX_FAR _Route13AfterBattleText11 db "@" -Route13Text11: ; 559c4 (15:59c4) +Route13Text11: TX_FAR _Route13Text11 db "@" -Route13Text12: ; 559c9 (15:59c9) +Route13Text12: TX_FAR _Route13Text12 db "@" -Route13Text13: ; 559ce (15:59ce) +Route13Text13: TX_FAR _Route13Text13 db "@" diff --git a/scripts/route14.asm b/scripts/route14.asm index d65e257f..e4e82e2b 100755 --- a/scripts/route14.asm +++ b/scripts/route14.asm @@ -1,4 +1,4 @@ -Route14Script: ; 559d3 (15:59d3) +Route14Script: call EnableAutoTextBoxDrawing ld hl, Route14TrainerHeaders ld de, Route14ScriptPointers @@ -7,12 +7,12 @@ Route14Script: ; 559d3 (15:59d3) ld [W_ROUTE14CURSCRIPT], a ret -Route14ScriptPointers: ; 559e6 (15:59e6) +Route14ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route14TextPointers: ; 559ec (15:59ec) +Route14TextPointers: dw Route14Text1 dw Route14Text2 dw Route14Text3 @@ -25,8 +25,8 @@ Route14TextPointers: ; 559ec (15:59ec) dw Route14Text10 dw Route14Text11 -Route14TrainerHeaders: ; 55a02 (15:5a02) -Route14TrainerHeader0: ; 55a02 (15:5a02) +Route14TrainerHeaders: +Route14TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_0 @@ -35,7 +35,7 @@ Route14TrainerHeader0: ; 55a02 (15:5a02) dw Route14EndBattleText1 ; TextEndBattle dw Route14EndBattleText1 ; TextEndBattle -Route14TrainerHeader1: ; 55a0e (15:5a0e) +Route14TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_1 @@ -44,7 +44,7 @@ Route14TrainerHeader1: ; 55a0e (15:5a0e) dw Route14EndBattleText2 ; TextEndBattle dw Route14EndBattleText2 ; TextEndBattle -Route14TrainerHeader2: ; 55a1a (15:5a1a) +Route14TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_2 @@ -53,7 +53,7 @@ Route14TrainerHeader2: ; 55a1a (15:5a1a) dw Route14EndBattleText3 ; TextEndBattle dw Route14EndBattleText3 ; TextEndBattle -Route14TrainerHeader3: ; 55a26 (15:5a26) +Route14TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_3 @@ -62,7 +62,7 @@ Route14TrainerHeader3: ; 55a26 (15:5a26) dw Route14EndBattleText4 ; TextEndBattle dw Route14EndBattleText4 ; TextEndBattle -Route14TrainerHeader4: ; 55a32 (15:5a32) +Route14TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_4 @@ -71,7 +71,7 @@ Route14TrainerHeader4: ; 55a32 (15:5a32) dw Route14EndBattleText5 ; TextEndBattle dw Route14EndBattleText5 ; TextEndBattle -Route14TrainerHeader5: ; 55a3e (15:5a3e) +Route14TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_5 @@ -80,7 +80,7 @@ Route14TrainerHeader5: ; 55a3e (15:5a3e) dw Route14EndBattleText6 ; TextEndBattle dw Route14EndBattleText6 ; TextEndBattle -Route14TrainerHeader6: ; 55a4a (15:5a4a) +Route14TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_6 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_6 @@ -89,7 +89,7 @@ Route14TrainerHeader6: ; 55a4a (15:5a4a) dw Route14EndBattleText7 ; TextEndBattle dw Route14EndBattleText7 ; TextEndBattle -Route14TrainerHeader7: ; 55a56 (15:5a56) +Route14TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_7, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_7, 1 @@ -98,7 +98,7 @@ Route14TrainerHeader7: ; 55a56 (15:5a56) dw Route14EndBattleText8 ; TextEndBattle dw Route14EndBattleText8 ; TextEndBattle -Route14TrainerHeader8: ; 55a62 (15:5a62) +Route14TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_8, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_8, 1 @@ -107,7 +107,7 @@ Route14TrainerHeader8: ; 55a62 (15:5a62) dw Route14EndBattleText9 ; TextEndBattle dw Route14EndBattleText9 ; TextEndBattle -Route14TrainerHeader9: ; 55a6e (15:5a6e) +Route14TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_9, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_14_TRAINER_9, 1 @@ -118,186 +118,186 @@ Route14TrainerHeader9: ; 55a6e (15:5a6e) db $ff -Route14Text1: ; 55a7b (15:5a7b) +Route14Text1: TX_ASM ld hl, Route14TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route14BattleText1: ; 55a85 (15:5a85) +Route14BattleText1: TX_FAR _Route14BattleText1 db "@" -Route14EndBattleText1: ; 55a8a (15:5a8a) +Route14EndBattleText1: TX_FAR _Route14EndBattleText1 db "@" -Route14AfterBattleText1: ; 55a8f (15:5a8f) +Route14AfterBattleText1: TX_FAR _Route14AfterBattleText1 db "@" -Route14Text2: ; 55a94 (15:5a94) +Route14Text2: TX_ASM ld hl, Route14TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route14BattleText2: ; 55a9e (15:5a9e) +Route14BattleText2: TX_FAR _Route14BattleText2 db "@" -Route14EndBattleText2: ; 55aa3 (15:5aa3) +Route14EndBattleText2: TX_FAR _Route14EndBattleText2 db "@" -Route14AfterBattleText2: ; 55aa8 (15:5aa8) +Route14AfterBattleText2: TX_FAR _Route14AfterBattleText2 db "@" -Route14Text3: ; 55aad (15:5aad) +Route14Text3: TX_ASM ld hl, Route14TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route14BattleText3: ; 55ab7 (15:5ab7) +Route14BattleText3: TX_FAR _Route14BattleText3 db "@" -Route14EndBattleText3: ; 55abc (15:5abc) +Route14EndBattleText3: TX_FAR _Route14EndBattleText3 db "@" -Route14AfterBattleText3: ; 55ac1 (15:5ac1) +Route14AfterBattleText3: TX_FAR _Route14AfterBattleText3 db "@" -Route14Text4: ; 55ac6 (15:5ac6) +Route14Text4: TX_ASM ld hl, Route14TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route14BattleText4: ; 55ad0 (15:5ad0) +Route14BattleText4: TX_FAR _Route14BattleText4 db "@" -Route14EndBattleText4: ; 55ad5 (15:5ad5) +Route14EndBattleText4: TX_FAR _Route14EndBattleText4 db "@" -Route14AfterBattleText4: ; 55ada (15:5ada) +Route14AfterBattleText4: TX_FAR _Route14AfterBattleText4 db "@" -Route14Text5: ; 55adf (15:5adf) +Route14Text5: TX_ASM ld hl, Route14TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route14BattleText5: ; 55ae9 (15:5ae9) +Route14BattleText5: TX_FAR _Route14BattleText5 db "@" -Route14EndBattleText5: ; 55aee (15:5aee) +Route14EndBattleText5: TX_FAR _Route14EndBattleText5 db "@" -Route14AfterBattleText5: ; 55af3 (15:5af3) +Route14AfterBattleText5: TX_FAR _Route14AfterBattleText5 db "@" -Route14Text6: ; 55af8 (15:5af8) +Route14Text6: TX_ASM ld hl, Route14TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route14BattleText6: ; 55b02 (15:5b02) +Route14BattleText6: TX_FAR _Route14BattleText6 db "@" -Route14EndBattleText6: ; 55b07 (15:5b07) +Route14EndBattleText6: TX_FAR _Route14EndBattleText6 db "@" -Route14AfterBattleText6: ; 55b0c (15:5b0c) +Route14AfterBattleText6: TX_FAR _Route14AfterBattleText6 db "@" -Route14Text7: ; 55b11 (15:5b11) +Route14Text7: TX_ASM ld hl, Route14TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route14BattleText7: ; 55b1b (15:5b1b) +Route14BattleText7: TX_FAR _Route14BattleText7 db "@" -Route14EndBattleText7: ; 55b20 (15:5b20) +Route14EndBattleText7: TX_FAR _Route14EndBattleText7 db "@" -Route14AfterBattleText7: ; 55b25 (15:5b25) +Route14AfterBattleText7: TX_FAR _Route14AfterBattleText7 db "@" -Route14Text8: ; 55b2a (15:5b2a) +Route14Text8: TX_ASM ld hl, Route14TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route14BattleText8: ; 55b34 (15:5b34) +Route14BattleText8: TX_FAR _Route14BattleText8 db "@" -Route14EndBattleText8: ; 55b39 (15:5b39) +Route14EndBattleText8: TX_FAR _Route14EndBattleText8 db "@" -Route14AfterBattleText8: ; 55b3e (15:5b3e) +Route14AfterBattleText8: TX_FAR _Route14AfterBattleText8 db "@" -Route14Text9: ; 55b43 (15:5b43) +Route14Text9: TX_ASM ld hl, Route14TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route14BattleText9: ; 55b4d (15:5b4d) +Route14BattleText9: TX_FAR _Route14BattleText9 db "@" -Route14EndBattleText9: ; 55b52 (15:5b52) +Route14EndBattleText9: TX_FAR _Route14EndBattleText9 db "@" -Route14AfterBattleText9: ; 55b57 (15:5b57) +Route14AfterBattleText9: TX_FAR _Route14AfterBattleText9 db "@" -Route14Text10: ; 55b5c (15:5b5c) +Route14Text10: TX_ASM ld hl, Route14TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route14BattleText10: ; 55b66 (15:5b66) +Route14BattleText10: TX_FAR _Route14BattleText10 db "@" -Route14EndBattleText10: ; 55b6b (15:5b6b) +Route14EndBattleText10: TX_FAR _Route14EndBattleText10 db "@" -Route14AfterBattleText10: ; 55b70 (15:5b70) +Route14AfterBattleText10: TX_FAR _Route14AfterBattleText10 db "@" -Route14Text11: ; 55b75 (15:5b75) +Route14Text11: TX_FAR _Route14Text11 db "@" diff --git a/scripts/route15.asm b/scripts/route15.asm index 023f859c..eb2e67d9 100755 --- a/scripts/route15.asm +++ b/scripts/route15.asm @@ -1,4 +1,4 @@ -Route15Script: ; 597ae (16:57ae) +Route15Script: call EnableAutoTextBoxDrawing ld hl, Route15TrainerHeaders ld de, Route15ScriptPointers @@ -7,12 +7,12 @@ Route15Script: ; 597ae (16:57ae) ld [W_ROUTE15CURSCRIPT], a ret -Route15ScriptPointers: ; 597c1 (16:57c1) +Route15ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route15TextPointers: ; 597c7 (16:57c7) +Route15TextPointers: dw Route15Text1 dw Route15Text2 dw Route15Text3 @@ -26,8 +26,8 @@ Route15TextPointers: ; 597c7 (16:57c7) dw PickUpItemText dw Route15Text12 -Route15TrainerHeaders: ; 597df (16:57df) -Route15TrainerHeader0: ; 597df (16:57df) +Route15TrainerHeaders: +Route15TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_0 @@ -36,7 +36,7 @@ Route15TrainerHeader0: ; 597df (16:57df) dw Route15EndBattleText1 ; TextEndBattle dw Route15EndBattleText1 ; TextEndBattle -Route15TrainerHeader1: ; 597eb (16:57eb) +Route15TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_1 @@ -45,7 +45,7 @@ Route15TrainerHeader1: ; 597eb (16:57eb) dw Route15EndBattleText2 ; TextEndBattle dw Route15EndBattleText2 ; TextEndBattle -Route15TrainerHeader2: ; 597f7 (16:57f7) +Route15TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_2 @@ -54,7 +54,7 @@ Route15TrainerHeader2: ; 597f7 (16:57f7) dw Route15EndBattleText3 ; TextEndBattle dw Route15EndBattleText3 ; TextEndBattle -Route15TrainerHeader3: ; 59803 (16:5803) +Route15TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_3 @@ -63,7 +63,7 @@ Route15TrainerHeader3: ; 59803 (16:5803) dw Route15EndBattleText4 ; TextEndBattle dw Route15EndBattleText4 ; TextEndBattle -Route15TrainerHeader4: ; 5980f (16:580f) +Route15TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_4 @@ -72,7 +72,7 @@ Route15TrainerHeader4: ; 5980f (16:580f) dw Route15EndBattleText5 ; TextEndBattle dw Route15EndBattleText5 ; TextEndBattle -Route15TrainerHeader5: ; 5981b (16:581b) +Route15TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_5 @@ -81,7 +81,7 @@ Route15TrainerHeader5: ; 5981b (16:581b) dw Route15EndBattleText6 ; TextEndBattle dw Route15EndBattleText6 ; TextEndBattle -Route15TrainerHeader6: ; 59827 (16:5827) +Route15TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_6 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_6 @@ -90,7 +90,7 @@ Route15TrainerHeader6: ; 59827 (16:5827) dw Route15EndBattleText7 ; TextEndBattle dw Route15EndBattleText7 ; TextEndBattle -Route15TrainerHeader7: ; 59833 (16:5833) +Route15TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_7, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_7, 1 @@ -99,7 +99,7 @@ Route15TrainerHeader7: ; 59833 (16:5833) dw Route15EndBattleText8 ; TextEndBattle dw Route15EndBattleText8 ; TextEndBattle -Route15TrainerHeader8: ; 5983f (16:583f) +Route15TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_8, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_8, 1 @@ -108,7 +108,7 @@ Route15TrainerHeader8: ; 5983f (16:583f) dw Route15EndBattleText9 ; TextEndBattle dw Route15EndBattleText9 ; TextEndBattle -Route15TrainerHeader9: ; 5984b (16:584b) +Route15TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_9, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_9, 1 @@ -119,178 +119,178 @@ Route15TrainerHeader9: ; 5984b (16:584b) db $ff -Route15Text1: ; 59858 (16:5858) +Route15Text1: TX_ASM ld hl, Route15TrainerHeader0 jr Route15TalkToTrainer -Route15Text2: ; 5985e (16:585e) +Route15Text2: TX_ASM ld hl, Route15TrainerHeader1 jr Route15TalkToTrainer -Route15Text3: ; 59864 (16:5864) +Route15Text3: TX_ASM ld hl, Route15TrainerHeader2 jr Route15TalkToTrainer -Route15Text4: ; 5986a (16:586a) +Route15Text4: TX_ASM ld hl, Route15TrainerHeader3 jr Route15TalkToTrainer -Route15Text5: ; 59870 (16:5870) +Route15Text5: TX_ASM ld hl, Route15TrainerHeader4 jr Route15TalkToTrainer -Route15Text6: ; 59876 (16:5876) +Route15Text6: TX_ASM ld hl, Route15TrainerHeader5 jr Route15TalkToTrainer -Route15Text7: ; 5987c (16:587c) +Route15Text7: TX_ASM ld hl, Route15TrainerHeader6 jr Route15TalkToTrainer -Route15Text8: ; 59882 (16:5882) +Route15Text8: TX_ASM ld hl, Route15TrainerHeader7 jr Route15TalkToTrainer -Route15Text9: ; 59888 (16:5888) +Route15Text9: TX_ASM ld hl, Route15TrainerHeader8 jr Route15TalkToTrainer -Route15Text10: ; 5988e (16:588e) +Route15Text10: TX_ASM ld hl, Route15TrainerHeader9 -Route15TalkToTrainer: ; 59892 (16:5892) +Route15TalkToTrainer: call TalkToTrainer jp TextScriptEnd -Route15BattleText1: ; 59898 (16:5898) +Route15BattleText1: TX_FAR _Route15BattleText1 db "@" -Route15EndBattleText1: ; 5989d (16:589d) +Route15EndBattleText1: TX_FAR _Route15EndBattleText1 db "@" -Route15AfterBattleText1: ; 598a2 (16:58a2) +Route15AfterBattleText1: TX_FAR _Route15AfterBattleText1 db "@" -Route15BattleText2: ; 598a7 (16:58a7) +Route15BattleText2: TX_FAR _Route15BattleText2 db "@" -Route15EndBattleText2: ; 598ac (16:58ac) +Route15EndBattleText2: TX_FAR _Route15EndBattleText2 db "@" -Route15AfterBattleText2: ; 598b1 (16:58b1) +Route15AfterBattleText2: TX_FAR _Route15AfterBattleText2 db "@" -Route15BattleText3: ; 598b6 (16:58b6) +Route15BattleText3: TX_FAR _Route15BattleText3 db "@" -Route15EndBattleText3: ; 598bb (16:58bb) +Route15EndBattleText3: TX_FAR _Route15EndBattleText3 db "@" -Route15AfterBattleText3: ; 598c0 (16:58c0) +Route15AfterBattleText3: TX_FAR _Route15AfterBattleText3 db "@" -Route15BattleText4: ; 598c5 (16:58c5) +Route15BattleText4: TX_FAR _Route15BattleText4 db "@" -Route15EndBattleText4: ; 598ca (16:58ca) +Route15EndBattleText4: TX_FAR _Route15EndBattleText4 db "@" -Route15AfterBattleText4: ; 598cf (16:58cf) +Route15AfterBattleText4: TX_FAR _Route15AfterBattleText4 db "@" -Route15BattleText5: ; 598d4 (16:58d4) +Route15BattleText5: TX_FAR _Route15BattleText5 db "@" -Route15EndBattleText5: ; 598d9 (16:58d9) +Route15EndBattleText5: TX_FAR _Route15EndBattleText5 db "@" -Route15AfterBattleText5: ; 598de (16:58de) +Route15AfterBattleText5: TX_FAR _Route15AfterBattleText5 db "@" -Route15BattleText6: ; 598e3 (16:58e3) +Route15BattleText6: TX_FAR _Route15BattleText6 db "@" -Route15EndBattleText6: ; 598e8 (16:58e8) +Route15EndBattleText6: TX_FAR _Route15EndBattleText6 db "@" -Route15AfterBattleText6: ; 598ed (16:58ed) +Route15AfterBattleText6: TX_FAR _Route15AfterBattleText6 db "@" -Route15BattleText7: ; 598f2 (16:58f2) +Route15BattleText7: TX_FAR _Route15BattleText7 db "@" -Route15EndBattleText7: ; 598f7 (16:58f7) +Route15EndBattleText7: TX_FAR _Route15EndBattleText7 db "@" -Route15AfterBattleText7: ; 598fc (16:58fc) +Route15AfterBattleText7: TX_FAR _Route15AfterBattleText7 db "@" -Route15BattleText8: ; 59901 (16:5901) +Route15BattleText8: TX_FAR _Route15BattleText8 db "@" -Route15EndBattleText8: ; 59906 (16:5906) +Route15EndBattleText8: TX_FAR _Route15EndBattleText8 db "@" -Route15AfterBattleText8: ; 5990b (16:590b) +Route15AfterBattleText8: TX_FAR _Route15AfterBattleText8 db "@" -Route15BattleText9: ; 59910 (16:5910) +Route15BattleText9: TX_FAR _Route15BattleText9 db "@" -Route15EndBattleText9: ; 59915 (16:5915) +Route15EndBattleText9: TX_FAR _Route15EndBattleText9 db "@" -Route15AfterBattleText9: ; 5991a (16:591a) +Route15AfterBattleText9: TX_FAR _Route15AfterBattleText9 db "@" -Route15BattleText10: ; 5991f (16:591f) +Route15BattleText10: TX_FAR _Route15BattleText10 db "@" -Route15EndBattleText10: ; 59924 (16:5924) +Route15EndBattleText10: TX_FAR _Route15EndBattleText10 db "@" -Route15AfterBattleText10: ; 59929 (16:5929) +Route15AfterBattleText10: TX_FAR _Route15AfterBattleText10 db "@" -Route15Text12: ; 5992e (16:592e) +Route15Text12: TX_FAR _Route15Text12 db "@" diff --git a/scripts/route15gate.asm b/scripts/route15gate.asm index 76e9aadf..40db02dd 100755 --- a/scripts/route15gate.asm +++ b/scripts/route15gate.asm @@ -1,9 +1,9 @@ -Route15GateScript: ; 49602 (12:5602) +Route15GateScript: jp EnableAutoTextBoxDrawing -Route15GateTextPointers: ; 49605 (12:5605) +Route15GateTextPointers: dw Route15GateText1 -Route15GateText1: ; 49607 (12:5607) +Route15GateText1: TX_FAR _Route15GateText1 db "@" diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index 14e3bc5d..c7f6a2ad 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -1,11 +1,11 @@ -Route15GateUpstairsScript: ; 4964a (12:564a) +Route15GateUpstairsScript: jp DisableAutoTextBoxDrawing -Route15GateUpstairsTextPointers: ; 4964d (12:564d) +Route15GateUpstairsTextPointers: dw Route15GateUpstairsText1 dw Route15GateUpstairsText2 -Route15GateUpstairsText1: ; 49651 (12:5651) +Route15GateUpstairsText1: TX_ASM CheckEvent EVENT_GOT_EXP_ALL jr nz, .asm_49683 @@ -30,15 +30,15 @@ Route15GateUpstairsText1: ; 49651 (12:5651) .asm_49689 jp TextScriptEnd -Route15GateUpstairsText_4968c: ; 4968c (12:568c) +Route15GateUpstairsText_4968c: TX_FAR _Route15GateUpstairsText_4968c db "@" -Route15GateUpstairsText2: ; 49691 (12:5691) +Route15GateUpstairsText2: TX_ASM ld hl, Route15GateUpstairsText_49698 jp GateUpstairsScript_PrintIfFacingUp -Route15GateUpstairsText_49698: ; 49698 (12:5698) +Route15GateUpstairsText_49698: TX_FAR _Route15GateUpstairsText_49698 db "@" diff --git a/scripts/route16.asm b/scripts/route16.asm index 760beb01..e2777f0a 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -1,4 +1,4 @@ -Route16Script: ; 59933 (16:5933) +Route16Script: call EnableAutoTextBoxDrawing ld hl, Route16TrainerHeaders ld de, Route16ScriptPointers @@ -7,20 +7,20 @@ Route16Script: ; 59933 (16:5933) ld [W_ROUTE16CURSCRIPT], a ret -Route16Script_59946: ; 59946 (16:5946) +Route16Script_59946: xor a ld [wJoyIgnore], a ld [W_ROUTE16CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -Route16ScriptPointers: ; 59951 (16:5951) +Route16ScriptPointers: dw Route16Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw Route16Script3 -Route16Script0: ; 59959 (16:5959) +Route16Script0: CheckEventHL EVENT_BEAT_ROUTE16_SNORLAX jp nz, CheckFightingMapTrainers CheckEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX @@ -42,7 +42,7 @@ Route16Script0: ; 59959 (16:5959) ld [W_CURMAPSCRIPT], a ret -Route16Script3: ; 5998f (16:598f) +Route16Script3: ld a, [wIsInBattle] cp $ff jp z, Route16Script_59946 @@ -61,7 +61,7 @@ Route16Script3: ; 5998f (16:598f) ld [W_CURMAPSCRIPT], a ret -Route16TextPointers: ; 599b9 (16:59b9) +Route16TextPointers: dw Route16Text1 dw Route16Text2 dw Route16Text3 @@ -74,8 +74,8 @@ Route16TextPointers: ; 599b9 (16:59b9) dw Route16Text10 dw Route16Text11 -Route16TrainerHeaders: ; 599cf (16:59cf) -Route16TrainerHeader0: ; 599cf (16:59cf) +Route16TrainerHeaders: +Route16TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_0 @@ -84,7 +84,7 @@ Route16TrainerHeader0: ; 599cf (16:59cf) dw Route16EndBattleText1 ; TextEndBattle dw Route16EndBattleText1 ; TextEndBattle -Route16TrainerHeader1: ; 599db (16:59db) +Route16TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_1 @@ -93,7 +93,7 @@ Route16TrainerHeader1: ; 599db (16:59db) dw Route16EndBattleText2 ; TextEndBattle dw Route16EndBattleText2 ; TextEndBattle -Route16TrainerHeader2: ; 599e7 (16:59e7) +Route16TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_2 @@ -102,7 +102,7 @@ Route16TrainerHeader2: ; 599e7 (16:59e7) dw Route16EndBattleText3 ; TextEndBattle dw Route16EndBattleText3 ; TextEndBattle -Route16TrainerHeader3: ; 599f3 (16:59f3) +Route16TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_3 @@ -111,7 +111,7 @@ Route16TrainerHeader3: ; 599f3 (16:59f3) dw Route16EndBattleText4 ; TextEndBattle dw Route16EndBattleText4 ; TextEndBattle -Route16TrainerHeader4: ; 599ff (16:59ff) +Route16TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_4 @@ -120,7 +120,7 @@ Route16TrainerHeader4: ; 599ff (16:59ff) dw Route16EndBattleText5 ; TextEndBattle dw Route16EndBattleText5 ; TextEndBattle -Route16TrainerHeader5: ; 59a0b (16:5a0b) +Route16TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_16_TRAINER_5 @@ -131,130 +131,130 @@ Route16TrainerHeader5: ; 59a0b (16:5a0b) db $ff -Route16Text1: ; 59a18 (16:5a18) +Route16Text1: TX_ASM ld hl, Route16TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route16BattleText1: ; 59a22 (16:5a22) +Route16BattleText1: TX_FAR _Route16BattleText1 db "@" -Route16EndBattleText1: ; 59a27 (16:5a27) +Route16EndBattleText1: TX_FAR _Route16EndBattleText1 db "@" -Route16AfterBattleText1: ; 59a2c (16:5a2c) +Route16AfterBattleText1: TX_FAR _Route16AfterBattleText1 db "@" -Route16Text2: ; 59a31 (16:5a31) +Route16Text2: TX_ASM ld hl, Route16TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route16BattleText2: ; 59a3b (16:5a3b) +Route16BattleText2: TX_FAR _Route16BattleText2 db "@" -Route16EndBattleText2: ; 59a40 (16:5a40) +Route16EndBattleText2: TX_FAR _Route16EndBattleText2 db "@" -Route16AfterBattleText2: ; 59a45 (16:5a45) +Route16AfterBattleText2: TX_FAR _Route16AfterBattleText2 db "@" -Route16Text3: ; 59a4a (16:5a4a) +Route16Text3: TX_ASM ld hl, Route16TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route16BattleText3: ; 59a54 (16:5a54) +Route16BattleText3: TX_FAR _Route16BattleText3 db "@" -Route16EndBattleText3: ; 59a59 (16:5a59) +Route16EndBattleText3: TX_FAR _Route16EndBattleText3 db "@" -Route16AfterBattleText3: ; 59a5e (16:5a5e) +Route16AfterBattleText3: TX_FAR _Route16AfterBattleText3 db "@" -Route16Text4: ; 59a63 (16:5a63) +Route16Text4: TX_ASM ld hl, Route16TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route16BattleText4: ; 59a6d (16:5a6d) +Route16BattleText4: TX_FAR _Route16BattleText4 db "@" -Route16EndBattleText4: ; 59a72 (16:5a72) +Route16EndBattleText4: TX_FAR _Route16EndBattleText4 db "@" -Route16AfterBattleText4: ; 59a77 (16:5a77) +Route16AfterBattleText4: TX_FAR _Route16AfterBattleText4 db "@" -Route16Text5: ; 59a7c (16:5a7c) +Route16Text5: TX_ASM ld hl, Route16TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route16BattleText5: ; 59a86 (16:5a86) +Route16BattleText5: TX_FAR _Route16BattleText5 db "@" -Route16EndBattleText5: ; 59a8b (16:5a8b) +Route16EndBattleText5: TX_FAR _Route16EndBattleText5 db "@" -Route16AfterBattleText5: ; 59a90 (16:5a90) +Route16AfterBattleText5: TX_FAR _Route16AfterBattleText5 db "@" -Route16Text6: ; 59a95 (16:5a95) +Route16Text6: TX_ASM ld hl, Route16TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route16BattleText6: ; 59a9f (16:5a9f) +Route16BattleText6: TX_FAR _Route16BattleText6 db "@" -Route16EndBattleText6: ; 59aa4 (16:5aa4) +Route16EndBattleText6: TX_FAR _Route16EndBattleText6 db "@" -Route16AfterBattleText6: ; 59aa9 (16:5aa9) +Route16AfterBattleText6: TX_FAR _Route16AfterBattleText6 db "@" -Route16Text7: ; 59aae (16:5aae) +Route16Text7: TX_FAR _Route16Text7 db "@" -Route16Text10: ; 59ab3 (16:5ab3) +Route16Text10: TX_FAR _Route16Text10 db "@" -Route16Text11: ; 59ab8 (16:5ab8) +Route16Text11: TX_FAR _Route16Text11 db "@" -Route16Text8: ; 59abd (16:5abd) +Route16Text8: TX_FAR _Route16Text8 db "@" -Route16Text9: ; 59ac2 (16:5ac2) +Route16Text9: TX_FAR _Route16Text9 db "@" diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index 197b12b2..5af4e0b2 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -1,4 +1,4 @@ -Route16GateScript: ; 496be (12:56be) +Route16GateScript: ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing @@ -6,13 +6,13 @@ Route16GateScript: ; 496be (12:56be) ld hl, Route16GateScriptPointers jp JumpTable -Route16GateScriptPointers: ; 496cf (12:56cf) +Route16GateScriptPointers: dw Route16GateScript0 dw Route16GateScript1 dw Route16GateScript2 dw Route16GateScript3 -Route16GateScript0: ; 496d7 (12:56d7) +Route16GateScript0: call Route16GateScript_49755 ret nz ld hl, CoordsData_49714 @@ -43,21 +43,21 @@ Route16GateScript0: ; 496d7 (12:56d7) ld [W_ROUTE16GATECURSCRIPT], a ret -CoordsData_49714: ; 49714 (12:5714) +CoordsData_49714: db $07,$04 db $08,$04 db $09,$04 db $0A,$04 db $FF -Route16GateScript1: ; 4971d (12:571d) +Route16GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz ld a, $f0 ld [wJoyIgnore], a -Route16GateScript2: ; 49727 (12:5727) +Route16GateScript2: ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -70,7 +70,7 @@ Route16GateScript2: ; 49727 (12:5727) ld [W_ROUTE16GATECURSCRIPT], a ret -Route16GateScript3: ; 49741 (12:5741) +Route16GateScript3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -82,16 +82,16 @@ Route16GateScript3: ; 49741 (12:5741) ld [W_ROUTE16GATECURSCRIPT], a ret -Route16GateScript_49755: ; 49755 (12:5755) +Route16GateScript_49755: ld b, BICYCLE jp IsItemInBag -Route16GateTextPointers: ; 4975a (12:575a) +Route16GateTextPointers: dw Route16GateText1 dw Route16GateText2 dw Route16GateText3 -Route16GateText1: ; 49760 (12:5760) +Route16GateText1: TX_ASM call Route16GateScript_49755 jr z, .asm_0bdf3 @@ -104,18 +104,18 @@ Route16GateText1: ; 49760 (12:5760) .asm_56c9d jp TextScriptEnd -Route16GateText_49777: ; 49777 (12:5777) +Route16GateText_49777: TX_FAR _Route16GateText_49777 db "@" -Route16GateText_4977c: ; 4977c (12:577c) +Route16GateText_4977c: TX_FAR _Route16GateText_4977c db "@" -Route16GateText3: ; 49781 (12:5781) +Route16GateText3: TX_FAR _Route16GateText_49781 db "@" -Route16GateText2: ; 49786 (12:5786) +Route16GateText2: TX_FAR _Route16GateText2 db "@" diff --git a/scripts/route16gateupstairs.asm b/scripts/route16gateupstairs.asm index 64b43e10..664976a2 100755 --- a/scripts/route16gateupstairs.asm +++ b/scripts/route16gateupstairs.asm @@ -1,46 +1,46 @@ -Route16GateUpstairsScript: ; 4980b (12:580b) +Route16GateUpstairsScript: jp DisableAutoTextBoxDrawing -Route16GateUpstairsTextPointers: ; 4980e (12:580e) +Route16GateUpstairsTextPointers: dw Route16GateUpstairsText1 dw Route16GateUpstairsText2 dw Route16GateUpstairsText3 dw Route16GateUpstairsText4 -Route16GateUpstairsText1: ; 49816 (12:5816) +Route16GateUpstairsText1: TX_ASM ld hl, Route16GateUpstairsText_49820 call PrintText jp TextScriptEnd -Route16GateUpstairsText_49820: ; 49820 (12:5820) +Route16GateUpstairsText_49820: TX_FAR _Route16GateUpstairsText_49820 db "@" -Route16GateUpstairsText2: ; 49825 (12:5825) +Route16GateUpstairsText2: TX_ASM ld hl, Route16GateUpstairsText_4982f call PrintText jp TextScriptEnd -Route16GateUpstairsText_4982f: ; 4982f (12:582f) +Route16GateUpstairsText_4982f: TX_FAR _Route16GateUpstairsText_4982f db "@" -Route16GateUpstairsText3: ; 49834 (12:5834) +Route16GateUpstairsText3: TX_ASM ld hl, Route16GateUpstairsText_4983b jp GateUpstairsScript_PrintIfFacingUp -Route16GateUpstairsText_4983b: ; 4983b (12:583b) +Route16GateUpstairsText_4983b: TX_FAR _Route16GateUpstairsText_4983b db "@" -Route16GateUpstairsText4: ; 49840 (12:5840) +Route16GateUpstairsText4: TX_ASM ld hl, Route16GateUpstairsText_49847 jp GateUpstairsScript_PrintIfFacingUp -Route16GateUpstairsText_49847: ; 49847 (12:5847) +Route16GateUpstairsText_49847: TX_FAR _Route16GateUpstairsText_49847 db "@" diff --git a/scripts/route16house.asm b/scripts/route16house.asm index ee23fd89..d8c9d5ed 100755 --- a/scripts/route16house.asm +++ b/scripts/route16house.asm @@ -1,11 +1,11 @@ -Route16HouseScript: ; 1e5f8 (7:65f8) +Route16HouseScript: jp EnableAutoTextBoxDrawing -Route16HouseTextPointers: ; 1e5fb (7:65fb) +Route16HouseTextPointers: dw Route16HouseText1 dw Route16HouseText2 -Route16HouseText1: ; 1e5ff (7:65ff) +Route16HouseText1: TX_ASM CheckEvent EVENT_GOT_HM02 ld hl, HM02ExplanationText @@ -24,23 +24,23 @@ Route16HouseText1: ; 1e5ff (7:65ff) call PrintText jp TextScriptEnd -Route16HouseText3: ; 1e62b (7:662b) +Route16HouseText3: TX_FAR _Route16HouseText3 db "@" -ReceivedHM02Text: ; 1e630 (7:6630) +ReceivedHM02Text: TX_FAR _ReceivedHM02Text db $11, "@" -HM02ExplanationText: ; 1e636 (7:6636) +HM02ExplanationText: TX_FAR _HM02ExplanationText db "@" -HM02NoRoomText: ; 1e63b (7:663b) +HM02NoRoomText: TX_FAR _HM02NoRoomText db "@" -Route16HouseText2: ; 1e640 (7:6640) +Route16HouseText2: TX_ASM ld hl, Route16HouseText_1e652 call PrintText @@ -49,6 +49,6 @@ Route16HouseText2: ; 1e640 (7:6640) call WaitForSoundToFinish jp TextScriptEnd -Route16HouseText_1e652: ; 1e652 (7:6652) +Route16HouseText_1e652: TX_FAR _Route16HouseText_1e652 db "@" diff --git a/scripts/route17.asm b/scripts/route17.asm index 28c43627..edb8be9f 100755 --- a/scripts/route17.asm +++ b/scripts/route17.asm @@ -1,4 +1,4 @@ -Route17Script: ; 55b7a (15:5b7a) +Route17Script: call EnableAutoTextBoxDrawing ld hl, Route17TrainerHeaders ld de, Route17ScriptPointers @@ -7,12 +7,12 @@ Route17Script: ; 55b7a (15:5b7a) ld [W_ROUTE17CURSCRIPT], a ret -Route17ScriptPointers: ; 55b8d (15:5b8d) +Route17ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route17TextPointers: ; 55b93 (15:5b93) +Route17TextPointers: dw Route17Text1 dw Route17Text2 dw Route17Text3 @@ -30,8 +30,8 @@ Route17TextPointers: ; 55b93 (15:5b93) dw Route17Text15 dw Route17Text16 -Route17TrainerHeaders: ; 55bb3 (15:5bb3) -Route17TrainerHeader0: ; 55bb3 (15:5bb3) +Route17TrainerHeaders: +Route17TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_0 @@ -40,7 +40,7 @@ Route17TrainerHeader0: ; 55bb3 (15:5bb3) dw Route17EndBattleText1 ; TextEndBattle dw Route17EndBattleText1 ; TextEndBattle -Route17TrainerHeader1: ; 55bbf (15:5bbf) +Route17TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_1 @@ -49,7 +49,7 @@ Route17TrainerHeader1: ; 55bbf (15:5bbf) dw Route17EndBattleText2 ; TextEndBattle dw Route17EndBattleText2 ; TextEndBattle -Route17TrainerHeader2: ; 55bcb (15:5bcb) +Route17TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_2 @@ -58,7 +58,7 @@ Route17TrainerHeader2: ; 55bcb (15:5bcb) dw Route17EndBattleText3 ; TextEndBattle dw Route17EndBattleText3 ; TextEndBattle -Route17TrainerHeader3: ; 55bd7 (15:5bd7) +Route17TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_3 @@ -67,7 +67,7 @@ Route17TrainerHeader3: ; 55bd7 (15:5bd7) dw Route17EndBattleText4 ; TextEndBattle dw Route17EndBattleText4 ; TextEndBattle -Route17TrainerHeader4: ; 55be3 (15:5be3) +Route17TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_4 @@ -76,7 +76,7 @@ Route17TrainerHeader4: ; 55be3 (15:5be3) dw Route17EndBattleText5 ; TextEndBattle dw Route17EndBattleText5 ; TextEndBattle -Route17TrainerHeader5: ; 55bef (15:5bef) +Route17TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_5 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_5 @@ -85,7 +85,7 @@ Route17TrainerHeader5: ; 55bef (15:5bef) dw Route17EndBattleText6 ; TextEndBattle dw Route17EndBattleText6 ; TextEndBattle -Route17TrainerHeader6: ; 55bfb (15:5bfb) +Route17TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_6 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_6 @@ -94,7 +94,7 @@ Route17TrainerHeader6: ; 55bfb (15:5bfb) dw Route17EndBattleText7 ; TextEndBattle dw Route17EndBattleText7 ; TextEndBattle -Route17TrainerHeader7: ; 55c07 (15:5c07) +Route17TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_7, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_7, 1 @@ -103,7 +103,7 @@ Route17TrainerHeader7: ; 55c07 (15:5c07) dw Route17EndBattleText8 ; TextEndBattle dw Route17EndBattleText8 ; TextEndBattle -Route17TrainerHeader8: ; 55c13 (15:5c13) +Route17TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_8, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_8, 1 @@ -112,7 +112,7 @@ Route17TrainerHeader8: ; 55c13 (15:5c13) dw Route17EndBattleText9 ; TextEndBattle dw Route17EndBattleText9 ; TextEndBattle -Route17TrainerHeader9: ; 55c1f (15:5c1f) +Route17TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_9, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_9, 1 @@ -123,206 +123,206 @@ Route17TrainerHeader9: ; 55c1f (15:5c1f) db $ff -Route17Text1: ; 55c2c (15:5c2c) +Route17Text1: TX_ASM ld hl, Route17TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route17BattleText1: ; 55c36 (15:5c36) +Route17BattleText1: TX_FAR _Route17BattleText1 db "@" -Route17EndBattleText1: ; 55c3b (15:5c3b) +Route17EndBattleText1: TX_FAR _Route17EndBattleText1 db "@" -Route17AfterBattleText1: ; 55c40 (15:5c40) +Route17AfterBattleText1: TX_FAR _Route17AfterBattleText1 db "@" -Route17Text2: ; 55c45 (15:5c45) +Route17Text2: TX_ASM ld hl, Route17TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route17BattleText2: ; 55c4f (15:5c4f) +Route17BattleText2: TX_FAR _Route17BattleText2 db "@" -Route17EndBattleText2: ; 55c54 (15:5c54) +Route17EndBattleText2: TX_FAR _Route17EndBattleText2 db "@" -Route17AfterBattleText2: ; 55c59 (15:5c59) +Route17AfterBattleText2: TX_FAR _Route17AfterBattleText2 db "@" -Route17Text3: ; 55c5e (15:5c5e) +Route17Text3: TX_ASM ld hl, Route17TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route17BattleText3: ; 55c68 (15:5c68) +Route17BattleText3: TX_FAR _Route17BattleText3 db "@" -Route17EndBattleText3: ; 55c6d (15:5c6d) +Route17EndBattleText3: TX_FAR _Route17EndBattleText3 db "@" -Route17AfterBattleText3: ; 55c72 (15:5c72) +Route17AfterBattleText3: TX_FAR _Route17AfterBattleText3 db "@" -Route17Text4: ; 55c77 (15:5c77) +Route17Text4: TX_ASM ld hl, Route17TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route17BattleText4: ; 55c81 (15:5c81) +Route17BattleText4: TX_FAR _Route17BattleText4 db "@" -Route17EndBattleText4: ; 55c86 (15:5c86) +Route17EndBattleText4: TX_FAR _Route17EndBattleText4 db "@" -Route17AfterBattleText4: ; 55c8b (15:5c8b) +Route17AfterBattleText4: TX_FAR _Route17AfterBattleText4 db "@" -Route17Text5: ; 55c90 (15:5c90) +Route17Text5: TX_ASM ld hl, Route17TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route17BattleText5: ; 55c9a (15:5c9a) +Route17BattleText5: TX_FAR _Route17BattleText5 db "@" -Route17EndBattleText5: ; 55c9f (15:5c9f) +Route17EndBattleText5: TX_FAR _Route17EndBattleText5 db "@" -Route17AfterBattleText5: ; 55ca4 (15:5ca4) +Route17AfterBattleText5: TX_FAR _Route17AfterBattleText5 db "@" -Route17Text6: ; 55ca9 (15:5ca9) +Route17Text6: TX_ASM ld hl, Route17TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route17BattleText6: ; 55cb3 (15:5cb3) +Route17BattleText6: TX_FAR _Route17BattleText6 db "@" -Route17EndBattleText6: ; 55cb8 (15:5cb8) +Route17EndBattleText6: TX_FAR _Route17EndBattleText6 db "@" -Route17AfterBattleText6: ; 55cbd (15:5cbd) +Route17AfterBattleText6: TX_FAR _Route17AfterBattleText6 db "@" -Route17Text7: ; 55cc2 (15:5cc2) +Route17Text7: TX_ASM ld hl, Route17TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route17BattleText7: ; 55ccc (15:5ccc) +Route17BattleText7: TX_FAR _Route17BattleText7 db "@" -Route17EndBattleText7: ; 55cd1 (15:5cd1) +Route17EndBattleText7: TX_FAR _Route17EndBattleText7 db "@" -Route17AfterBattleText7: ; 55cd6 (15:5cd6) +Route17AfterBattleText7: TX_FAR _Route17AfterBattleText7 db "@" -Route17Text8: ; 55cdb (15:5cdb) +Route17Text8: TX_ASM ld hl, Route17TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route17BattleText8: ; 55ce5 (15:5ce5) +Route17BattleText8: TX_FAR _Route17BattleText8 db "@" -Route17EndBattleText8: ; 55cea (15:5cea) +Route17EndBattleText8: TX_FAR _Route17EndBattleText8 db "@" -Route17AfterBattleText8: ; 55cef (15:5cef) +Route17AfterBattleText8: TX_FAR _Route17AfterBattleText8 db "@" -Route17Text9: ; 55cf4 (15:5cf4) +Route17Text9: TX_ASM ld hl, Route17TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route17BattleText9: ; 55cfe (15:5cfe) +Route17BattleText9: TX_FAR _Route17BattleText9 db "@" -Route17EndBattleText9: ; 55d03 (15:5d03) +Route17EndBattleText9: TX_FAR _Route17EndBattleText9 db "@" -Route17AfterBattleText9: ; 55d08 (15:5d08) +Route17AfterBattleText9: TX_FAR _Route17AfterBattleText9 db "@" -Route17Text10: ; 55d0d (15:5d0d) +Route17Text10: TX_ASM ld hl, Route17TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route17BattleText10: ; 55d17 (15:5d17) +Route17BattleText10: TX_FAR _Route17BattleText10 db "@" -Route17EndBattleText10: ; 55d1c (15:5d1c) +Route17EndBattleText10: TX_FAR _Route17EndBattleText10 db "@" -Route17AfterBattleText10: ; 55d21 (15:5d21) +Route17AfterBattleText10: TX_FAR _Route17AfterBattleText10 db "@" -Route17Text11: ; 55d26 (15:5d26) +Route17Text11: TX_FAR _Route17Text11 db "@" -Route17Text12: ; 55d2b (15:5d2b) +Route17Text12: TX_FAR _Route17Text12 db "@" -Route17Text13: ; 55d30 (15:5d30) +Route17Text13: TX_FAR _Route17Text13 db "@" -Route17Text14: ; 55d35 (15:5d35) +Route17Text14: TX_FAR _Route17Text14 db "@" -Route17Text15: ; 55d3a (15:5d3a) +Route17Text15: TX_FAR _Route17Text15 db "@" -Route17Text16: ; 55d3f (15:5d3f) +Route17Text16: TX_FAR _Route17Text16 db "@" diff --git a/scripts/route18.asm b/scripts/route18.asm index 9544b1ec..af2698be 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -1,4 +1,4 @@ -Route18Script: ; 59ac7 (16:5ac7) +Route18Script: call EnableAutoTextBoxDrawing ld hl, Route18TrainerHeaders ld de, Route18ScriptPointers @@ -7,20 +7,20 @@ Route18Script: ; 59ac7 (16:5ac7) ld [W_ROUTE18CURSCRIPT], a ret -Route18ScriptPointers: ; 59ada (16:5ada) +Route18ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route18TextPointers: ; 59ae0 (16:5ae0) +Route18TextPointers: dw Route18Text1 dw Route18Text2 dw Route18Text3 dw Route18Text4 dw Route18Text5 -Route18TrainerHeaders: ; 59aea (16:5aea) -Route18TrainerHeader0: ; 59aea (16:5aea) +Route18TrainerHeaders: +Route18TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_0 @@ -29,7 +29,7 @@ Route18TrainerHeader0: ; 59aea (16:5aea) dw Route18EndBattleText1 ; TextEndBattle dw Route18EndBattleText1 ; TextEndBattle -Route18TrainerHeader1: ; 59af6 (16:5af6) +Route18TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_1 @@ -38,7 +38,7 @@ Route18TrainerHeader1: ; 59af6 (16:5af6) dw Route18EndBattleText2 ; TextEndBattle dw Route18EndBattleText2 ; TextEndBattle -Route18TrainerHeader2: ; 59b02 (16:5b02) +Route18TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_2 @@ -49,65 +49,65 @@ Route18TrainerHeader2: ; 59b02 (16:5b02) db $ff -Route18Text1: ; 59b0f (16:5b0f) +Route18Text1: TX_ASM ld hl, Route18TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route18BattleText1: ; 59b19 (16:5b19) +Route18BattleText1: TX_FAR _Route18BattleText1 db "@" -Route18EndBattleText1: ; 59b1e (16:5b1e) +Route18EndBattleText1: TX_FAR _Route18EndBattleText1 db "@" -Route18AfterBattleText1: ; 59b23 (16:5b23) +Route18AfterBattleText1: TX_FAR _Route18AfterBattleText1 db "@" -Route18Text2: ; 59b28 (16:5b28) +Route18Text2: TX_ASM ld hl, Route18TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route18BattleText2: ; 59b32 (16:5b32) +Route18BattleText2: TX_FAR _Route18BattleText2 db "@" -Route18EndBattleText2: ; 59b37 (16:5b37) +Route18EndBattleText2: TX_FAR _Route18EndBattleText2 db "@" -Route18AfterBattleText2: ; 59b3c (16:5b3c) +Route18AfterBattleText2: TX_FAR _Route18AfterBattleText2 db "@" -Route18Text3: ; 59b41 (16:5b41) +Route18Text3: TX_ASM ld hl, Route18TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route18BattleText3: ; 59b4b (16:5b4b) +Route18BattleText3: TX_FAR _Route18BattleText3 db "@" -Route18EndBattleText3: ; 59b50 (16:5b50) +Route18EndBattleText3: TX_FAR _Route18EndBattleText3 db "@" -Route18AfterBattleText3: ; 59b55 (16:5b55) +Route18AfterBattleText3: TX_FAR _Route18AfterBattleText3 db "@" -Route18Text4: ; 59b5a (16:5b5a) +Route18Text4: TX_FAR _Route18Text4 db "@" -Route18Text5: ; 59b5f (16:5b5f) +Route18Text5: TX_FAR _Route18Text5 db "@" ; 59b64 diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index 33f67e97..a58805bb 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -1,4 +1,4 @@ -Route18GateScript: ; 49876 (12:5876) +Route18GateScript: ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing @@ -6,13 +6,13 @@ Route18GateScript: ; 49876 (12:5876) ld hl, Route18GateScriptPointers jp JumpTable -Route18GateScriptPointers: ; 49887 (12:5887) +Route18GateScriptPointers: dw Route18GateScript0 dw Route18GateScript1 dw Route18GateScript2 dw Route18GateScript3 -Route18GateScript0: ; 4988f (12:588f) +Route18GateScript0: call Route16GateScript_49755 ret nz ld hl, CoordsData_498cc @@ -43,21 +43,21 @@ Route18GateScript0: ; 4988f (12:588f) ld [W_ROUTE18GATECURSCRIPT], a ret -CoordsData_498cc: ; 498cc (12:58cc) +CoordsData_498cc: db $03,$04 db $04,$04 db $05,$04 db $06,$04 db $FF -Route18GateScript1: ; 498d5 (12:58d5) +Route18GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz ld a, $f0 ld [wJoyIgnore], a -Route18GateScript2: ; 498df (12:58df) +Route18GateScript2: ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -70,7 +70,7 @@ Route18GateScript2: ; 498df (12:58df) ld [W_ROUTE18GATECURSCRIPT], a ret -Route18GateScript3: ; 498f9 (12:58f9) +Route18GateScript3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -82,11 +82,11 @@ Route18GateScript3: ; 498f9 (12:58f9) ld [W_ROUTE18GATECURSCRIPT], a ret -Route18GateTextPointers: ; 4990d (12:590d) +Route18GateTextPointers: dw Route18GateText1 dw Route18GateText2 -Route18GateText1: ; 49911 (12:5911) +Route18GateText1: TX_ASM call Route16GateScript_49755 jr z, .asm_3c84d @@ -99,14 +99,14 @@ Route18GateText1: ; 49911 (12:5911) .asm_a8410 jp TextScriptEnd -Route18GateText_49928: ; 49928 (12:5928) +Route18GateText_49928: TX_FAR _Route18GateText_49928 db "@" -Route18GateText_4992d: ; 4992d (12:592d) +Route18GateText_4992d: TX_FAR _Route18GateText_4992d db "@" -Route18GateText2: ; 49932 (12:5932) +Route18GateText2: TX_FAR _Route18GateText_49932 db "@" diff --git a/scripts/route18gateupstairs.asm b/scripts/route18gateupstairs.asm index 4e1014e0..3d623142 100755 --- a/scripts/route18gateupstairs.asm +++ b/scripts/route18gateupstairs.asm @@ -1,32 +1,32 @@ -Route18GateUpstairsScript: ; 49975 (12:5975) +Route18GateUpstairsScript: jp DisableAutoTextBoxDrawing -Route18GateUpstairsTextPointers: ; 49978 (12:5978) +Route18GateUpstairsTextPointers: dw Route18GateUpstairsText1 dw Route18GateUpstairsText2 dw Route18GateUpstairsText3 -Route18GateUpstairsText1: ; 4997e (12:597e) +Route18GateUpstairsText1: TX_ASM ld a, $5 ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd -Route18GateUpstairsText2: ; 4998c (12:598c) +Route18GateUpstairsText2: TX_ASM ld hl, Route18GateUpstairsText_49993 jp GateUpstairsScript_PrintIfFacingUp -Route18GateUpstairsText_49993: ; 49993 (12:5993) +Route18GateUpstairsText_49993: TX_FAR _Route18GateUpstairsText_49993 db "@" -Route18GateUpstairsText3: ; 49998 (12:5998) +Route18GateUpstairsText3: TX_ASM ld hl, Route18GateUpstairsText_4999f jp GateUpstairsScript_PrintIfFacingUp -Route18GateUpstairsText_4999f: ; 4999f (12:599f) +Route18GateUpstairsText_4999f: TX_FAR _Route18GateUpstairsText_4999f db "@" diff --git a/scripts/route19.asm b/scripts/route19.asm index 9ed6080b..d3f56977 100755 --- a/scripts/route19.asm +++ b/scripts/route19.asm @@ -1,4 +1,4 @@ -Route19Script: ; 55d44 (15:5d44) +Route19Script: call EnableAutoTextBoxDrawing ld hl, Route19TrainerHeaders ld de, Route19ScriptPointers @@ -7,12 +7,12 @@ Route19Script: ; 55d44 (15:5d44) ld [W_ROUTE19CURSCRIPT], a ret -Route19ScriptPointers: ; 55d57 (15:5d57) +Route19ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route19TextPointers: ; 55d5d (15:5d5d) +Route19TextPointers: dw Route19Text1 dw Route19Text2 dw Route19Text3 @@ -25,8 +25,8 @@ Route19TextPointers: ; 55d5d (15:5d5d) dw Route19Text10 dw Route19Text11 -Route19TrainerHeaders: ; 55d73 (15:5d73) -Route19TrainerHeader0: ; 55d73 (15:5d73) +Route19TrainerHeaders: +Route19TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_0 @@ -35,7 +35,7 @@ Route19TrainerHeader0: ; 55d73 (15:5d73) dw Route19EndBattleText1 ; TextEndBattle dw Route19EndBattleText1 ; TextEndBattle -Route19TrainerHeader1: ; 55d7f (15:5d7f) +Route19TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_1 @@ -44,7 +44,7 @@ Route19TrainerHeader1: ; 55d7f (15:5d7f) dw Route19EndBattleText2 ; TextEndBattle dw Route19EndBattleText2 ; TextEndBattle -Route19TrainerHeader2: ; 55d8b (15:5d8b) +Route19TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_2 @@ -53,7 +53,7 @@ Route19TrainerHeader2: ; 55d8b (15:5d8b) dw Route19EndBattleText3 ; TextEndBattle dw Route19EndBattleText3 ; TextEndBattle -Route19TrainerHeader3: ; 55d97 (15:5d97) +Route19TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_3 @@ -62,7 +62,7 @@ Route19TrainerHeader3: ; 55d97 (15:5d97) dw Route19EndBattleText4 ; TextEndBattle dw Route19EndBattleText4 ; TextEndBattle -Route19TrainerHeader4: ; 55da3 (15:5da3) +Route19TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_4 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_4 @@ -71,7 +71,7 @@ Route19TrainerHeader4: ; 55da3 (15:5da3) dw Route19EndBattleText5 ; TextEndBattle dw Route19EndBattleText5 ; TextEndBattle -Route19TrainerHeader5: ; 55daf (15:5daf) +Route19TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_5 @@ -80,7 +80,7 @@ Route19TrainerHeader5: ; 55daf (15:5daf) dw Route19EndBattleText6 ; TextEndBattle dw Route19EndBattleText6 ; TextEndBattle -Route19TrainerHeader6: ; 55dbb (15:5dbb) +Route19TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_6 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_6 @@ -89,7 +89,7 @@ Route19TrainerHeader6: ; 55dbb (15:5dbb) dw Route19EndBattleText7 ; TextEndBattle dw Route19EndBattleText7 ; TextEndBattle -Route19TrainerHeader7: ; 55dc7 (15:5dc7) +Route19TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_7, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_7, 1 @@ -98,7 +98,7 @@ Route19TrainerHeader7: ; 55dc7 (15:5dc7) dw Route19EndBattleText8 ; TextEndBattle dw Route19EndBattleText8 ; TextEndBattle -Route19TrainerHeader8: ; 55dd3 (15:5dd3) +Route19TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_8, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_8, 1 @@ -107,7 +107,7 @@ Route19TrainerHeader8: ; 55dd3 (15:5dd3) dw Route19EndBattleText9 ; TextEndBattle dw Route19EndBattleText9 ; TextEndBattle -Route19TrainerHeader9: ; 55ddf (15:5ddf) +Route19TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_9, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_9, 1 @@ -118,178 +118,178 @@ Route19TrainerHeader9: ; 55ddf (15:5ddf) db $ff -Route19Text1: ; 55dec (15:5dec) +Route19Text1: TX_ASM ld hl, Route19TrainerHeader0 jr Route19_TalkToTrainer -Route19Text2: ; 55df6 (15:5df6) +Route19Text2: TX_ASM ld hl, Route19TrainerHeader1 jr Route19_TalkToTrainer -Route19Text3: ; 55e00 (15:5e00) +Route19Text3: TX_ASM ld hl, Route19TrainerHeader2 jr Route19_TalkToTrainer -Route19Text4: ; 55e0a (15:5e0a) +Route19Text4: TX_ASM ld hl, Route19TrainerHeader3 jr Route19_TalkToTrainer -Route19Text5: ; 55e14 (15:5e14) +Route19Text5: TX_ASM ld hl, Route19TrainerHeader4 jr Route19_TalkToTrainer -Route19Text6: ; 55e1e (15:5e1e) +Route19Text6: TX_ASM ld hl, Route19TrainerHeader5 jr Route19_TalkToTrainer -Route19Text7: ; 55e28 (15:5e28) +Route19Text7: TX_ASM ld hl, Route19TrainerHeader6 jr Route19_TalkToTrainer -Route19Text8: ; 55e32 (15:5e32) +Route19Text8: TX_ASM ld hl, Route19TrainerHeader7 jr Route19_TalkToTrainer -Route19Text9: ; 55e3c (15:5e3c) +Route19Text9: TX_ASM ld hl, Route19TrainerHeader8 jr Route19_TalkToTrainer -Route19Text10: ; 55e46 (15:5e46) +Route19Text10: TX_ASM ld hl, Route19TrainerHeader9 Route19_TalkToTrainer: call TalkToTrainer jp TextScriptEnd -Route19BattleText1: ; 55e50 (15:5e50) +Route19BattleText1: TX_FAR _Route19BattleText1 db "@" -Route19EndBattleText1: ; 55e55 (15:5e55) +Route19EndBattleText1: TX_FAR _Route19EndBattleText1 db "@" -Route19AfterBattleText1: ; 55e5a (15:5e5a) +Route19AfterBattleText1: TX_FAR _Route19AfterBattleText1 db "@" -Route19BattleText2: ; 55e5f (15:5e5f) +Route19BattleText2: TX_FAR _Route19BattleText2 db "@" -Route19EndBattleText2: ; 55e64 (15:5e64) +Route19EndBattleText2: TX_FAR _Route19EndBattleText2 db "@" -Route19AfterBattleText2: ; 55e69 (15:5e69) +Route19AfterBattleText2: TX_FAR _Route19AfterBattleText2 db "@" -Route19BattleText3: ; 55e6e (15:5e6e) +Route19BattleText3: TX_FAR _Route19BattleText3 db "@" -Route19EndBattleText3: ; 55e73 (15:5e73) +Route19EndBattleText3: TX_FAR _Route19EndBattleText3 db "@" -Route19AfterBattleText3: ; 55e78 (15:5e78) +Route19AfterBattleText3: TX_FAR _Route19AfterBattleText3 db "@" -Route19BattleText4: ; 55e7d (15:5e7d) +Route19BattleText4: TX_FAR _Route19BattleText4 db "@" -Route19EndBattleText4: ; 55e82 (15:5e82) +Route19EndBattleText4: TX_FAR _Route19EndBattleText4 db "@" -Route19AfterBattleText4: ; 55e87 (15:5e87) +Route19AfterBattleText4: TX_FAR _Route19AfterBattleText4 db "@" -Route19BattleText5: ; 55e8c (15:5e8c) +Route19BattleText5: TX_FAR _Route19BattleText5 db "@" -Route19EndBattleText5: ; 55e91 (15:5e91) +Route19EndBattleText5: TX_FAR _Route19EndBattleText5 db "@" -Route19AfterBattleText5: ; 55e96 (15:5e96) +Route19AfterBattleText5: TX_FAR _Route19AfterBattleText5 db "@" -Route19BattleText6: ; 55e9b (15:5e9b) +Route19BattleText6: TX_FAR _Route19BattleText6 db "@" -Route19EndBattleText6: ; 55ea0 (15:5ea0) +Route19EndBattleText6: TX_FAR _Route19EndBattleText6 db "@" -Route19AfterBattleText6: ; 55ea5 (15:5ea5) +Route19AfterBattleText6: TX_FAR _Route19AfterBattleText6 db "@" -Route19BattleText7: ; 55eaa (15:5eaa) +Route19BattleText7: TX_FAR _Route19BattleText7 db "@" -Route19EndBattleText7: ; 55eaf (15:5eaf) +Route19EndBattleText7: TX_FAR _Route19EndBattleText7 db "@" -Route19AfterBattleText7: ; 55eb4 (15:5eb4) +Route19AfterBattleText7: TX_FAR _Route19AfterBattleText7 db "@" -Route19BattleText8: ; 55eb9 (15:5eb9) +Route19BattleText8: TX_FAR _Route19BattleText8 db "@" -Route19EndBattleText8: ; 55ebe (15:5ebe) +Route19EndBattleText8: TX_FAR _Route19EndBattleText8 db "@" -Route19AfterBattleText8: ; 55ec3 (15:5ec3) +Route19AfterBattleText8: TX_FAR _Route19AfterBattleText8 db "@" -Route19BattleText9: ; 55ec8 (15:5ec8) +Route19BattleText9: TX_FAR _Route19BattleText9 db "@" -Route19EndBattleText9: ; 55ecd (15:5ecd) +Route19EndBattleText9: TX_FAR _Route19EndBattleText9 db "@" -Route19AfterBattleText9: ; 55ed2 (15:5ed2) +Route19AfterBattleText9: TX_FAR _Route19AfterBattleText9 db "@" -Route19BattleText10: ; 55ed7 (15:5ed7) +Route19BattleText10: TX_FAR _Route19BattleText10 db "@" -Route19EndBattleText10: ; 55edc (15:5edc) +Route19EndBattleText10: TX_FAR _Route19EndBattleText10 db "@" -Route19AfterBattleText10: ; 55ee1 (15:5ee1) +Route19AfterBattleText10: TX_FAR _Route19AfterBattleText10 db "@" -Route19Text11: ; 55ee6 (15:5ee6) +Route19Text11: TX_FAR _Route19Text11 db "@" diff --git a/scripts/route1_2.asm b/scripts/route1_2.asm index 35ffb137..6e9b472e 100755 --- a/scripts/route1_2.asm +++ b/scripts/route1_2.asm @@ -17,24 +17,24 @@ Func_f1ad2: call PrintText ret -Route1ViridianMartSampleText: ; 1cae3 (7:4ae3) +Route1ViridianMartSampleText: TX_FAR _Route1ViridianMartSampleText db "@" -Route1Text_f1aff: ; 1cae8 (7:4ae8) +Route1Text_f1aff: TX_FAR _Route1Text_1cae8 TX_SFX_ITEM db "@" -Route1Text_f1b05: ; 1caee (7:4aee) +Route1Text_f1b05: TX_FAR _Route1Text_1caee db "@" -Route1Text_f1b0a: ; 1caf3 (7:4af3) +Route1Text_f1b0a: TX_FAR _Route1Text_1caf3 db "@" -Func_f1b0f: ; 1caf8 (7:4af8) +Func_f1b0f: ld hl, Route1Text_f1b16 call PrintText ret @@ -43,7 +43,7 @@ Route1Text_f1b16: TX_FAR _Route1Text2 db "@" -Func_f1b1b: ; 1cafd (7:4afd) +Func_f1b1b: ld hl, Route1Text_f1b22 call PrintText ret diff --git a/scripts/route2.asm b/scripts/route2.asm index 62ef3050..810792ef 100755 --- a/scripts/route2.asm +++ b/scripts/route2.asm @@ -1,16 +1,16 @@ -Route2Script: ; 554e3 (15:54e3) +Route2Script: jp EnableAutoTextBoxDrawing -Route2TextPointers: ; 554e6 (15:54e6) +Route2TextPointers: dw PickUpItemText dw PickUpItemText dw Route2Text3 dw Route2Text4 -Route2Text3: ; 554ee (15:54ee) +Route2Text3: TX_FAR _Route2Text3 db "@" -Route2Text4: ; 554f3 (15:54f3) +Route2Text4: TX_FAR _Route2Text4 db "@" diff --git a/scripts/route20.asm b/scripts/route20.asm index ce9e6f23..cea1e01c 100755 --- a/scripts/route20.asm +++ b/scripts/route20.asm @@ -1,4 +1,4 @@ -Route20Script: ; 50ca9 (14:4ca9) +Route20Script: CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS call nz, Route20Script_50cc6 call EnableAutoTextBoxDrawing @@ -9,7 +9,7 @@ Route20Script: ; 50ca9 (14:4ca9) ld [W_ROUTE20CURSCRIPT], a ret -Route20Script_50cc6: ; 50cc6 (14:4cc6) +Route20Script_50cc6: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE jr z, .asm_50cef ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1 @@ -26,7 +26,7 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6) pop hl jr .asm_50cdc -.MissableObjectIDs: ; 50ce8 (14:4ce8) +.MissableObjectIDs: db HS_SEAFOAM_ISLANDS_2_BOULDER_1 db HS_SEAFOAM_ISLANDS_2_BOULDER_2 db HS_SEAFOAM_ISLANDS_3_BOULDER_1 @@ -48,20 +48,20 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6) call Route20Script_50d14 ret -Route20Script_50d0c: ; 50d0c (14:4d0c) +Route20Script_50d0c: ld [wMissableObjectIndex], a predef_jump ShowObject -Route20Script_50d14: ; 50d14 (14:4d14) +Route20Script_50d14: ld [wMissableObjectIndex], a predef_jump HideObject -Route20ScriptPointers: ; 50d1c (14:4d1c) +Route20ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route20TextPointers: ; 50d22 (14:4d22) +Route20TextPointers: dw Route20Text1 dw Route20Text2 dw Route20Text3 @@ -75,8 +75,8 @@ Route20TextPointers: ; 50d22 (14:4d22) dw Route20Text11 dw Route20Text12 -Route20TrainerHeaders: ; 50d3a (14:4d3a) -Route20TrainerHeader0: ; 50d3a (14:4d3a) +Route20TrainerHeaders: +Route20TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_0 @@ -85,7 +85,7 @@ Route20TrainerHeader0: ; 50d3a (14:4d3a) dw Route20EndBattleText1 ; TextEndBattle dw Route20EndBattleText1 ; TextEndBattle -Route20TrainerHeader2: ; 50d46 (14:4d46) +Route20TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2 @@ -94,7 +94,7 @@ Route20TrainerHeader2: ; 50d46 (14:4d46) dw Route20EndBattleText2 ; TextEndBattle dw Route20EndBattleText2 ; TextEndBattle -Route20TrainerHeader3: ; 50d52 (14:4d52) +Route20TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3 @@ -103,7 +103,7 @@ Route20TrainerHeader3: ; 50d52 (14:4d52) dw Route20EndBattleText3 ; TextEndBattle dw Route20EndBattleText3 ; TextEndBattle -Route20TrainerHeader4: ; 50d5e (14:4d5e) +Route20TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4 @@ -112,7 +112,7 @@ Route20TrainerHeader4: ; 50d5e (14:4d5e) dw Route20EndBattleText4 ; TextEndBattle dw Route20EndBattleText4 ; TextEndBattle -Route20TrainerHeader5: ; 50d6a (14:4d6a) +Route20TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5 @@ -121,7 +121,7 @@ Route20TrainerHeader5: ; 50d6a (14:4d6a) dw Route20EndBattleText5 ; TextEndBattle dw Route20EndBattleText5 ; TextEndBattle -Route20TrainerHeader6: ; 50d76 (14:4d76) +Route20TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6 @@ -130,7 +130,7 @@ Route20TrainerHeader6: ; 50d76 (14:4d76) dw Route20EndBattleText6 ; TextEndBattle dw Route20EndBattleText6 ; TextEndBattle -Route20TrainerHeader7: ; 50d82 (14:4d82) +Route20TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7 @@ -139,7 +139,7 @@ Route20TrainerHeader7: ; 50d82 (14:4d82) dw Route20EndBattleText7 ; TextEndBattle dw Route20EndBattleText7 ; TextEndBattle -Route20TrainerHeader8: ; 50d8e (14:4d8e) +Route20TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1 @@ -148,7 +148,7 @@ Route20TrainerHeader8: ; 50d8e (14:4d8e) dw Route20EndBattleText8 ; TextEndBattle dw Route20EndBattleText8 ; TextEndBattle -Route20TrainerHeader9: ; 50d9a (14:4d9a) +Route20TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1 @@ -157,7 +157,7 @@ Route20TrainerHeader9: ; 50d9a (14:4d9a) dw Route20EndBattleText9 ; TextEndBattle dw Route20EndBattleText9 ; TextEndBattle -Route20TrainerHeader10: ; 50da6 (14:4da6) +Route20TrainerHeader10: dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_10, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_10, 1 @@ -168,187 +168,187 @@ Route20TrainerHeader10: ; 50da6 (14:4da6) db $ff -Route20Text1: ; 50db3 (14:4db3) +Route20Text1: TX_ASM ld hl, Route20TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route20Text2: ; 50dbd (14:4dbd) +Route20Text2: TX_ASM ld hl, Route20TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route20Text3: ; 50dc7 (14:4dc7) +Route20Text3: TX_ASM ld hl, Route20TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route20Text4: ; 50dd1 (14:4dd1) +Route20Text4: TX_ASM ld hl, Route20TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route20Text5: ; 50ddb (14:4ddb) +Route20Text5: TX_ASM ld hl, Route20TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route20Text6: ; 50de5 (14:4de5) +Route20Text6: TX_ASM ld hl, Route20TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route20Text7: ; 50def (14:4def) +Route20Text7: TX_ASM ld hl, Route20TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route20Text8: ; 50df9 (14:4df9) +Route20Text8: TX_ASM ld hl, Route20TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route20Text9: ; 50e03 (14:4e03) +Route20Text9: TX_ASM ld hl, Route20TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route20Text10: ; 50e0d (14:4e0d) +Route20Text10: TX_ASM ld hl, Route20TrainerHeader10 call TalkToTrainer jp TextScriptEnd -Route20BattleText1: ; 50e17 (14:4e17) +Route20BattleText1: TX_FAR _Route20BattleText1 db "@" -Route20EndBattleText1: ; 50e1c (14:4e1c) +Route20EndBattleText1: TX_FAR _Route20EndBattleText1 db "@" -Route20AfterBattleText1: ; 50e21 (14:4e21) +Route20AfterBattleText1: TX_FAR _Route20AfterBattleText1 db "@" -Route20BattleText2: ; 50e26 (14:4e26) +Route20BattleText2: TX_FAR _Route20BattleText2 db "@" -Route20EndBattleText2: ; 50e2b (14:4e2b) +Route20EndBattleText2: TX_FAR _Route20EndBattleText2 db "@" -Route20AfterBattleText2: ; 50e30 (14:4e30) +Route20AfterBattleText2: TX_FAR _Route20AfterBattleText2 db "@" -Route20BattleText3: ; 50e35 (14:4e35) +Route20BattleText3: TX_FAR _Route20BattleText3 db "@" -Route20EndBattleText3: ; 50e3a (14:4e3a) +Route20EndBattleText3: TX_FAR _Route20EndBattleText3 db "@" -Route20AfterBattleText3: ; 50e3f (14:4e3f) +Route20AfterBattleText3: TX_FAR _Route20AfterBattleText3 db "@" -Route20BattleText4: ; 50e44 (14:4e44) +Route20BattleText4: TX_FAR _Route20BattleText4 db "@" -Route20EndBattleText4: ; 50e49 (14:4e49) +Route20EndBattleText4: TX_FAR _Route20EndBattleText4 db "@" -Route20AfterBattleText4: ; 50e4e (14:4e4e) +Route20AfterBattleText4: TX_FAR _Route20AfterBattleText4 db "@" -Route20BattleText5: ; 50e53 (14:4e53) +Route20BattleText5: TX_FAR _Route20BattleText5 db "@" -Route20EndBattleText5: ; 50e58 (14:4e58) +Route20EndBattleText5: TX_FAR _Route20EndBattleText5 db "@" -Route20AfterBattleText5: ; 50e5d (14:4e5d) +Route20AfterBattleText5: TX_FAR _Route20AfterBattleText5 db "@" -Route20BattleText6: ; 50e62 (14:4e62) +Route20BattleText6: TX_FAR _Route20BattleText6 db "@" -Route20EndBattleText6: ; 50e67 (14:4e67) +Route20EndBattleText6: TX_FAR _Route20EndBattleText6 db "@" -Route20AfterBattleText6: ; 50e6c (14:4e6c) +Route20AfterBattleText6: TX_FAR _Route20AfterBattleText6 db "@" -Route20BattleText7: ; 50e71 (14:4e71) +Route20BattleText7: TX_FAR _Route20BattleText7 db "@" -Route20EndBattleText7: ; 50e76 (14:4e76) +Route20EndBattleText7: TX_FAR _Route20EndBattleText7 db "@" -Route20AfterBattleText7: ; 50e7b (14:4e7b) +Route20AfterBattleText7: TX_FAR _Route20AfterBattleText7 db "@" -Route20BattleText8: ; 50e80 (14:4e80) +Route20BattleText8: TX_FAR _Route20BattleText8 db "@" -Route20EndBattleText8: ; 50e85 (14:4e85) +Route20EndBattleText8: TX_FAR _Route20EndBattleText8 db "@" -Route20AfterBattleText8: ; 50e8a (14:4e8a) +Route20AfterBattleText8: TX_FAR _Route20AfterBattleText8 db "@" -Route20BattleText9: ; 50e8f (14:4e8f) +Route20BattleText9: TX_FAR _Route20BattleText9 db "@" -Route20EndBattleText9: ; 50e94 (14:4e94) +Route20EndBattleText9: TX_FAR _Route20EndBattleText9 db "@" -Route20AfterBattleText9: ; 50e99 (14:4e99) +Route20AfterBattleText9: TX_FAR _Route20AfterBattleText9 db "@" -Route20BattleText10: ; 50e9e (14:4e9e) +Route20BattleText10: TX_FAR _Route20BattleText10 db "@" -Route20EndBattleText10: ; 50ea3 (14:4ea3) +Route20EndBattleText10: TX_FAR _Route20EndBattleText10 db "@" -Route20AfterBattleText10: ; 50ea8 (14:4ea8) +Route20AfterBattleText10: TX_FAR _Route20AfterBattleText10 db "@" -Route20Text12: ; 50ead (14:4ead) -Route20Text11: ; 50ead (14:4ead) +Route20Text12: +Route20Text11: TX_FAR _Route20Text11 db "@" diff --git a/scripts/route21.asm b/scripts/route21.asm index 4c8087fd..de17ca11 100755 --- a/scripts/route21.asm +++ b/scripts/route21.asm @@ -1,4 +1,4 @@ -Route21Script: ; 55eeb (15:5eeb) +Route21Script: call EnableAutoTextBoxDrawing ld hl, Route21TrainerHeaders ld de, Route21ScriptPointers @@ -7,12 +7,12 @@ Route21Script: ; 55eeb (15:5eeb) ld [W_ROUTE21CURSCRIPT], a ret -Route21ScriptPointers: ; 55efe (15:5efe) +Route21ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route21TextPointers: ; 55f04 (15:5f04) +Route21TextPointers: dw Route21Text1 dw Route21Text2 dw Route21Text3 @@ -23,8 +23,8 @@ Route21TextPointers: ; 55f04 (15:5f04) dw Route21Text8 dw Route21Text9 -Route21TrainerHeaders: ; 55f16 (15:5f16) -Route21TrainerHeader0: ; 55f16 (15:5f16) +Route21TrainerHeaders: +Route21TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_0 @@ -33,7 +33,7 @@ Route21TrainerHeader0: ; 55f16 (15:5f16) dw Route21EndBattleText1 ; TextEndBattle dw Route21EndBattleText1 ; TextEndBattle -Route21TrainerHeader1: ; 55f22 (15:5f22) +Route21TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_1 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_1 @@ -42,7 +42,7 @@ Route21TrainerHeader1: ; 55f22 (15:5f22) dw Route21EndBattleText2 ; TextEndBattle dw Route21EndBattleText2 ; TextEndBattle -Route21TrainerHeader2: ; 55f2e (15:5f2e) +Route21TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_2 @@ -51,7 +51,7 @@ Route21TrainerHeader2: ; 55f2e (15:5f2e) dw Route21EndBattleText3 ; TextEndBattle dw Route21EndBattleText3 ; TextEndBattle -Route21TrainerHeader3: ; 55f3a (15:5f3a) +Route21TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_3 @@ -60,7 +60,7 @@ Route21TrainerHeader3: ; 55f3a (15:5f3a) dw Route21EndBattleText4 ; TextEndBattle dw Route21EndBattleText4 ; TextEndBattle -Route21TrainerHeader4: ; 55f46 (15:5f46) +Route21TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_4 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_4 @@ -69,7 +69,7 @@ Route21TrainerHeader4: ; 55f46 (15:5f46) dw Route21EndBattleText5 ; TextEndBattle dw Route21EndBattleText5 ; TextEndBattle -Route21TrainerHeader5: ; 55f52 (15:5f52) +Route21TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_5 @@ -78,7 +78,7 @@ Route21TrainerHeader5: ; 55f52 (15:5f52) dw Route21EndBattleText6 ; TextEndBattle dw Route21EndBattleText6 ; TextEndBattle -Route21TrainerHeader6: ; 55f5e (15:5f5e) +Route21TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_6 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_6 @@ -87,7 +87,7 @@ Route21TrainerHeader6: ; 55f5e (15:5f5e) dw Route21EndBattleText7 ; TextEndBattle dw Route21EndBattleText7 ; TextEndBattle -Route21TrainerHeader7: ; 55f6a (15:5f6a) +Route21TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_7, 1 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_7, 1 @@ -96,7 +96,7 @@ Route21TrainerHeader7: ; 55f6a (15:5f6a) dw Route21EndBattleText8 ; TextEndBattle dw Route21EndBattleText8 ; TextEndBattle -Route21TrainerHeader8: ; 55f76 (15:5f76) +Route21TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_8, 1 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_8, 1 @@ -107,164 +107,164 @@ Route21TrainerHeader8: ; 55f76 (15:5f76) db $ff -Route21Text1: ; 55f83 (15:5f83) +Route21Text1: TX_ASM ld hl, Route21TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route21Text2: ; 55f8d (15:5f8d) +Route21Text2: TX_ASM ld hl, Route21TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route21Text3: ; 55f97 (15:5f97) +Route21Text3: TX_ASM ld hl, Route21TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route21Text4: ; 55fa1 (15:5fa1) +Route21Text4: TX_ASM ld hl, Route21TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route21Text5: ; 55fab (15:5fab) +Route21Text5: TX_ASM ld hl, Route21TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route21Text6: ; 55fb5 (15:5fb5) +Route21Text6: TX_ASM ld hl, Route21TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route21Text7: ; 55fbf (15:5fbf) +Route21Text7: TX_ASM ld hl, Route21TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route21Text8: ; 55fc9 (15:5fc9) +Route21Text8: TX_ASM ld hl, Route21TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route21Text9: ; 55fd3 (15:5fd3) +Route21Text9: TX_ASM ld hl, Route21TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route21BattleText1: ; 55fdd (15:5fdd) +Route21BattleText1: TX_FAR _Route21BattleText1 db "@" -Route21EndBattleText1: ; 55fe2 (15:5fe2) +Route21EndBattleText1: TX_FAR _Route21EndBattleText1 db "@" -Route21AfterBattleText1: ; 55fe7 (15:5fe7) +Route21AfterBattleText1: TX_FAR _Route21AfterBattleText1 db "@" -Route21BattleText2: ; 55fec (15:5fec) +Route21BattleText2: TX_FAR _Route21BattleText2 db "@" -Route21EndBattleText2: ; 55ff1 (15:5ff1) +Route21EndBattleText2: TX_FAR _Route21EndBattleText2 db "@" -Route21AfterBattleText2: ; 55ff6 (15:5ff6) +Route21AfterBattleText2: TX_FAR _Route21AfterBattleText2 db "@" -Route21BattleText3: ; 55ffb (15:5ffb) +Route21BattleText3: TX_FAR _Route21BattleText3 db "@" -Route21EndBattleText3: ; 56000 (15:6000) +Route21EndBattleText3: TX_FAR _Route21EndBattleText3 db "@" -Route21AfterBattleText3: ; 56005 (15:6005) +Route21AfterBattleText3: TX_FAR _Route21AfterBattleText3 db "@" -Route21BattleText4: ; 5600a (15:600a) +Route21BattleText4: TX_FAR _Route21BattleText4 db "@" -Route21EndBattleText4: ; 5600f (15:600f) +Route21EndBattleText4: TX_FAR _Route21EndBattleText4 db "@" -Route21AfterBattleText4: ; 56014 (15:6014) +Route21AfterBattleText4: TX_FAR _Route21AfterBattleText4 db "@" -Route21BattleText5: ; 56019 (15:6019) +Route21BattleText5: TX_FAR _Route21BattleText5 db "@" -Route21EndBattleText5: ; 5601e (15:601e) +Route21EndBattleText5: TX_FAR _Route21EndBattleText5 db "@" -Route21AfterBattleText5: ; 56023 (15:6023) +Route21AfterBattleText5: TX_FAR _Route21AfterBattleText5 db "@" -Route21BattleText6: ; 56028 (15:6028) +Route21BattleText6: TX_FAR _Route21BattleText6 db "@" -Route21EndBattleText6: ; 5602d (15:602d) +Route21EndBattleText6: TX_FAR _Route21EndBattleText6 db "@" -Route21AfterBattleText6: ; 56032 (15:6032) +Route21AfterBattleText6: TX_FAR _Route21AfterBattleText6 db "@" -Route21BattleText7: ; 56037 (15:6037) +Route21BattleText7: TX_FAR _Route21BattleText7 db "@" -Route21EndBattleText7: ; 5603c (15:603c) +Route21EndBattleText7: TX_FAR _Route21EndBattleText7 db "@" -Route21AfterBattleText7: ; 56041 (15:6041) +Route21AfterBattleText7: TX_FAR _Route21AfterBattleText7 db "@" -Route21BattleText8: ; 56046 (15:6046) +Route21BattleText8: TX_FAR _Route21BattleText8 db "@" -Route21EndBattleText8: ; 5604b (15:604b) +Route21EndBattleText8: TX_FAR _Route21EndBattleText8 db "@" -Route21AfterBattleText8: ; 56050 (15:6050) +Route21AfterBattleText8: TX_FAR _Route21AfterBattleText8 db "@" -Route21BattleText9: ; 56055 (15:6055) +Route21BattleText9: TX_FAR _Route21BattleText9 db "@" -Route21EndBattleText9: ; 5605a (15:605a) +Route21EndBattleText9: TX_FAR _Route21EndBattleText9 db "@" -Route21AfterBattleText9: ; 5605f (15:605f) +Route21AfterBattleText9: TX_FAR _Route21AfterBattleText9 db "@" diff --git a/scripts/route22.asm b/scripts/route22.asm index db46efa1..49c57a47 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -1,10 +1,10 @@ -Route22Script: ; 50eb2 (14:4eb2) +Route22Script: call EnableAutoTextBoxDrawing ld hl, Route22ScriptPointers ld a, [W_ROUTE22CURSCRIPT] jp JumpTable -Route22ScriptPointers: ; 50ebe (14:4ebe) +Route22ScriptPointers: dw Route22Script0 dw Route22Script1 dw Route22Script2 @@ -14,14 +14,14 @@ Route22ScriptPointers: ; 50ebe (14:4ebe) dw Route22Script6 dw Route22Script7 -Route22Script_50ece: ; 50ece (14:4ece) +Route22Script_50ece: xor a ld [wJoyIgnore], a ld [W_ROUTE22CURSCRIPT], a -Route22Script7: ; 50ed5 (14:4ed5) +Route22Script7: ret -Route22Script_50ed6: ; 50ed6 (14:4ed6) +Route22Script_50ed6: ld a, OPP_SONY1 ld [wCurOpponent], a ld a, $2 @@ -36,7 +36,7 @@ Route22Script_50ee1: ld [wTrainerNo], a ret -Route22MoveRivalSprite: ; 50ee6 (14:4ee6) +Route22MoveRivalSprite: ld de, Route22RivalMovementData ld a, [wcf0d] cp $1 @@ -48,14 +48,14 @@ Route22MoveRivalSprite: ; 50ee6 (14:4ee6) ld [hSpriteFacingDirection], a jp SetSpriteFacingDirectionAndDelay -Route22RivalMovementData: ; 50efb (14:4efb) +Route22RivalMovementData: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db $FF -Route22Script0: ; 50f00 (14:4f00) +Route22Script0: CheckEvent EVENT_ROUTE22_RIVAL_WANTS_BATTLE ret z ld hl, .Route22RivalBattleCoords @@ -101,7 +101,7 @@ Route22Script0: ; 50f00 (14:4f00) ld [W_ROUTE22CURSCRIPT], a ret -Route22Script1: ; 50f62 (14:4f62) +Route22Script1: ld a, [wd730] bit 0, a ret nz @@ -135,15 +135,15 @@ Route22Script1: ; 50f62 (14:4f62) ld [W_ROUTE22CURSCRIPT], a ret -Route22RivalDefeatedText1: ; 511b7 (14:51b7) +Route22RivalDefeatedText1: TX_FAR _Route22RivalDefeatedText1 db "@" -Route22Text_511bc: ; 511bc (14:51bc) +Route22Text_511bc: TX_FAR _Route22Text_511bc db "@" -Route22Script2: ; 50fb5 (14:4fb5) +Route22Script2: ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece @@ -185,18 +185,18 @@ Route22Script2: ; 50fb5 (14:4fb5) ld [W_ROUTE22CURSCRIPT], a ret -Route22Script_51008: ; 51008 (14:5008) +Route22Script_51008: ld de, Route22RivalExitMovementData1 jr Route22MoveRival1 -Route22Script_5100d: ; 5100d (14:500d) +Route22Script_5100d: ld de, Route22RivalExitMovementData2 -Route22MoveRival1: ; 51010 (14:5010) +Route22MoveRival1: ld a, $1 ld [H_SPRITEINDEX], a jp MoveSprite -Route22RivalExitMovementData1: ; 51017 (14:5017) +Route22RivalExitMovementData1: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN @@ -206,7 +206,7 @@ Route22RivalExitMovementData1: ; 51017 (14:5017) db NPC_MOVEMENT_DOWN db $FF -Route22RivalExitMovementData2: ; 5101f (14:501f) +Route22RivalExitMovementData2: db NPC_MOVEMENT_UP db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -219,7 +219,7 @@ Route22RivalExitMovementData2: ; 5101f (14:501f) db NPC_MOVEMENT_DOWN db $FF -Route22Script3: ; 5102a (14:502a) +Route22Script3: ld a, [wd730] bit 0, a ret nz @@ -234,7 +234,7 @@ Route22Script3: ; 5102a (14:502a) ld [W_ROUTE22CURSCRIPT], a ret -Route22Script_5104e: ; 5104e (14:504e) +Route22Script_5104e: ld a, $2 ld [wEmotionBubbleSpriteIndex], a xor a ; EXCLAMATION_BUBBLE @@ -254,7 +254,7 @@ Route22Script_5104e: ; 5104e (14:504e) ld [W_ROUTE22CURSCRIPT], a ret -Route22Script4: ; 51087 (14:5087) +Route22Script4: ld a, [wd730] bit 0, a ret nz @@ -290,15 +290,15 @@ Route22Script4: ; 51087 (14:5087) ld [W_ROUTE22CURSCRIPT], a ret -Route22RivalDefeatedText2: ; 511cb (14:51cb) +Route22RivalDefeatedText2: TX_FAR _Route22RivalDefeatedText2 db "@" -Route22Text_511d0: ; 511d0 (14:51d0) +Route22Text_511d0: TX_FAR _Route22Text_511d0 db "@" -Route22Script5: ; 510df (14:50df) +Route22Script5: ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece @@ -338,27 +338,27 @@ Route22Script5: ; 510df (14:50df) ld [W_ROUTE22CURSCRIPT], a ret -Route22Script_5113d: ; 5113d (14:513d) +Route22Script_5113d: ld de, MovementData_5114c jr Route22MoveRival2 -Route22Script_51142: ; 51142 (14:5142) +Route22Script_51142: ld de, MovementData_5114d -Route22MoveRival2: ; 51145 (14:5145) +Route22MoveRival2: ld a, $2 ld [H_SPRITEINDEX], a jp MoveSprite -MovementData_5114c: ; 5114c (14:514c) +MovementData_5114c: db NPC_MOVEMENT_LEFT -MovementData_5114d: ; 5114d (14:514d) +MovementData_5114d: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_LEFT db $FF -Route22Script6: ; 51151 (14:5151) +Route22Script6: ld a, [wd730] bit 0, a ret nz @@ -373,22 +373,22 @@ Route22Script6: ; 51151 (14:5151) ld [W_ROUTE22CURSCRIPT], a ret -Route22TextPointers: ; 51175 (14:5175) +Route22TextPointers: dw Route22Text1 dw Route22Text2 dw Route22FrontGateText -Route22Text1: ; 5117b (14:517b) +Route22Text1: TX_ASM callba Func_f1b27 jp TextScriptEnd -Route22Text2: ; 51194 (14:5194) +Route22Text2: TX_ASM callba Func_f1b47 jp TextScriptEnd -Route22FrontGateText: ; 511d5 (14:51d5) +Route22FrontGateText: TX_ASM callba Func_f1b67 jp TextScriptEnd diff --git a/scripts/route22_2.asm b/scripts/route22_2.asm index 89ecdcf3..1cd23ed2 100755 --- a/scripts/route22_2.asm +++ b/scripts/route22_2.asm @@ -11,11 +11,11 @@ Func_f1b27: .asm_51191 ret -Route22RivalBeforeBattleText1: ; 511ad (14:51ad) +Route22RivalBeforeBattleText1: TX_FAR _Route22RivalBeforeBattleText1 db "@" -Route22RivalAfterBattleText1: ; 511b2 (14:51b2) +Route22RivalAfterBattleText1: TX_FAR _Route22RivalAfterBattleText1 db "@" @@ -32,11 +32,11 @@ Func_f1b47: .asm_511aa ret -Route22RivalBeforeBattleText2: ; 511c1 (14:51c1) +Route22RivalBeforeBattleText2: TX_FAR _Route22RivalBeforeBattleText2 db "@" -Route22RivalAfterBattleText2: ; 511c6 (14:51c6) +Route22RivalAfterBattleText2: TX_FAR _Route22RivalAfterBattleText2 db "@" diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 7f38db70..9fd7c9cd 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -1,4 +1,4 @@ -Route22GateScript: ; 1e683 (7:6683) +Route22GateScript: call EnableAutoTextBoxDrawing ld hl, Route22GateScriptPointers ld a, [W_ROUTE22GATECURSCRIPT] @@ -12,12 +12,12 @@ Route22GateScript: ; 1e683 (7:6683) ld [wLastMap], a ret -Route22GateScriptPointers: ; 1e69e (7:669e) +Route22GateScriptPointers: dw Route22GateScript0 dw Route22GateScript1 dw Route22GateScript2 -Route22GateScript0: ; 1e6a4 (7:66a4) +Route22GateScript0: ld hl, Route22GateScriptCoords call ArePlayerCoordsInArray ret nc @@ -30,12 +30,12 @@ Route22GateScript0: ; 1e6a4 (7:66a4) call DisplayTextID ret -Route22GateScriptCoords: ; 1e6b5 (7:66b5) +Route22GateScriptCoords: db 2,4 db 2,5 db $ff -Route22GateScript_1e6ba: ; 1e6ba (7:66ba) +Route22GateScript_1e6ba: ld a, $1 ld [wSimulatedJoypadStatesIndex], a ld a, D_DOWN @@ -44,7 +44,7 @@ Route22GateScript_1e6ba: ; 1e6ba (7:66ba) ld [wJoyIgnore], a jp StartSimulatingJoypadStates -Route22GateScript1: ; 1e6cd (7:66cd) +Route22GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -53,13 +53,13 @@ Route22GateScript1: ; 1e6cd (7:66cd) call Delay3 ld a, $0 ld [W_ROUTE22GATECURSCRIPT], a -Route22GateScript2: ; 1e6de (7:66de) +Route22GateScript2: ret -Route22GateTextPointers: ; 1e6df (7:66df) +Route22GateTextPointers: dw Route22GateText1 -Route22GateText1: ; 1e6e1 (7:66e1) +Route22GateText1: TX_ASM ld a, [wObtainedBadges] bit 0, a ; BOULDERBADGE @@ -77,7 +77,7 @@ Route22GateText1: ; 1e6e1 (7:66e1) ld [W_ROUTE22GATECURSCRIPT], a jp TextScriptEnd -Route22GateText_1e704: ; 1e704 (7:6704) +Route22GateText_1e704: TX_FAR _Route22GateText_1e704 TX_ASM ld a, SFX_DENIED @@ -86,11 +86,11 @@ Route22GateText_1e704: ; 1e704 (7:6704) ld hl, Route22GateText_1e715 ret -Route22GateText_1e715: ; 1e715 (7:6715) +Route22GateText_1e715: TX_FAR _Route22GateText_1e715 db "@" -Route22GateText_1e71a: ; 1e71a (7:671a) +Route22GateText_1e71a: TX_FAR _Route22GateText_1e71a TX_SFX_ITEM db "@" diff --git a/scripts/route23.asm b/scripts/route23.asm index d26edb2e..ca980843 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -1,11 +1,11 @@ -Route23Script: ; 511da (14:51da) +Route23Script: call Route23Script_511e9 call EnableAutoTextBoxDrawing ld hl, Route23ScriptPointers ld a, [W_ROUTE23CURSCRIPT] jp JumpTable -Route23Script_511e9: ; 511e9 (14:51e9) +Route23Script_511e9: ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -19,12 +19,12 @@ Route23Script_511e9: ; 511e9 (14:51e9) ld [wMissableObjectIndex], a predef_jump HideObject -Route23ScriptPointers: ; 51213 (14:5213) +Route23ScriptPointers: dw Route23Script0 dw Route23Script1 dw Route23Script2 -Route23Script0: ; 51219 (14:5219) +Route23Script0: ld hl, YCoordsData_51255 ld a, [wYCoord] ld b, a @@ -60,10 +60,10 @@ Route23Script0: ; 51219 (14:5219) ld [hJoyHeld], a ret -YCoordsData_51255: ; 51255 (14:5255) +YCoordsData_51255: db $23,$38,$55,$60,$69,$77,$88,$FF -Route23Script_5125d: ; 5125d (14:525d) +Route23Script_5125d: ld hl, BadgeTextPointers ld a, [wWhichBadge] ld c, a @@ -82,7 +82,7 @@ Route23Script_5125d: ; 5125d (14:525d) jr nz, .copyTextLoop ret -BadgeTextPointers: ; 51276 (14:5276) +BadgeTextPointers: dw CascadeBadgeText dw ThunderBadgeText dw RainbowBadgeText @@ -91,28 +91,28 @@ BadgeTextPointers: ; 51276 (14:5276) dw VolcanoBadgeText dw EarthBadgeText -EarthBadgeText: ; 51284 (14:5284) +EarthBadgeText: db "EARTHBADGE@" -VolcanoBadgeText: ; 5128f (14:528f) +VolcanoBadgeText: db "VOLCANOBADGE@" -MarshBadgeText: ; 5129c (14:529c) +MarshBadgeText: db "MARSHBADGE@" -SoulBadgeText: ; 512a7 (14:52a7) +SoulBadgeText: db "SOULBADGE@" -RainbowBadgeText: ; 512b1 (14:52b1) +RainbowBadgeText: db "RAINBOWBADGE@" -ThunderBadgeText: ; 512be (14:52be) +ThunderBadgeText: db "THUNDERBADGE@" -CascadeBadgeText: ; 512cb (14:52cb) +CascadeBadgeText: db "CASCADEBADGE@" -Route23Script_512d8: ; 512d8 (14:52d8) +Route23Script_512d8: ld a, $1 ld [wSimulatedJoypadStatesIndex], a ld a, D_DOWN @@ -122,16 +122,16 @@ Route23Script_512d8: ; 512d8 (14:52d8) ld [wJoyIgnore], a jp StartSimulatingJoypadStates -Route23Script1: ; 512ec (14:52ec) +Route23Script1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz -Route23Script2: ; 512f1 (14:52f1) +Route23Script2: ld a, $0 ld [W_ROUTE23CURSCRIPT], a ret -Route23TextPointers: ; 512f7 (14:52f7) +Route23TextPointers: dw Route23Text1 dw Route23Text2 dw Route23Text3 @@ -141,49 +141,49 @@ Route23TextPointers: ; 512f7 (14:52f7) dw Route23Text7 dw Route23Text8 -Route23Text1: ; 51307 (14:5307) +Route23Text1: TX_ASM EventFlagBit a, EVENT_PASSED_EARTHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd -Route23Text2: ; 51310 (14:5310) +Route23Text2: TX_ASM EventFlagBit a, EVENT_PASSED_VOLCANOBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd -Route23Text3: ; 51319 (14:5319) +Route23Text3: TX_ASM EventFlagBit a, EVENT_PASSED_MARSHBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd -Route23Text4: ; 51322 (14:5322) +Route23Text4: TX_ASM EventFlagBit a, EVENT_PASSED_SOULBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd -Route23Text5: ; 5132b (14:532b) +Route23Text5: TX_ASM EventFlagBit a, EVENT_PASSED_RAINBOWBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd -Route23Text6: ; 51334 (14:5334) +Route23Text6: TX_ASM EventFlagBit a, EVENT_PASSED_THUNDERBADGE_CHECK, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd -Route23Text7: ; 5133d (14:533d) +Route23Text7: TX_ASM EventFlagBit a, EVENT_PASSED_CASCADEBADGE_CHECK call Route23Script_51346 jp TextScriptEnd -Route23Script_51346: ; 51346 (14:5346) +Route23Script_51346: ld [wWhichBadge], a call Route23Script_5125d ld a, [wWhichBadge] @@ -213,11 +213,11 @@ Route23Script_51346: ; 51346 (14:5346) ld [W_ROUTE23CURSCRIPT], a ret -Route23Script_51388: ; 51388 (14:5388) +Route23Script_51388: ld hl, VictoryRoadGuardText2 jp PrintText -VictoryRoadGuardText1: ; 5138e (14:538e) +VictoryRoadGuardText1: TX_FAR _VictoryRoadGuardText1 TX_ASM ld a, SFX_DENIED @@ -225,12 +225,12 @@ VictoryRoadGuardText1: ; 5138e (14:538e) call WaitForSoundToFinish jp TextScriptEnd -VictoryRoadGuardText2: ; 5139e (14:539e) +VictoryRoadGuardText2: TX_FAR _VictoryRoadGuardText2 db $b TX_FAR _VictoryRoadGuardText_513a3 db "@" -Route23Text8: ; 513a8 (14:53a8) +Route23Text8: TX_FAR _Route23Text8 db "@" diff --git a/scripts/route24.asm b/scripts/route24.asm index 15fe78b8..b0db448d 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -1,4 +1,4 @@ -Route24Script: ; 51366 (14:5366) +Route24Script: call EnableAutoTextBoxDrawing ld hl, Route24TrainerHeaders ld de, Route24ScriptPointers @@ -7,21 +7,21 @@ Route24Script: ; 51366 (14:5366) ld [W_ROUTE24CURSCRIPT], a ret -Route24Script_513c0: ; 513c0 (14:53c0) +Route24Script_513c0: xor a ld [wJoyIgnore], a ld [W_ROUTE24CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -Route24ScriptPointers: ; 513cb (14:53cb) +Route24ScriptPointers: dw Route24Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw Route24Script3 dw Route24Script4 -Route24Script0: ; 513d5 (14:53d5) +Route24Script0: CheckEvent EVENT_GOT_NUGGET jp nz, CheckFightingMapTrainers ld hl, CoordsData_5140e @@ -44,10 +44,10 @@ Route24Script0: ; 513d5 (14:53d5) ld [W_CURMAPSCRIPT], a ret -CoordsData_5140e: ; 5140e (14:540e) +CoordsData_5140e: db $0F,$0A,$FF -Route24Script4: ; 51411 (14:5411) +Route24Script4: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -57,7 +57,7 @@ Route24Script4: ; 51411 (14:5411) ld [W_CURMAPSCRIPT], a ret -Route24Script3: ; 51422 (14:5422) +Route24Script3: ld a, [wIsInBattle] cp $ff jp z, Route24Script_513c0 @@ -75,7 +75,7 @@ Route24Script3: ; 51422 (14:5422) ld [W_CURMAPSCRIPT], a ret -Route24TextPointers: ; 5144b (14:544b) +Route24TextPointers: dw Route24Text1 dw Route24Text2 dw Route24Text3 @@ -86,8 +86,8 @@ Route24TextPointers: ; 5144b (14:544b) dw PickUpItemText dw Route24Text8 -Route24TrainerHeaders: ; 5145b (14:545b) -Route24TrainerHeader0: ; 5145b (14:545b) +Route24TrainerHeaders: +Route24TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_0 @@ -96,7 +96,7 @@ Route24TrainerHeader0: ; 5145b (14:545b) dw Route24EndBattleText1 ; TextEndBattle dw Route24EndBattleText1 ; TextEndBattle -Route24TrainerHeader2: ; 51467 (14:5467) +Route24TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2 @@ -105,7 +105,7 @@ Route24TrainerHeader2: ; 51467 (14:5467) dw Route24EndBattleText2 ; TextEndBattle dw Route24EndBattleText2 ; TextEndBattle -Route24TrainerHeader3: ; 51473 (14:5473) +Route24TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3 @@ -114,7 +114,7 @@ Route24TrainerHeader3: ; 51473 (14:5473) dw Route24EndBattleText3 ; TextEndBattle dw Route24EndBattleText3 ; TextEndBattle -Route24TrainerHeader4: ; 5147f (14:547f) +Route24TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4 @@ -123,7 +123,7 @@ Route24TrainerHeader4: ; 5147f (14:547f) dw Route24EndBattleText4 ; TextEndBattle dw Route24EndBattleText4 ; TextEndBattle -Route24TrainerHeader5: ; 5148b (14:548b) +Route24TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5 @@ -132,7 +132,7 @@ Route24TrainerHeader5: ; 5148b (14:548b) dw Route24EndBattleText5 ; TextEndBattle dw Route24EndBattleText5 ; TextEndBattle -Route24TrainerHeader6: ; 51497 (14:5497) +Route24TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_6 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_6 @@ -143,7 +143,7 @@ Route24TrainerHeader6: ; 51497 (14:5497) db $ff -Route24Text1: ; 514a4 (14:54a4) +Route24Text1: TX_ASM ResetEvent EVENT_NUGGET_REWARD_AVAILABLE CheckEvent EVENT_GOT_NUGGET @@ -184,139 +184,139 @@ Route24Text1: ; 514a4 (14:54a4) SetEvent EVENT_NUGGET_REWARD_AVAILABLE jp TextScriptEnd -Route24Text_51510: ; 51510 (14:5510) +Route24Text_51510: TX_FAR _Route24Text_51510 db $0B TX_FAR _Route24Text_51515 db "@" -Route24Text_5151a: ; 5151a (14:551a) +Route24Text_5151a: TX_FAR _Route24Text_5151a TX_SFX_KEY_ITEM TX_BUTTON_SOUND db "@" -Route24Text_51521: ; 51521 (14:5521) +Route24Text_51521: TX_FAR _Route24Text_51521 db "@" -Route24Text_51526: ; 51526 (14:5526) +Route24Text_51526: TX_FAR _Route24Text_51526 db "@" -Route24Text_5152b: ; 5152b (14:552b) +Route24Text_5152b: TX_FAR _Route24Text_5152b db "@" -Route24Text_51530: ; 51530 (14:5530) +Route24Text_51530: TX_FAR _Route24Text_51530 db "@" -Route24Text2: ; 51535 (14:5535) +Route24Text2: TX_ASM ld hl, Route24TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route24Text3: ; 5153f (14:553f) +Route24Text3: TX_ASM ld hl, Route24TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route24Text4: ; 51549 (14:5549) +Route24Text4: TX_ASM ld hl, Route24TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route24Text5: ; 51553 (14:5553) +Route24Text5: TX_ASM ld hl, Route24TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route24Text6: ; 5155d (14:555d) +Route24Text6: TX_ASM ld hl, Route24TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route24Text7: ; 51567 (14:5567) +Route24Text7: TX_ASM ld hl, Route24TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route24BattleText1: ; 51571 (14:5571) +Route24BattleText1: TX_FAR _Route24BattleText1 db "@" -Route24EndBattleText1: ; 51576 (14:5576) +Route24EndBattleText1: TX_FAR _Route24EndBattleText1 db "@" -Route24AfterBattleText1: ; 5157b (14:557b) +Route24AfterBattleText1: TX_FAR _Route24AfterBattleText1 db "@" -Route24BattleText2: ; 51580 (14:5580) +Route24BattleText2: TX_FAR _Route24BattleText2 db "@" -Route24EndBattleText2: ; 51585 (14:5585) +Route24EndBattleText2: TX_FAR _Route24EndBattleText2 db "@" -Route24AfterBattleText2: ; 5158a (14:558a) +Route24AfterBattleText2: TX_FAR _Route24AfterBattleText2 db "@" -Route24BattleText3: ; 5158f (14:558f) +Route24BattleText3: TX_FAR _Route24BattleText3 db "@" -Route24EndBattleText3: ; 51594 (14:5594) +Route24EndBattleText3: TX_FAR _Route24EndBattleText3 db "@" -Route24AfterBattleText3: ; 51599 (14:5599) +Route24AfterBattleText3: TX_FAR _Route24AfterBattleText3 db "@" -Route24BattleText4: ; 5159e (14:559e) +Route24BattleText4: TX_FAR _Route24BattleText4 db "@" -Route24EndBattleText4: ; 515a3 (14:55a3) +Route24EndBattleText4: TX_FAR _Route24EndBattleText4 db "@" -Route24AfterBattleText4: ; 515a8 (14:55a8) +Route24AfterBattleText4: TX_FAR _Route24AfterBattleText4 db "@" -Route24BattleText5: ; 515ad (14:55ad) +Route24BattleText5: TX_FAR _Route24BattleText5 db "@" -Route24EndBattleText5: ; 515b2 (14:55b2) +Route24EndBattleText5: TX_FAR _Route24EndBattleText5 db "@" -Route24AfterBattleText5: ; 515b7 (14:55b7) +Route24AfterBattleText5: TX_FAR _Route24AfterBattleText5 db "@" -Route24BattleText6: ; 515bc (14:55bc) +Route24BattleText6: TX_FAR _Route24BattleText6 db "@" -Route24EndBattleText6: ; 515c1 (14:55c1) +Route24EndBattleText6: TX_FAR _Route24EndBattleText6 db "@" -Route24AfterBattleText6: ; 515c6 (14:55c6) +Route24AfterBattleText6: TX_FAR _Route24AfterBattleText6 db "@" diff --git a/scripts/route25.asm b/scripts/route25.asm index 9883f056..cf1599ca 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -1,4 +1,4 @@ -Route25Script: ; 515cb (14:55cb) +Route25Script: call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeaders ld de, Route25ScriptPointers @@ -8,7 +8,7 @@ Route25Script: ; 515cb (14:55cb) call Route25Script_515e1 ret -Route25Script_515e1: ; 515e1 (14:55e1) +Route25Script_515e1: ld hl, wd492 res 2, [hl] res 3, [hl] @@ -46,12 +46,12 @@ Route25Script_515e1: ; 515e1 (14:55e1) .asm_5165c ret -Route25ScriptPointers: ; 51622 (14:5622) +Route25ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route25TextPointers: ; 51628 (14:5628) +Route25TextPointers: dw Route25Text1 dw Route25Text2 dw Route25Text3 @@ -64,8 +64,8 @@ Route25TextPointers: ; 51628 (14:5628) dw PickUpItemText dw Route25Text11 -Route25TrainerHeaders: ; 5163e (14:563e) -Route25TrainerHeader0: ; 5163e (14:563e) +Route25TrainerHeaders: +Route25TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_0 @@ -74,7 +74,7 @@ Route25TrainerHeader0: ; 5163e (14:563e) dw Route25EndBattleText1 ; TextEndBattle dw Route25EndBattleText1 ; TextEndBattle -Route25TrainerHeader2: ; 5164a (14:564a) +Route25TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2 @@ -83,7 +83,7 @@ Route25TrainerHeader2: ; 5164a (14:564a) dw Route25EndBattleText2 ; TextEndBattle dw Route25EndBattleText2 ; TextEndBattle -Route25TrainerHeader3: ; 51656 (14:5656) +Route25TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3 @@ -92,7 +92,7 @@ Route25TrainerHeader3: ; 51656 (14:5656) dw Route25EndBattleText3 ; TextEndBattle dw Route25EndBattleText3 ; TextEndBattle -Route25TrainerHeader4: ; 51662 (14:5662) +Route25TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4 @@ -101,7 +101,7 @@ Route25TrainerHeader4: ; 51662 (14:5662) dw Route25EndBattleText4 ; TextEndBattle dw Route25EndBattleText4 ; TextEndBattle -Route25TrainerHeader5: ; 5166e (14:566e) +Route25TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5 @@ -110,7 +110,7 @@ Route25TrainerHeader5: ; 5166e (14:566e) dw Route25EndBattleText5 ; TextEndBattle dw Route25EndBattleText5 ; TextEndBattle -Route25TrainerHeader6: ; 5167a (14:567a) +Route25TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6 @@ -119,7 +119,7 @@ Route25TrainerHeader6: ; 5167a (14:567a) dw Route25EndBattleText6 ; TextEndBattle dw Route25EndBattleText6 ; TextEndBattle -Route25TrainerHeader7: ; 51686 (14:5686) +Route25TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7 @@ -128,7 +128,7 @@ Route25TrainerHeader7: ; 51686 (14:5686) dw Route25EndBattleText7 ; TextEndBattle dw Route25EndBattleText7 ; TextEndBattle -Route25TrainerHeader8: ; 51692 (14:5692) +Route25TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1 @@ -137,7 +137,7 @@ Route25TrainerHeader8: ; 51692 (14:5692) dw Route25EndBattleText8 ; TextEndBattle dw Route25EndBattleText8 ; TextEndBattle -Route25TrainerHeader9: ; 5169e (14:569e) +Route25TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_9, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_9, 1 @@ -148,168 +148,168 @@ Route25TrainerHeader9: ; 5169e (14:569e) db $ff -Route25Text1: ; 516ab (14:56ab) +Route25Text1: TX_ASM ld hl, Route25TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route25Text2: ; 516b5 (14:56b5) +Route25Text2: TX_ASM ld hl, Route25TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route25Text3: ; 516bf (14:56bf) +Route25Text3: TX_ASM ld hl, Route25TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route25Text4: ; 516c9 (14:56c9) +Route25Text4: TX_ASM ld hl, Route25TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route25Text5: ; 516d3 (14:56d3) +Route25Text5: TX_ASM ld hl, Route25TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route25Text6: ; 516dd (14:56dd) +Route25Text6: TX_ASM ld hl, Route25TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route25Text7: ; 516e7 (14:56e7) +Route25Text7: TX_ASM ld hl, Route25TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route25Text8: ; 516f1 (14:56f1) +Route25Text8: TX_ASM ld hl, Route25TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route25Text9: ; 516fb (14:56fb) +Route25Text9: TX_ASM ld hl, Route25TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route25BattleText1: ; 51705 (14:5705) +Route25BattleText1: TX_FAR _Route25BattleText1 db "@" -Route25EndBattleText1: ; 5170a (14:570a) +Route25EndBattleText1: TX_FAR _Route25EndBattleText1 db "@" -Route25AfterBattleText1: ; 5170f (14:570f) +Route25AfterBattleText1: TX_FAR _Route25AfterBattleText1 db "@" -Route25BattleText2: ; 51714 (14:5714) +Route25BattleText2: TX_FAR _Route25BattleText2 db "@" -Route25EndBattleText2: ; 51719 (14:5719) +Route25EndBattleText2: TX_FAR _Route25EndBattleText2 db "@" -Route25AfterBattleText2: ; 5171e (14:571e) +Route25AfterBattleText2: TX_FAR _Route25AfterBattleText2 db "@" -Route25BattleText3: ; 51723 (14:5723) +Route25BattleText3: TX_FAR _Route25BattleText3 db "@" -Route25EndBattleText3: ; 51728 (14:5728) +Route25EndBattleText3: TX_FAR _Route25EndBattleText3 db "@" -Route25AfterBattleText3: ; 5172d (14:572d) +Route25AfterBattleText3: TX_FAR _Route25AfterBattleText3 db "@" -Route25BattleText4: ; 51732 (14:5732) +Route25BattleText4: TX_FAR _Route25BattleText4 db "@" -Route25EndBattleText4: ; 51737 (14:5737) +Route25EndBattleText4: TX_FAR _Route25EndBattleText4 db "@" -Route25AfterBattleText4: ; 5173c (14:573c) +Route25AfterBattleText4: TX_FAR _Route25AfterBattleText4 db "@" -Route25BattleText5: ; 51741 (14:5741) +Route25BattleText5: TX_FAR _Route25BattleText5 db "@" -Route25EndBattleText5: ; 51746 (14:5746) +Route25EndBattleText5: TX_FAR _Route25EndBattleText5 db "@" -Route25AfterBattleText5: ; 5174b (14:574b) +Route25AfterBattleText5: TX_FAR _Route25AfterBattleText5 db "@" -Route25BattleText6: ; 51750 (14:5750) +Route25BattleText6: TX_FAR _Route25BattleText6 db "@" -Route25EndBattleText6: ; 51755 (14:5755) +Route25EndBattleText6: TX_FAR _Route25EndBattleText6 db "@" -Route25AfterBattleText6: ; 5175a (14:575a) +Route25AfterBattleText6: TX_FAR _Route25AfterBattleText6 db "@" -Route25BattleText7: ; 5175f (14:575f) +Route25BattleText7: TX_FAR _Route25BattleText7 db "@" -Route25EndBattleText7: ; 51764 (14:5764) +Route25EndBattleText7: TX_FAR _Route25EndBattleText7 db "@" -Route25AfterBattleText7: ; 51769 (14:5769) +Route25AfterBattleText7: TX_FAR _Route25AfterBattleText7 db "@" -Route25BattleText8: ; 5176e (14:576e) +Route25BattleText8: TX_FAR _Route25BattleText8 db "@" -Route25EndBattleText8: ; 51773 (14:5773) +Route25EndBattleText8: TX_FAR _Route25EndBattleText8 db "@" -Route25AfterBattleText8: ; 51778 (14:5778) +Route25AfterBattleText8: TX_FAR _Route25AfterBattleText8 db "@" -Route25BattleText9: ; 5177d (14:577d) +Route25BattleText9: TX_FAR _Route25BattleText9 db "@" -Route25EndBattleText9: ; 51782 (14:5782) +Route25EndBattleText9: TX_FAR _Route25EndBattleText9 db "@" -Route25AfterBattleText9: ; 51787 (14:5787) +Route25AfterBattleText9: TX_FAR _Route25AfterBattleText9 db "@" -Route25Text11: ; 5178c (14:578c) +Route25Text11: TX_FAR _Route25Text11 db "@" diff --git a/scripts/route2gate.asm b/scripts/route2gate.asm index 133d0e7c..34f1aa35 100755 --- a/scripts/route2gate.asm +++ b/scripts/route2gate.asm @@ -1,11 +1,11 @@ -Route2GateScript: ; 5d5d4 (17:55d4) +Route2GateScript: jp EnableAutoTextBoxDrawing -Route2GateTextPointers: ; 5d5d7 (17:55d7) +Route2GateTextPointers: dw Route2GateText1 dw Route2GateText2 -Route2GateText1: ; 5d5db (17:55db) +Route2GateText1: TX_ASM CheckEvent EVENT_GOT_HM05 jr nz, .asm_5d60d @@ -30,10 +30,10 @@ Route2GateText1: ; 5d5db (17:55db) .asm_5d613 jp TextScriptEnd -Route2GateText_5d616: ; 5d616 (17:5616) +Route2GateText_5d616: TX_FAR _Route2GateText_5d616 db "@" -Route2GateText2: ; 5d61b (17:561b) +Route2GateText2: TX_FAR _Route2GateText2 db "@" diff --git a/scripts/route2house.asm b/scripts/route2house.asm index d1312c91..95055aec 100755 --- a/scripts/route2house.asm +++ b/scripts/route2house.asm @@ -1,15 +1,15 @@ -Route2HouseScript: ; 1deed (7:5eed) +Route2HouseScript: jp EnableAutoTextBoxDrawing -Route2HouseTextPointers: ; 1def0 (7:5ef0) +Route2HouseTextPointers: dw Route2HouseText1 dw Route2HouseText2 -Route2HouseText1: ; 1def4 (7:5ef4) +Route2HouseText1: TX_FAR _Route2HouseText1 db "@" -Route2HouseText2: ; 1def9 (7:5ef9) +Route2HouseText2: TX_ASM ld a, $1 ld [wWhichTrade], a diff --git a/scripts/route3.asm b/scripts/route3.asm index 50c4e00d..739c3b03 100755 --- a/scripts/route3.asm +++ b/scripts/route3.asm @@ -1,4 +1,4 @@ -Route3Script: ; 554f8 (15:54f8) +Route3Script: call EnableAutoTextBoxDrawing ld hl, Route3TrainerHeader0 ld de, Route3ScriptPointers @@ -7,12 +7,12 @@ Route3Script: ; 554f8 (15:54f8) ld [W_ROUTE3CURSCRIPT], a ret -Route3ScriptPointers: ; 5550b (15:550b) +Route3ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route3TextPointers: ; 55511 (15:5511) +Route3TextPointers: dw Route3Text1 dw Route3Text2 dw Route3Text3 @@ -24,8 +24,8 @@ Route3TextPointers: ; 55511 (15:5511) dw Route3Text9 dw Route3Text10 -Route3TrainerHeaders: ; 55525 (15:5525) -Route3TrainerHeader0: ; 55525 (15:5525) +Route3TrainerHeaders: +Route3TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_0 @@ -34,7 +34,7 @@ Route3TrainerHeader0: ; 55525 (15:5525) dw Route3EndBattleText1 ; TextEndBattle dw Route3EndBattleText1 ; TextEndBattle -Route3TrainerHeader2: ; 55531 (15:5531) +Route3TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2 @@ -43,7 +43,7 @@ Route3TrainerHeader2: ; 55531 (15:5531) dw Route3EndBattleText2 ; TextEndBattle dw Route3EndBattleText2 ; TextEndBattle -Route3TrainerHeader3: ; 5553d (15:553d) +Route3TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3 @@ -52,7 +52,7 @@ Route3TrainerHeader3: ; 5553d (15:553d) dw Route3EndBattleText3 ; TextEndBattle dw Route3EndBattleText3 ; TextEndBattle -Route3TrainerHeader4: ; 55549 (15:5549) +Route3TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4 @@ -61,7 +61,7 @@ Route3TrainerHeader4: ; 55549 (15:5549) dw Route3EndBattleText4 ; TextEndBattle dw Route3EndBattleText4 ; TextEndBattle -Route3TrainerHeader5: ; 55555 (15:5555) +Route3TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5 @@ -70,7 +70,7 @@ Route3TrainerHeader5: ; 55555 (15:5555) dw Route3EndBattleText5 ; TextEndBattle dw Route3EndBattleText5 ; TextEndBattle -Route3TrainerHeader6: ; 55561 (15:5561) +Route3TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6 @@ -79,7 +79,7 @@ Route3TrainerHeader6: ; 55561 (15:5561) dw Route3EndBattleText6 ; TextEndBattle dw Route3EndBattleText6 ; TextEndBattle -Route3TrainerHeader7: ; 5556d (15:556d) +Route3TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1 @@ -88,7 +88,7 @@ Route3TrainerHeader7: ; 5556d (15:556d) dw Route3EndBattleText7 ; TextEndBattle dw Route3EndBattleText7 ; TextEndBattle -Route3TrainerHeader8: ; 55579 (15:5579) +Route3TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_8, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_8, 1 @@ -99,154 +99,154 @@ Route3TrainerHeader8: ; 55579 (15:5579) db $ff -Route3Text1: ; 55586 (15:5586) +Route3Text1: TX_FAR _Route3Text1 db "@" -Route3Text2: ; 5558b (15:558b) +Route3Text2: TX_ASM ld hl, Route3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route3BattleText1: ; 55595 (15:5595) +Route3BattleText1: TX_FAR _Route3BattleText1 db "@" -Route3EndBattleText1: ; 5559a (15:559a) +Route3EndBattleText1: TX_FAR _Route3EndBattleText1 db "@" -Route3AfterBattleText1: ; 5559f (15:559f) +Route3AfterBattleText1: TX_FAR _Route3AfterBattleText1 db "@" -Route3Text3: ; 555a4 (15:55a4) +Route3Text3: TX_ASM ld hl, Route3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route3BattleText2: ; 555ae (15:55ae) +Route3BattleText2: TX_FAR _Route3BattleText2 db "@" -Route3EndBattleText2: ; 555b3 (15:55b3) +Route3EndBattleText2: TX_FAR _Route3EndBattleText2 db "@" -Route3AfterBattleText2: ; 555b8 (15:55b8) +Route3AfterBattleText2: TX_FAR _Route3AfterBattleText2 db "@" -Route3Text4: ; 555bd (15:55bd) +Route3Text4: TX_ASM ld hl, Route3TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route3BattleText3: ; 555c7 (15:55c7) +Route3BattleText3: TX_FAR _Route3BattleText3 db "@" -Route3EndBattleText3: ; 555cc (15:55cc) +Route3EndBattleText3: TX_FAR _Route3EndBattleText3 db "@" -Route3AfterBattleText3: ; 555d1 (15:55d1) +Route3AfterBattleText3: TX_FAR _Route3AfterBattleText3 db "@" -Route3Text5: ; 555d6 (15:55d6) +Route3Text5: TX_ASM ld hl, Route3TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route3BattleText4: ; 555e0 (15:55e0) +Route3BattleText4: TX_FAR _Route3BattleText4 db "@" -Route3EndBattleText4: ; 555e5 (15:55e5) +Route3EndBattleText4: TX_FAR _Route3EndBattleText4 db "@" -Route3AfterBattleText4: ; 555ea (15:55ea) +Route3AfterBattleText4: TX_FAR _Route3AfterBattleText4 db "@" -Route3Text6: ; 555ef (15:55ef) +Route3Text6: TX_ASM ld hl, Route3TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route3BattleText5: ; 555f9 (15:55f9) +Route3BattleText5: TX_FAR _Route3BattleText5 db "@" -Route3EndBattleText5: ; 555fe (15:55fe) +Route3EndBattleText5: TX_FAR _Route3EndBattleText5 db "@" -Route3AfterBattleText5: ; 55603 (15:5603) +Route3AfterBattleText5: TX_FAR _Route3AfterBattleText5 db "@" -Route3Text7: ; 55608 (15:5608) +Route3Text7: TX_ASM ld hl, Route3TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route3BattleText6: ; 55612 (15:5612) +Route3BattleText6: TX_FAR _Route3BattleText6 db "@" -Route3EndBattleText6: ; 55617 (15:5617) +Route3EndBattleText6: TX_FAR _Route3EndBattleText6 db "@" -Route3AfterBattleText6: ; 5561c (15:561c) +Route3AfterBattleText6: TX_FAR _Route3AfterBattleText6 db "@" -Route3Text8: ; 55621 (15:5621) +Route3Text8: TX_ASM ld hl, Route3TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route3BattleText7: ; 5562b (15:562b) +Route3BattleText7: TX_FAR _Route3BattleText7 db "@" -Route3EndBattleText7: ; 55630 (15:5630) +Route3EndBattleText7: TX_FAR _Route3EndBattleText7 db "@" -Route3AfterBattleText7: ; 55635 (15:5635) +Route3AfterBattleText7: TX_FAR _Route3AfterBattleText7 db "@" -Route3Text9: ; 5563a (15:563a) +Route3Text9: TX_ASM ld hl, Route3TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route3BattleText8: ; 55644 (15:5644) +Route3BattleText8: TX_FAR _Route3BattleText8 db "@" -Route3EndBattleText8: ; 55649 (15:5649) +Route3EndBattleText8: TX_FAR _Route3EndBattleText8 db "@" -Route3AfterBattleText8: ; 5564e (15:564e) +Route3AfterBattleText8: TX_FAR _Route3AfterBattleText8 db "@" -Route3Text10: ; 55653 (15:5653) +Route3Text10: TX_FAR _Route3Text10 db "@" diff --git a/scripts/route4.asm b/scripts/route4.asm index f5bdd9e8..ff3be806 100755 --- a/scripts/route4.asm +++ b/scripts/route4.asm @@ -1,4 +1,4 @@ -Route4Script: ; 55658 (15:5658) +Route4Script: call EnableAutoTextBoxDrawing ld hl, Route4TrainerHeaders ld de, Route4ScriptPointers @@ -7,12 +7,12 @@ Route4Script: ; 55658 (15:5658) ld [W_ROUTE4CURSCRIPT], a ret -Route4ScriptPointers: ; 5566b (15:566b) +Route4ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route4TextPointers: ; 55671 (15:5671) +Route4TextPointers: dw Route4Text1 dw Route4Text2 dw PickUpItemText @@ -20,8 +20,8 @@ Route4TextPointers: ; 55671 (15:5671) dw Route4Text5 dw Route4Text6 -Route4TrainerHeaders: ; 5567d (15:567d) -Route4TrainerHeader0: ; 5567d (15:567d) +Route4TrainerHeaders: +Route4TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_4_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_4_TRAINER_0 @@ -32,32 +32,32 @@ Route4TrainerHeader0: ; 5567d (15:567d) db $ff -Route4Text1: ; 5568a (15:568a) +Route4Text1: TX_FAR _Route4Text1 db "@" -Route4Text2: ; 5568f (15:568f) +Route4Text2: TX_ASM ld hl, Route4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route4BattleText1: ; 55699 (15:5699) +Route4BattleText1: TX_FAR _Route4BattleText1 db "@" -Route4EndBattleText1: ; 5569e (15:569e) +Route4EndBattleText1: TX_FAR _Route4EndBattleText1 db "@" -Route4AfterBattleText1: ; 556a3 (15:56a3) +Route4AfterBattleText1: TX_FAR _Route4AfterBattleText1 db "@" -Route4Text5: ; 556a8 (15:56a8) +Route4Text5: TX_FAR _Route4Text5 db "@" -Route4Text6: ; 556ad (15:56ad) +Route4Text6: TX_FAR _Route4Text6 db "@" diff --git a/scripts/route5.asm b/scripts/route5.asm index 1f42bc4e..113212a4 100755 --- a/scripts/route5.asm +++ b/scripts/route5.asm @@ -1,9 +1,9 @@ -Route5Script: ; 556c6 (15:56c6) +Route5Script: jp EnableAutoTextBoxDrawing -Route5TextPointers: ; 556c9 (15:56c9) +Route5TextPointers: dw Route5Text1 -Route5Text1: ; 556cb (15:56cb) +Route5Text1: TX_FAR _Route5Text1 db "@" diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 6442fd83..63072d55 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -1,21 +1,21 @@ -Route5GateScript: ; 1df33 (7:5f33) +Route5GateScript: call EnableAutoTextBoxDrawing ld a, [W_ROUTE5GATECURSCRIPT] ld hl, Route5GateScriptPointers jp JumpTable -Route5GateScriptPointers: ; 1df3f (7:5f3f) +Route5GateScriptPointers: dw Route5GateScript0 dw Route5GateScript1 -Route5GateScript_1df43: ; 1df43 (7:5f43) +Route5GateScript_1df43: ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a jp StartSimulatingJoypadStates -Route5GateScript0: ; 1df50 (7:5f50) +Route5GateScript0: ld a, [wd728] bit 6, a ret nz @@ -45,12 +45,12 @@ Route5GateScript0: ; 1df50 (7:5f50) set 6, [hl] ret -CoordsData_1df8f: ; 1df8f (7:5f8f) +CoordsData_1df8f: db 3,3 db 3,4 db $ff -Route5GateScript1: ; 1df94 (7:5f94) +Route5GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -60,15 +60,15 @@ Route5GateScript1: ; 1df94 (7:5f94) ld [W_ROUTE5GATECURSCRIPT], a ret -Route5GateTextPointers: ; 1dfa4 (7:5fa4) +Route5GateTextPointers: dw Route5GateText1 dw Route5GateText2 dw Route5GateText3 -Route8GateText1: ; 1dfaa (7:5faa) -Route7GateText1: ; 1dfaa (7:5faa) -Route6GateText1: ; 1dfaa (7:5faa) -Route5GateText1: ; 1dfaa (7:5faa) +Route8GateText1: +Route7GateText1: +Route6GateText1: +Route5GateText1: TX_ASM ld a, [wd728] bit 6, a @@ -94,23 +94,23 @@ Route5GateText1: ; 1dfaa (7:5faa) call PrintText jp TextScriptEnd -Route8GateText2: ; 1dfe7 (7:5fe7) -Route7GateText2: ; 1dfe7 (7:5fe7) -Route6GateText2: ; 1dfe7 (7:5fe7) -Route5GateText2: ; 1dfe7 (7:5fe7) +Route8GateText2: +Route7GateText2: +Route6GateText2: +Route5GateText2: TX_FAR _SaffronGateText_1dfe7 db "@" -Route8GateText3: ; 1dfec (7:5fec) -Route7GateText3: ; 1dfec (7:5fec) -Route6GateText3: ; 1dfec (7:5fec) -Route5GateText3: ; 1dfec (7:5fec) +Route8GateText3: +Route7GateText3: +Route6GateText3: +Route5GateText3: TX_FAR _SaffronGateText_8aaa9 db $11 TX_FAR _SaffronGateText_1dff1 db "@" -SaffronGateText_1dff6: ; 1dff6 (7:5ff6) +SaffronGateText_1dff6: TX_FAR _SaffronGateText_1dff6 db "@" diff --git a/scripts/route6.asm b/scripts/route6.asm index 8ef32a42..b499b2ef 100755 --- a/scripts/route6.asm +++ b/scripts/route6.asm @@ -1,4 +1,4 @@ -Route6Script: ; 590b0 (16:50b0) +Route6Script: call EnableAutoTextBoxDrawing ld hl, Route6TrainerHeaders ld de, Route6ScriptPointers @@ -7,12 +7,12 @@ Route6Script: ; 590b0 (16:50b0) ld [W_ROUTE6CURSCRIPT], a ret -Route6ScriptPointers: ; 590c3 (16:50c3) +Route6ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route6TextPointers: ; 590c9 (16:50c9) +Route6TextPointers: dw Route6Text1 dw Route6Text2 dw Route6Text3 @@ -21,8 +21,8 @@ Route6TextPointers: ; 590c9 (16:50c9) dw Route6Text6 dw Route6Text7 -Route6TrainerHeaders: ; 590d7 (16:50d7) -Route6TrainerHeader0: ; 590d7 (16:50d7) +Route6TrainerHeaders: +Route6TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_0 @@ -31,7 +31,7 @@ Route6TrainerHeader0: ; 590d7 (16:50d7) dw Route6EndBattleText1 ; TextEndBattle dw Route6EndBattleText1 ; TextEndBattle -Route6TrainerHeader1: ; 590e3 (16:50e3) +Route6TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_1 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_1 @@ -40,7 +40,7 @@ Route6TrainerHeader1: ; 590e3 (16:50e3) dw Route6EndBattleText2 ; TextEndBattle dw Route6EndBattleText2 ; TextEndBattle -Route6TrainerHeader2: ; 590ef (16:50ef) +Route6TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_2 @@ -49,7 +49,7 @@ Route6TrainerHeader2: ; 590ef (16:50ef) dw Route6EndBattleText3 ; TextEndBattle dw Route6EndBattleText3 ; TextEndBattle -Route6TrainerHeader3: ; 590fb (16:50fb) +Route6TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_3 @@ -58,7 +58,7 @@ Route6TrainerHeader3: ; 590fb (16:50fb) dw Route6EndBattleText4 ; TextEndBattle dw Route6EndBattleText4 ; TextEndBattle -Route6TrainerHeader4: ; 59107 (16:5107) +Route6TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_4 @@ -67,7 +67,7 @@ Route6TrainerHeader4: ; 59107 (16:5107) dw Route6EndBattleText5 ; TextEndBattle dw Route6EndBattleText5 ; TextEndBattle -Route6TrainerHeader5: ; 59113 (16:5113) +Route6TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_5 @@ -78,35 +78,35 @@ Route6TrainerHeader5: ; 59113 (16:5113) db $ff -Route6Text1: ; 59120 (16:5120) +Route6Text1: TX_ASM ld hl, Route6TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route6BattleText1: ; 5912a (16:512a) +Route6BattleText1: TX_FAR _Route6BattleText1 db "@" -Route6EndBattleText1: ; 5912f (16:512f) +Route6EndBattleText1: TX_FAR _Route6EndBattleText1 db "@" -Route6AfterBattleText1: ; 59134 (16:5134) +Route6AfterBattleText1: TX_FAR _Route6AfterBattleText1 db "@" -Route6Text2: ; 59139 (16:5139) +Route6Text2: TX_ASM ld hl, Route6TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route6BattleText2: ; 59143 (16:5143) +Route6BattleText2: TX_FAR _Route6BattleText2 db "@" -Route6EndBattleText2: ; 59148 (16:5148) +Route6EndBattleText2: TX_FAR _Route6EndBattleText2 db "@" @@ -114,78 +114,78 @@ Route6AfterBattleText2: TX_FAR _Route6AfterBattleText2 db "@" -Route6Text3: ; 5914d (16:514d) +Route6Text3: TX_ASM ld hl, Route6TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route6BattleText3: ; 59157 (16:5157) +Route6BattleText3: TX_FAR _Route6BattleText3 db "@" -Route6EndBattleText3: ; 5915c (16:515c) +Route6EndBattleText3: TX_FAR _Route6EndBattleText3 db "@" -Route6AfterBattleText3: ; 59161 (16:5161) +Route6AfterBattleText3: TX_FAR _Route6AfterBattleText3 db "@" -Route6Text4: ; 59166 (16:5166) +Route6Text4: TX_ASM ld hl, Route6TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route6BattleText4: ; 59170 (16:5170) +Route6BattleText4: TX_FAR _Route6BattleText4 db "@" -Route6EndBattleText4: ; 59175 (16:5175) +Route6EndBattleText4: TX_FAR _Route6EndBattleText4 db "@" -Route6AfterBattleText4: ; 5917a (16:517a) +Route6AfterBattleText4: TX_FAR _Route6AfterBattleText4 db "@" -Route6Text5: ; 5917f (16:517f) +Route6Text5: TX_ASM ld hl, Route6TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route6BattleText5: ; 59189 (16:5189) +Route6BattleText5: TX_FAR _Route6BattleText5 db "@" -Route6EndBattleText5: ; 5918e (16:518e) +Route6EndBattleText5: TX_FAR _Route6EndBattleText5 db "@" -Route6AfterBattleText5: ; 59193 (16:5193) +Route6AfterBattleText5: TX_FAR _Route6AfterBattleText5 db "@" -Route6Text6: ; 59198 (16:5198) +Route6Text6: TX_ASM ld hl, Route6TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route6BattleText6: ; 591a2 (16:51a2) +Route6BattleText6: TX_FAR _Route6BattleText6 db "@" -Route6EndBattleText6: ; 591a7 (16:51a7) +Route6EndBattleText6: TX_FAR _Route6EndBattleText6 db "@" -Route6AfterBattleText6: ; 591ac (16:51ac) +Route6AfterBattleText6: TX_FAR _Route6AfterBattleText6 db "@" -Route6Text7: ; 591b1 (16:51b1) +Route6Text7: TX_FAR _Route6Text7 db "@" diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm index dd179e28..b8876185 100755 --- a/scripts/route6gate.asm +++ b/scripts/route6gate.asm @@ -1,15 +1,15 @@ -Route6GateScript: ; 1e03d (7:603d) +Route6GateScript: call EnableAutoTextBoxDrawing ld hl, Route6GateScriptPointers ld a, [W_ROUTE6GATECURSCRIPT] call JumpTable ret -Route6GateScriptPointers: ; 1e04a (7:604a) +Route6GateScriptPointers: dw Route6GateScript0 dw Route6GateScript1 -Route6GateScript0: ; 1e04e (7:604e) +Route6GateScript0: ld a, [wd728] bit 6, a ret nz @@ -38,11 +38,11 @@ Route6GateScript0: ; 1e04e (7:604e) ld [hSpriteIndexOrTextID], a jp DisplayTextID -CoordsData_1e08c: ; 1e08c (7:608c) +CoordsData_1e08c: db $02,$03 db $02,$04,$FF -Route6GateScript1: ; 1e091 (7:6091) +Route6GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -52,7 +52,7 @@ Route6GateScript1: ; 1e091 (7:6091) ld [W_ROUTE6GATECURSCRIPT], a ret -Route6GateScript_1e0a1: ; 1e0a1 (7:60a1) +Route6GateScript_1e0a1: ld hl, wd730 set 7, [hl] ld a, $80 @@ -64,7 +64,7 @@ Route6GateScript_1e0a1: ; 1e0a1 (7:60a1) ld [wOverrideSimulatedJoypadStatesMask], a ret -Route6GateTextPointers: ; 1e0b8 (7:60b8) +Route6GateTextPointers: dw Route6GateText1 dw Route6GateText2 dw Route6GateText3 diff --git a/scripts/route7.asm b/scripts/route7.asm index 55183d16..af353821 100755 --- a/scripts/route7.asm +++ b/scripts/route7.asm @@ -1,10 +1,10 @@ -Route7Script: ; 480eb (12:40eb) +Route7Script: call EnableAutoTextBoxDrawing ret -Route7TextPointers: ; 480ef (12:40ef) +Route7TextPointers: dw Route7Text1 -Route7Text1: ; 480f1 (12:40f1) +Route7Text1: TX_FAR _Route7Text1 db "@" diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm index 7f87b78c..f97cb03b 100755 --- a/scripts/route7gate.asm +++ b/scripts/route7gate.asm @@ -1,15 +1,15 @@ -Route7GateScript: ; 1e100 (7:6100) +Route7GateScript: call EnableAutoTextBoxDrawing ld a, [W_ROUTE7GATECURSCRIPT] ld hl, Route7GateScriptPointers call JumpTable ret -Route7GateScriptPointers: ; 1e10d (7:610d) +Route7GateScriptPointers: dw Route7GateScript0 dw Route7GateScript1 -Route7GateScript_1e111: ; 1e111 (7:6111) +Route7GateScript_1e111: ld hl, wd730 set 7, [hl] ld a, $20 @@ -21,7 +21,7 @@ Route7GateScript_1e111: ; 1e111 (7:6111) ld [wOverrideSimulatedJoypadStatesMask], a ret -Route7GateScript0: ; 1e128 (7:6128) +Route7GateScript0: ld a, [wd728] bit 6, a ret nz @@ -51,12 +51,12 @@ Route7GateScript0: ; 1e128 (7:6128) set 6, [hl] ret -CoordsData_1e167: ; 1e167 (7:6167) +CoordsData_1e167: db 3,3 db 4,3 db $ff -Route7GateScript1: ; 1e16c (7:616c) +Route7GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -67,7 +67,7 @@ Route7GateScript1: ; 1e16c (7:616c) ld [W_CURMAPSCRIPT], a ret -Route7GateTextPointers: ; 1e17f (7:617f) +Route7GateTextPointers: dw Route7GateText1 dw Route7GateText2 dw Route7GateText3 diff --git a/scripts/route8.asm b/scripts/route8.asm index c734c62d..0e437775 100755 --- a/scripts/route8.asm +++ b/scripts/route8.asm @@ -1,4 +1,4 @@ -Route8Script: ; 591b6 (16:51b6) +Route8Script: call EnableAutoTextBoxDrawing ld hl, Route8TrainerHeaders ld de, Route8ScriptPointers @@ -7,12 +7,12 @@ Route8Script: ; 591b6 (16:51b6) ld [W_ROUTE8CURSCRIPT], a ret -Route8ScriptPointers: ; 591c9 (16:51c9) +Route8ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route8TextPointers: ; 591cf (16:51cf) +Route8TextPointers: dw Route8Text1 dw Route8Text2 dw Route8Text3 @@ -24,8 +24,8 @@ Route8TextPointers: ; 591cf (16:51cf) dw Route8Text9 dw Route8Text10 -Route8TrainerHeaders: ; 591e3 (16:51e3) -Route8TrainerHeader0: ; 591e3 (16:51e3) +Route8TrainerHeaders: +Route8TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_0 @@ -34,7 +34,7 @@ Route8TrainerHeader0: ; 591e3 (16:51e3) dw Route8EndBattleText1 ; TextEndBattle dw Route8EndBattleText1 ; TextEndBattle -Route8TrainerHeader1: ; 591ef (16:51ef) +Route8TrainerHeader1: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_1 @@ -43,7 +43,7 @@ Route8TrainerHeader1: ; 591ef (16:51ef) dw Route8EndBattleText2 ; TextEndBattle dw Route8EndBattleText2 ; TextEndBattle -Route8TrainerHeader2: ; 591fb (16:51fb) +Route8TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_2 @@ -52,7 +52,7 @@ Route8TrainerHeader2: ; 591fb (16:51fb) dw Route8EndBattleText3 ; TextEndBattle dw Route8EndBattleText3 ; TextEndBattle -Route8TrainerHeader3: ; 59207 (16:5207) +Route8TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_3 @@ -61,7 +61,7 @@ Route8TrainerHeader3: ; 59207 (16:5207) dw Route8EndBattleText4 ; TextEndBattle dw Route8EndBattleText4 ; TextEndBattle -Route8TrainerHeader4: ; 59213 (16:5213) +Route8TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_4 @@ -70,7 +70,7 @@ Route8TrainerHeader4: ; 59213 (16:5213) dw Route8EndBattleText5 ; TextEndBattle dw Route8EndBattleText5 ; TextEndBattle -Route8TrainerHeader5: ; 5921f (16:521f) +Route8TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_5 @@ -79,7 +79,7 @@ Route8TrainerHeader5: ; 5921f (16:521f) dw Route8EndBattleText6 ; TextEndBattle dw Route8EndBattleText6 ; TextEndBattle -Route8TrainerHeader6: ; 5922b (16:522b) +Route8TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_6 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_6 @@ -88,7 +88,7 @@ Route8TrainerHeader6: ; 5922b (16:522b) dw Route8EndBattleText7 ; TextEndBattle dw Route8EndBattleText7 ; TextEndBattle -Route8TrainerHeader7: ; 59237 (16:5237) +Route8TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_7, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_7, 1 @@ -97,7 +97,7 @@ Route8TrainerHeader7: ; 59237 (16:5237) dw Route8EndBattleText8 ; TextEndBattle dw Route8EndBattleText8 ; TextEndBattle -Route8TrainerHeader8: ; 59243 (16:5243) +Route8TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_8, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_8, 1 @@ -108,168 +108,168 @@ Route8TrainerHeader8: ; 59243 (16:5243) db $ff -Route8Text1: ; 59250 (16:5250) +Route8Text1: TX_ASM ld hl, Route8TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route8BattleText1: ; 5925a (16:525a) +Route8BattleText1: TX_FAR _Route8BattleText1 db "@" -Route8EndBattleText1: ; 5925f (16:525f) +Route8EndBattleText1: TX_FAR _Route8EndBattleText1 db "@" -Route8AfterBattleText1: ; 59264 (16:5264) +Route8AfterBattleText1: TX_FAR _Route8AfterBattleText1 db "@" -Route8Text2: ; 59269 (16:5269) +Route8Text2: TX_ASM ld hl, Route8TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route8BattleText2: ; 59273 (16:5273) +Route8BattleText2: TX_FAR _Route8BattleText2 db "@" -Route8EndBattleText2: ; 59278 (16:5278) +Route8EndBattleText2: TX_FAR _Route8EndBattleText2 db "@" -Route8AfterBattleText2: ; 5927d (16:527d) +Route8AfterBattleText2: TX_FAR _Route8AfterBattleText2 db "@" -Route8Text3: ; 59282 (16:5282) +Route8Text3: TX_ASM ld hl, Route8TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route8BattleText3: ; 5928c (16:528c) +Route8BattleText3: TX_FAR _Route8BattleText3 db "@" -Route8EndBattleText3: ; 59291 (16:5291) +Route8EndBattleText3: TX_FAR _Route8EndBattleText3 db "@" -Route8AfterBattleText3: ; 59296 (16:5296) +Route8AfterBattleText3: TX_FAR _Route8AfterBattleText3 db "@" -Route8Text4: ; 5929b (16:529b) +Route8Text4: TX_ASM ld hl, Route8TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route8BattleText4: ; 592a5 (16:52a5) +Route8BattleText4: TX_FAR _Route8BattleText4 db "@" -Route8EndBattleText4: ; 592aa (16:52aa) +Route8EndBattleText4: TX_FAR _Route8EndBattleText4 db "@" -Route8AfterBattleText4: ; 592af (16:52af) +Route8AfterBattleText4: TX_FAR _Route8AfterBattleText4 db "@" -Route8Text5: ; 592b4 (16:52b4) +Route8Text5: TX_ASM ld hl, Route8TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route8BattleText5: ; 592be (16:52be) +Route8BattleText5: TX_FAR _Route8BattleText5 db "@" -Route8EndBattleText5: ; 592c3 (16:52c3) +Route8EndBattleText5: TX_FAR _Route8EndBattleText5 db "@" -Route8AfterBattleText5: ; 592c8 (16:52c8) +Route8AfterBattleText5: TX_FAR _Route8AfterBattleText5 db "@" -Route8Text6: ; 592cd (16:52cd) +Route8Text6: TX_ASM ld hl, Route8TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route8BattleText6: ; 592d7 (16:52d7) +Route8BattleText6: TX_FAR _Route8BattleText6 db "@" -Route8EndBattleText6: ; 592dc (16:52dc) +Route8EndBattleText6: TX_FAR _Route8EndBattleText6 db "@" -Route8AfterBattleText6: ; 592e1 (16:52e1) +Route8AfterBattleText6: TX_FAR _Route8AfterBattleText6 db "@" -Route8Text7: ; 592e6 (16:52e6) +Route8Text7: TX_ASM ld hl, Route8TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route8BattleText7: ; 592f0 (16:52f0) +Route8BattleText7: TX_FAR _Route8BattleText7 db "@" -Route8EndBattleText7: ; 592f5 (16:52f5) +Route8EndBattleText7: TX_FAR _Route8EndBattleText7 db "@" -Route8AfterBattleText7: ; 592fa (16:52fa) +Route8AfterBattleText7: TX_FAR _Route8AfterBattleText7 db "@" -Route8Text8: ; 592ff (16:52ff) +Route8Text8: TX_ASM ld hl, Route8TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route8BattleText8: ; 59309 (16:5309) +Route8BattleText8: TX_FAR _Route8BattleText8 db "@" -Route8EndBattleText8: ; 5930e (16:530e) +Route8EndBattleText8: TX_FAR _Route8EndBattleText8 db "@" -Route8AfterBattleText8: ; 59313 (16:5313) +Route8AfterBattleText8: TX_FAR _Route8AfterBattleText8 db "@" -Route8Text9: ; 59318 (16:5318) +Route8Text9: TX_ASM ld hl, Route8TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route8BattleText9: ; 59322 (16:5322) +Route8BattleText9: TX_FAR _Route8BattleText9 db "@" -Route8EndBattleText9: ; 59327 (16:5327) +Route8EndBattleText9: TX_FAR _Route8EndBattleText9 db "@" -Route8AfterBattleText9: ; 5932c (16:532c) +Route8AfterBattleText9: TX_FAR _Route8AfterBattleText9 db "@" -Route8Text10: ; 59331 (16:5331) +Route8Text10: TX_FAR _Route8Text10 db "@" diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index 5a26b424..fe414ae1 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -1,14 +1,14 @@ -Route8GateScript: ; 1e1c7 (7:61c7) +Route8GateScript: call EnableAutoTextBoxDrawing ld hl, Route8GateScriptPointers ld a, [W_ROUTE8GATECURSCRIPT] jp JumpTable -Route8GateScriptPointers: ; 1e1d3 (7:61d3) +Route8GateScriptPointers: dw Route8GateScript0 dw Route8GateScript1 -Route8GateScript_1e1d7: ; 1e1d7 (7:61d7) +Route8GateScript_1e1d7: ld hl, wd730 set 7, [hl] ld a, $10 @@ -20,7 +20,7 @@ Route8GateScript_1e1d7: ; 1e1d7 (7:61d7) ld [wOverrideSimulatedJoypadStatesMask], a ret -Route8GateScript0: ; 1e1ee (7:61ee) +Route8GateScript0: ld a, [wd728] bit 6, a ret nz @@ -49,12 +49,12 @@ Route8GateScript0: ; 1e1ee (7:61ee) ld [hSpriteIndexOrTextID], a jp DisplayTextID -CoordsData_1e22c: ; 1e22c (7:622c) +CoordsData_1e22c: db 3,2 db 4,2 db $ff -Route8GateScript1: ; 1e231 (7:6231) +Route8GateScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -64,7 +64,7 @@ Route8GateScript1: ; 1e231 (7:6231) ld [W_ROUTE8GATECURSCRIPT], a ret -Route8GateTextPointers: ; 1e241 (7:6241) +Route8GateTextPointers: dw Route8GateText1 dw Route8GateText2 dw Route8GateText3 diff --git a/scripts/route9.asm b/scripts/route9.asm index 5de98173..8dbb19cb 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -1,4 +1,4 @@ -Route9Script: ; 556bc (15:56bc) +Route9Script: call EnableAutoTextBoxDrawing ld hl, Route9TrainerHeaders ld de, Route9ScriptPointers @@ -7,12 +7,12 @@ Route9Script: ; 556bc (15:56bc) ld [W_ROUTE9CURSCRIPT], a ret -Route9ScriptPointers: ; 556cf (15:56cf) +Route9ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route9TextPointers: ; 556d5 (15:56d5) +Route9TextPointers: dw Route9Text1 dw Route9TextAJ dw Route9Text3 @@ -25,8 +25,8 @@ Route9TextPointers: ; 556d5 (15:56d5) dw PickUpItemText dw Route9Text11 -Route9TrainerHeaders: ; 556eb (15:56eb) -Route9TrainerHeader0: ; 556eb (15:56eb) +Route9TrainerHeaders: +Route9TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_0 @@ -35,7 +35,7 @@ Route9TrainerHeader0: ; 556eb (15:56eb) dw Route9EndBattleText1 ; TextEndBattle dw Route9EndBattleText1 ; TextEndBattle -Route9TrainerHeader2: ; 556f7 (15:56f7) +Route9TrainerHeader2: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 @@ -44,7 +44,7 @@ Route9TrainerHeader2: ; 556f7 (15:56f7) dw Route9EndBattleTextAJ ; TextEndBattle dw Route9EndBattleTextAJ ; TextEndBattle -Route9TrainerHeader3: ; 55703 (15:5703) +Route9TrainerHeader3: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3 @@ -53,7 +53,7 @@ Route9TrainerHeader3: ; 55703 (15:5703) dw Route9EndBattleText3 ; TextEndBattle dw Route9EndBattleText3 ; TextEndBattle -Route9TrainerHeader4: ; 5570f (15:570f) +Route9TrainerHeader4: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4 @@ -62,7 +62,7 @@ Route9TrainerHeader4: ; 5570f (15:570f) dw Route9EndBattleText4 ; TextEndBattle dw Route9EndBattleText4 ; TextEndBattle -Route9TrainerHeader5: ; 5571b (15:571b) +Route9TrainerHeader5: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5 @@ -71,7 +71,7 @@ Route9TrainerHeader5: ; 5571b (15:571b) dw Route9EndBattleText5 ; TextEndBattle dw Route9EndBattleText5 ; TextEndBattle -Route9TrainerHeader6: ; 55727 (15:5727) +Route9TrainerHeader6: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6 @@ -80,7 +80,7 @@ Route9TrainerHeader6: ; 55727 (15:5727) dw Route9EndBattleText6 ; TextEndBattle dw Route9EndBattleText6 ; TextEndBattle -Route9TrainerHeader7: ; 55733 (15:5733) +Route9TrainerHeader7: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7 @@ -89,7 +89,7 @@ Route9TrainerHeader7: ; 55733 (15:5733) dw Route9EndBattleText7 ; TextEndBattle dw Route9EndBattleText7 ; TextEndBattle -Route9TrainerHeader8: ; 5573f (15:573f) +Route9TrainerHeader8: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1 @@ -98,7 +98,7 @@ Route9TrainerHeader8: ; 5573f (15:573f) dw Route9EndBattleText8 ; TextEndBattle dw Route9EndBattleText8 ; TextEndBattle -Route9TrainerHeader9: ; 5574b (15:574b) +Route9TrainerHeader9: dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_9, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_9, 1 @@ -109,161 +109,161 @@ Route9TrainerHeader9: ; 5574b (15:574b) db $ff -Route9Text1: ; 55758 (15:5758) +Route9Text1: TX_ASM ld hl, Route9TrainerHeader0 jr Route9TalkToTrainer -Route9TextAJ: ; 5575e (15:575e) +Route9TextAJ: TX_ASM ld hl, Route9TrainerHeader2 jr Route9TalkToTrainer -Route9Text3: ; 55764 (15:5764) +Route9Text3: TX_ASM ld hl, Route9TrainerHeader3 jr Route9TalkToTrainer -Route9Text4: ; 5576a (15:576a) +Route9Text4: TX_ASM ld hl, Route9TrainerHeader4 jr Route9TalkToTrainer -Route9Text5: ; 55770 (15:5770) +Route9Text5: TX_ASM ld hl, Route9TrainerHeader5 jr Route9TalkToTrainer -Route9Text6: ; 55776 (15:5776) +Route9Text6: TX_ASM ld hl, Route9TrainerHeader6 jr Route9TalkToTrainer -Route9Text7: ; 5577c (15:577c) +Route9Text7: TX_ASM ld hl, Route9TrainerHeader7 jr Route9TalkToTrainer -Route9Text8: ; 55782 (15:5782) +Route9Text8: TX_ASM ld hl, Route9TrainerHeader8 jr Route9TalkToTrainer -Route9Text9: ; 55788 (15:5788) +Route9Text9: TX_ASM ld hl, Route9TrainerHeader9 -Route9TalkToTrainer: ; 5578c (15:578c) +Route9TalkToTrainer: call TalkToTrainer jp TextScriptEnd -Route9BattleText1: ; 55792 (15:5792) +Route9BattleText1: TX_FAR _Route9BattleText1 db "@" -Route9EndBattleText1: ; 55797 (15:5797) +Route9EndBattleText1: TX_FAR _Route9EndBattleText1 db "@" -Route9AfterBattleText1: ; 5579c (15:579c) +Route9AfterBattleText1: TX_FAR _Route9AfterBattleText1 db "@" -Route9BattleTextAJ: ; 557a1 (15:57a1) +Route9BattleTextAJ: TX_FAR _Route9BattleTextAJ db "@" -Route9EndBattleTextAJ: ; 557a6 (15:57a6) +Route9EndBattleTextAJ: TX_FAR _Route9EndBattleTextAJ db "@" -Route9AfterBattleTextAJ: ; 557ab (15:57ab) +Route9AfterBattleTextAJ: TX_FAR _Route9AfterBattleTextAJ db "@" -Route9BattleText3: ; 557b0 (15:57b0) +Route9BattleText3: TX_FAR _Route9BattleText3 db "@" -Route9EndBattleText3: ; 557b5 (15:57b5) +Route9EndBattleText3: TX_FAR _Route9EndBattleText3 db "@" -Route9AfterBattleText3: ; 557ba (15:57ba) +Route9AfterBattleText3: TX_FAR _Route9AfterBattleText3 db "@" -Route9BattleText4: ; 557bf (15:57bf) +Route9BattleText4: TX_FAR _Route9BattleText4 db "@" -Route9EndBattleText4: ; 557c4 (15:57c4) +Route9EndBattleText4: TX_FAR _Route9EndBattleText4 db "@" -Route9AfterBattleText4: ; 557c9 (15:57c9) +Route9AfterBattleText4: TX_FAR _Route9AfterBattleText4 db "@" -Route9BattleText5: ; 557ce (15:57ce) +Route9BattleText5: TX_FAR _Route9BattleText5 db "@" -Route9EndBattleText5: ; 557d3 (15:57d3) +Route9EndBattleText5: TX_FAR _Route9EndBattleText5 db "@" -Route9AfterBattleText5: ; 557d8 (15:57d8) +Route9AfterBattleText5: TX_FAR _Route9AfterBattleText5 db "@" -Route9BattleText6: ; 557dd (15:57dd) +Route9BattleText6: TX_FAR _Route9BattleText6 db "@" -Route9EndBattleText6: ; 557e2 (15:57e2) +Route9EndBattleText6: TX_FAR _Route9EndBattleText6 db "@" -Route9AfterBattleText6: ; 557e7 (15:57e7) +Route9AfterBattleText6: TX_FAR _Route9AfterBattleText6 db "@" -Route9BattleText7: ; 557ec (15:57ec) +Route9BattleText7: TX_FAR _Route9BattleText7 db "@" -Route9EndBattleText7: ; 557f1 (15:57f1) +Route9EndBattleText7: TX_FAR _Route9EndBattleText7 db "@" -Route9AfterBattleText7: ; 557f6 (15:57f6) +Route9AfterBattleText7: TX_FAR _Route9AfterBattleText7 db "@" -Route9BattleText8: ; 557fb (15:57fb) +Route9BattleText8: TX_FAR _Route9BattleText8 db "@" -Route9EndBattleText8: ; 55800 (15:5800) +Route9EndBattleText8: TX_FAR _Route9EndBattleText8 db "@" -Route9AfterBattleText8: ; 55805 (15:5805) +Route9AfterBattleText8: TX_FAR _Route9AfterBattleText8 db "@" -Route9BattleText9: ; 5580a (15:580a) +Route9BattleText9: TX_FAR _Route9BattleText9 db "@" -Route9EndBattleText9: ; 5580f (15:580f) +Route9EndBattleText9: TX_FAR _Route9EndBattleText9 db "@" -Route9AfterBattleText9: ; 55814 (15:5814) +Route9AfterBattleText9: TX_FAR _Route9AfterBattleText9 db "@" -Route9Text11: ; 55819 (15:5819) +Route9Text11: TX_FAR _Route9Text11 db "@" diff --git a/scripts/safarizonecenter.asm b/scripts/safarizonecenter.asm index 40042038..d796c403 100755 --- a/scripts/safarizonecenter.asm +++ b/scripts/safarizonecenter.asm @@ -1,15 +1,15 @@ -SafariZoneCenterScript: ; 45bb2 (11:5bb2) +SafariZoneCenterScript: jp EnableAutoTextBoxDrawing -SafariZoneCenterTextPointers: ; 45bb5 (11:5bb5) +SafariZoneCenterTextPointers: dw PickUpItemText dw SafariZoneCenterText2 dw SafariZoneCenterText3 -SafariZoneCenterText2: ; 45bbb (11:5bbb) +SafariZoneCenterText2: TX_FAR _SafariZoneCenterText2 db "@" -SafariZoneCenterText3: ; 45bc0 (11:5bc0) +SafariZoneCenterText3: TX_FAR _SafariZoneCenterText3 db "@" diff --git a/scripts/safarizoneeast.asm b/scripts/safarizoneeast.asm index 55ea5aa6..25d0ee30 100755 --- a/scripts/safarizoneeast.asm +++ b/scripts/safarizoneeast.asm @@ -1,7 +1,7 @@ -SafariZoneEastScript: ; 4586b (11:586b) +SafariZoneEastScript: jp EnableAutoTextBoxDrawing -SafariZoneEastTextPointers: ; 4586e (11:586e) +SafariZoneEastTextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText @@ -10,14 +10,14 @@ SafariZoneEastTextPointers: ; 4586e (11:586e) dw SafariZoneEastText6 dw SafariZoneEastText7 -SafariZoneEastText5: ; 4587c (11:587c) +SafariZoneEastText5: TX_FAR _SafariZoneEastText5 db "@" -SafariZoneEastText6: ; 45881 (11:5881) +SafariZoneEastText6: TX_FAR _SafariZoneEastText6 db "@" -SafariZoneEastText7: ; 45886 (11:5886) +SafariZoneEastText7: TX_FAR _SafariZoneEastText7 db "@" diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index a83944fc..97578475 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -1,11 +1,11 @@ -SafariZoneEntranceScript: ; 751cd (1d:51cd) +SafariZoneEntranceScript: call EnableAutoTextBoxDrawing ld hl, SafariZoneEntranceScriptPointers ld a, [wSafariZoneEntranceCurScript] call JumpTable ret -SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) +SafariZoneEntranceScriptPointers: dw .SafariZoneEntranceScript0 dw .SafariZoneEntranceScript1 dw .SafariZoneEntranceScript2 @@ -43,7 +43,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld [wSafariZoneEntranceCurScript], a ret -.CoordsData_75221: ; 75221 (1d:5221) +.CoordsData_75221: db $02, $03 db $02, $04 db $FF @@ -133,7 +133,7 @@ SafariZoneEntranceScript_752b4: and a ret -SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) +SafariZoneEntranceTextPointers: dw .SafariZoneEntranceText1 dw .SafariZoneEntranceText2 dw .SafariZoneEntranceText1 diff --git a/scripts/safarizonenorth.asm b/scripts/safarizonenorth.asm index 6ea5f902..b870c99e 100755 --- a/scripts/safarizonenorth.asm +++ b/scripts/safarizonenorth.asm @@ -1,7 +1,7 @@ -SafariZoneNorthScript: ; 459ab (11:59ab) +SafariZoneNorthScript: jp EnableAutoTextBoxDrawing -SafariZoneNorthTextPointers: ; 459ae (11:59ae) +SafariZoneNorthTextPointers: dw PickUpItemText dw PickUpItemText dw SafariZoneNorthText3 @@ -10,22 +10,22 @@ SafariZoneNorthTextPointers: ; 459ae (11:59ae) dw SafariZoneNorthText6 dw SafariZoneNorthText7 -SafariZoneNorthText3: ; 459bc (11:59bc) +SafariZoneNorthText3: TX_FAR _SafariZoneNorthText3 db "@" -SafariZoneNorthText4: ; 459c1 (11:59c1) +SafariZoneNorthText4: TX_FAR _SafariZoneNorthText4 db "@" -SafariZoneNorthText5: ; 459c6 (11:59c6) +SafariZoneNorthText5: TX_FAR _SafariZoneNorthText5 db "@" -SafariZoneNorthText6: ; 459cb (11:59cb) +SafariZoneNorthText6: TX_FAR _SafariZoneNorthText6 db "@" -SafariZoneNorthText7: ; 459d0 (11:59d0) +SafariZoneNorthText7: TX_FAR _SafariZoneNorthText7 db "@" diff --git a/scripts/safarizoneresthouse1.asm b/scripts/safarizoneresthouse1.asm index 424714e4..1d43890d 100755 --- a/scripts/safarizoneresthouse1.asm +++ b/scripts/safarizoneresthouse1.asm @@ -1,14 +1,14 @@ -SafariZoneRestHouse1Script: ; 45ced (11:5ced) +SafariZoneRestHouse1Script: jp EnableAutoTextBoxDrawing -SafariZoneRestHouse1TextPointers: ; 45cf0 (11:5cf0) +SafariZoneRestHouse1TextPointers: dw SafariZoneRestHouse1Text1 dw SafariZoneRestHouse1Text2 -SafariZoneRestHouse1Text1: ; 45cf4 (11:5cf4) +SafariZoneRestHouse1Text1: TX_FAR _SafariZoneRestHouse1Text1 db "@" -SafariZoneRestHouse1Text2: ; 45cf9 (11:5cf9) +SafariZoneRestHouse1Text2: TX_FAR _SafariZoneRestHouse1Text2 db "@" diff --git a/scripts/safarizoneresthouse2.asm b/scripts/safarizoneresthouse2.asm index 23cd53b2..4cd512f2 100755 --- a/scripts/safarizoneresthouse2.asm +++ b/scripts/safarizoneresthouse2.asm @@ -1,20 +1,20 @@ -SafariZoneRestHouse2Script: ; 45d2a (11:5d2a) +SafariZoneRestHouse2Script: call EnableAutoTextBoxDrawing ret -SafariZoneRestHouse2TextPointers: ; 45d2e (11:5d2e) +SafariZoneRestHouse2TextPointers: dw SafariZoneRestHouse2Text1 dw SafariZoneRestHouse2Text2 dw SafariZoneRestHouse2Text3 -SafariZoneRestHouse2Text1: ; 45d34 (11:5d34) +SafariZoneRestHouse2Text1: TX_FAR _SafariZoneRestHouse2Text1 db "@" -SafariZoneRestHouse2Text2: ; 45d39 (11:5d39) +SafariZoneRestHouse2Text2: TX_FAR _SafariZoneRestHouse2Text2 db "@" -SafariZoneRestHouse2Text3: ; 45d3e (11:5d3e) +SafariZoneRestHouse2Text3: TX_FAR _SafariZoneRestHouse2Text3 db "@" diff --git a/scripts/safarizoneresthouse3.asm b/scripts/safarizoneresthouse3.asm index 2faa1fbb..18c4770f 100755 --- a/scripts/safarizoneresthouse3.asm +++ b/scripts/safarizoneresthouse3.asm @@ -1,20 +1,20 @@ -SafariZoneRestHouse3Script: ; 45d75 (11:5d75) +SafariZoneRestHouse3Script: call EnableAutoTextBoxDrawing ret -SafariZoneRestHouse3TextPointers: ; 45d79 (11:5d79) +SafariZoneRestHouse3TextPointers: dw SafariZoneRestHouse3Text1 dw SafariZoneRestHouse3Text2 dw SafariZoneRestHouse3Text3 -SafariZoneRestHouse3Text1: ; 45d7f (11:5d7f) +SafariZoneRestHouse3Text1: TX_FAR _SafariZoneRestHouse3Text1 db "@" -SafariZoneRestHouse3Text2: ; 45d84 (11:5d84) +SafariZoneRestHouse3Text2: TX_FAR _SafariZoneRestHouse3Text2 db "@" -SafariZoneRestHouse3Text3: ; 45d89 (11:5d89) +SafariZoneRestHouse3Text3: TX_FAR _SafariZoneRestHouse3Text3 db "@" diff --git a/scripts/safarizoneresthouse4.asm b/scripts/safarizoneresthouse4.asm index b645431f..3ff3fa48 100755 --- a/scripts/safarizoneresthouse4.asm +++ b/scripts/safarizoneresthouse4.asm @@ -1,20 +1,20 @@ -SafariZoneRestHouse4Script: ; 45dc0 (11:5dc0) +SafariZoneRestHouse4Script: call EnableAutoTextBoxDrawing ret -SafariZoneRestHouse4TextPointers: ; 45dc4 (11:5dc4) +SafariZoneRestHouse4TextPointers: dw SafariZoneRestHouse4Text1 dw SafariZoneRestHouse4Text2 dw SafariZoneRestHouse4Text3 -SafariZoneRestHouse4Text1: ; 45dca (11:5dca) +SafariZoneRestHouse4Text1: TX_FAR _SafariZoneRestHouse4Text1 db "@" -SafariZoneRestHouse4Text2: ; 45dcf (11:5dcf) +SafariZoneRestHouse4Text2: TX_FAR _SafariZoneRestHouse4Text2 db "@" -SafariZoneRestHouse4Text3: ; 45dd4 (11:5dd4) +SafariZoneRestHouse4Text3: TX_FAR _SafariZoneRestHouse4Text3 db "@" diff --git a/scripts/safarizonesecrethouse.asm b/scripts/safarizonesecrethouse.asm index 8881472b..37013b3b 100755 --- a/scripts/safarizonesecrethouse.asm +++ b/scripts/safarizonesecrethouse.asm @@ -1,10 +1,10 @@ -SafariZoneSecretHouseScript: ; 4a317 (12:6317) +SafariZoneSecretHouseScript: jp EnableAutoTextBoxDrawing -SafariZoneSecretHouseTextPointers: ; 4a31a (12:631a) +SafariZoneSecretHouseTextPointers: dw SafariZoneSecretHouseText1 -SafariZoneSecretHouseText1: ; 4a31c (12:631c) +SafariZoneSecretHouseText1: TX_ASM CheckEvent EVENT_GOT_HM03 jr nz, .asm_20a9b @@ -27,18 +27,18 @@ SafariZoneSecretHouseText1: ; 4a31c (12:631c) .asm_8f1fc jp TextScriptEnd -SafariZoneSecretHouseText_4a350: ; 4a350 (12:6350) +SafariZoneSecretHouseText_4a350: TX_FAR _SecretHouseText_4a350 db "@" -ReceivedHM03Text: ; 4a355 (12:6355) +ReceivedHM03Text: TX_FAR _ReceivedHM03Text db $0B, "@" -HM03ExplanationText: ; 4a35b (12:635b) +HM03ExplanationText: TX_FAR _HM03ExplanationText db "@" -HM03NoRoomText: ; 4a360 (12:6360) +HM03NoRoomText: TX_FAR _HM03NoRoomText db "@" diff --git a/scripts/safarizonewest.asm b/scripts/safarizonewest.asm index db2c6427..81190c4c 100755 --- a/scripts/safarizonewest.asm +++ b/scripts/safarizonewest.asm @@ -1,7 +1,7 @@ -SafariZoneWestScript: ; 4a1b5 (12:61b5) +SafariZoneWestScript: jp EnableAutoTextBoxDrawing -SafariZoneWestTextPointers: ; 4a1b8 (12:61b8) +SafariZoneWestTextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText @@ -11,18 +11,18 @@ SafariZoneWestTextPointers: ; 4a1b8 (12:61b8) dw SafariZoneWestText7 dw SafariZoneWestText8 -SafariZoneWestText5: ; 4a1c8 (12:61c8) +SafariZoneWestText5: TX_FAR _SafariZoneWestText5 db "@" -SafariZoneWestText6: ; 4a1cd (12:61cd) +SafariZoneWestText6: TX_FAR _SafariZoneWestText6 db "@" -SafariZoneWestText7: ; 4a1d2 (12:61d2) +SafariZoneWestText7: TX_FAR _SafariZoneWestText7 db "@" -SafariZoneWestText8: ; 4a1d7 (12:61d7) +SafariZoneWestText8: TX_FAR _SafariZoneWestText8 db "@" diff --git a/scripts/saffroncity.asm b/scripts/saffroncity.asm index 93bb2c88..4653f150 100755 --- a/scripts/saffroncity.asm +++ b/scripts/saffroncity.asm @@ -1,7 +1,7 @@ -SaffronCityScript: ; 50c00 (14:4c00) +SaffronCityScript: jp EnableAutoTextBoxDrawing -SaffronCityTextPointers: ; 50c03 (14:4c03) +SaffronCityTextPointers: dw SaffronCityText1 dw SaffronCityText2 dw SaffronCityText3 @@ -28,94 +28,94 @@ SaffronCityTextPointers: ; 50c03 (14:4c03) dw SaffronCityText24 dw SaffronCityText25 -SaffronCityText1: ; 50c35 (14:4c35) +SaffronCityText1: TX_FAR _SaffronCityText1 db "@" -SaffronCityText2: ; 50c3a (14:4c3a) +SaffronCityText2: TX_FAR _SaffronCityText2 db "@" -SaffronCityText3: ; 50c3f (14:4c3f) +SaffronCityText3: TX_FAR _SaffronCityText3 db "@" -SaffronCityText4: ; 50c44 (14:4c44) +SaffronCityText4: TX_FAR _SaffronCityText4 db "@" -SaffronCityText5: ; 50c49 (14:4c49) +SaffronCityText5: TX_FAR _SaffronCityText5 db "@" -SaffronCityText6: ; 50c4e (14:4c4e) +SaffronCityText6: TX_FAR _SaffronCityText6 db "@" -SaffronCityText7: ; 50c53 (14:4c53) +SaffronCityText7: TX_FAR _SaffronCityText7 db "@" -SaffronCityText8: ; 50c58 (14:4c58) +SaffronCityText8: TX_FAR _SaffronCityText8 db "@" -SaffronCityText9: ; 50c5d (14:4c5d) +SaffronCityText9: TX_FAR _SaffronCityText9 db "@" -SaffronCityText10: ; 50c62 (14:4c62) +SaffronCityText10: TX_FAR _SaffronCityText10 db "@" -SaffronCityText11: ; 50c67 (14:4c67) +SaffronCityText11: TX_FAR _SaffronCityText11 db "@" -SaffronCityText12: ; 50c6c (14:4c6c) +SaffronCityText12: TX_FAR _SaffronCityText12 db $15, "@" ; play PIDGEOT cry from TextCommandSounds -SaffronCityText13: ; 50c72 (14:4c72) +SaffronCityText13: TX_FAR _SaffronCityText13 db "@" -SaffronCityText14: ; 50c77 (14:4c77) +SaffronCityText14: TX_FAR _SaffronCityText14 db "@" -SaffronCityText15: ; 50c7c (14:4c7c) +SaffronCityText15: TX_FAR _SaffronCityText15 db "@" -SaffronCityText16: ; 50c81 (14:4c81) +SaffronCityText16: TX_FAR _SaffronCityText16 db "@" -SaffronCityText17: ; 50c86 (14:4c86) +SaffronCityText17: TX_FAR _SaffronCityText17 db "@" -SaffronCityText18: ; 50c8b (14:4c8b) +SaffronCityText18: TX_FAR _SaffronCityText18 db "@" -SaffronCityText20: ; 50c90 (14:4c90) +SaffronCityText20: TX_FAR _SaffronCityText20 db "@" -SaffronCityText21: ; 50c95 (14:4c95) +SaffronCityText21: TX_FAR _SaffronCityText21 db "@" -SaffronCityText22: ; 50c9a (14:4c9a) +SaffronCityText22: TX_FAR _SaffronCityText22 db "@" -SaffronCityText24: ; 50c9f (14:4c9f) +SaffronCityText24: TX_FAR _SaffronCityText24 db "@" -SaffronCityText25: ; 50ca4 (14:4ca4) +SaffronCityText25: TX_FAR _SaffronCityText25 db "@" diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index cae60f45..a3ab60b2 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -1,4 +1,4 @@ -SaffronGymScript: ; 5d00d (17:500d) +SaffronGymScript: ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -16,33 +16,33 @@ SaffronGymScript: ; 5d00d (17:500d) ld de, Gym6LeaderName jp LoadGymLeaderAndCityName -Gym6CityName: ; 5d033 (17:5033) +Gym6CityName: db "SAFFRON CITY@" -Gym6LeaderName: ; 5d040 (17:5040) +Gym6LeaderName: db "SABRINA@" -SaffronGymText_5d048: ; 5d048 (17:5048) +SaffronGymText_5d048: xor a ld [wJoyIgnore], a ld [W_SAFFRONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -SaffronGymScriptPointers: ; 5d053 (17:5053) +SaffronGymScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw SaffronGymScript3 -SaffronGymScript3: ; 5d05b (17:505b) +SaffronGymScript3: ld a, [wIsInBattle] cp $ff jp z, SaffronGymText_5d048 ld a, $f0 ld [wJoyIgnore], a -SaffronGymText_5d068: ; 5d068 (17:5068) +SaffronGymText_5d068: ld a, $a ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -70,7 +70,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068) jp SaffronGymText_5d048 -SaffronGymTextPointers: ; 5d0ab (17:50ab) +SaffronGymTextPointers: dw SaffronGymText1 dw SaffronGymText2 dw SaffronGymText3 @@ -84,8 +84,8 @@ SaffronGymTextPointers: ; 5d0ab (17:50ab) dw SaffronGymText11 dw SaffronGymText12 -SaffronGymTrainerHeaders: ; 5d0c3 (17:50c3) -SaffronGymTrainerHeader0: ; 5d0c3 (17:50c3) +SaffronGymTrainerHeaders: +SaffronGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_0 @@ -94,7 +94,7 @@ SaffronGymTrainerHeader0: ; 5d0c3 (17:50c3) dw SaffronGymEndBattleText1 ; TextEndBattle dw SaffronGymEndBattleText1 ; TextEndBattle -SaffronGymTrainerHeader1: ; 5d0cf (17:50cf) +SaffronGymTrainerHeader1: dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_1 @@ -103,7 +103,7 @@ SaffronGymTrainerHeader1: ; 5d0cf (17:50cf) dw SaffronGymEndBattleText2 ; TextEndBattle dw SaffronGymEndBattleText2 ; TextEndBattle -SaffronGymTrainerHeader2: ; 5d0db (17:50db) +SaffronGymTrainerHeader2: dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_2 @@ -112,7 +112,7 @@ SaffronGymTrainerHeader2: ; 5d0db (17:50db) dw SaffronGymEndBattleText3 ; TextEndBattle dw SaffronGymEndBattleText3 ; TextEndBattle -SaffronGymTrainerHeader3: ; 5d0e7 (17:50e7) +SaffronGymTrainerHeader3: dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_3 @@ -121,7 +121,7 @@ SaffronGymTrainerHeader3: ; 5d0e7 (17:50e7) dw SaffronGymEndBattleText4 ; TextEndBattle dw SaffronGymEndBattleText4 ; TextEndBattle -SaffronGymTrainerHeader4: ; 5d0f3 (17:50f3) +SaffronGymTrainerHeader4: dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_4 @@ -130,7 +130,7 @@ SaffronGymTrainerHeader4: ; 5d0f3 (17:50f3) dw SaffronGymEndBattleText5 ; TextEndBattle dw SaffronGymEndBattleText5 ; TextEndBattle -SaffronGymTrainerHeader5: ; 5d0ff (17:50ff) +SaffronGymTrainerHeader5: dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_5 @@ -139,7 +139,7 @@ SaffronGymTrainerHeader5: ; 5d0ff (17:50ff) dw SaffronGymEndBattleText6 ; TextEndBattle dw SaffronGymEndBattleText6 ; TextEndBattle -SaffronGymTrainerHeader6: ; 5d10b (17:510b) +SaffronGymTrainerHeader6: dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SAFFRON_GYM_TRAINER_6, 1 @@ -150,7 +150,7 @@ SaffronGymTrainerHeader6: ; 5d10b (17:510b) db $ff -SaffronGymText1: ; 5d118 (17:5118) +SaffronGymText1: TX_ASM CheckEvent EVENT_BEAT_SABRINA jr z, .asm_5d134 @@ -183,77 +183,77 @@ SaffronGymText1: ; 5d118 (17:5118) .asm_5d15f jp TextScriptEnd -SaffronGymText_5d162: ; 5d162 (17:5162) +SaffronGymText_5d162: TX_FAR _SaffronGymText_5d162 db "@" -SaffronGymText_5d167: ; 5d167 (17:5167) +SaffronGymText_5d167: TX_FAR _SaffronGymText_5d167 db $11 ; play same sound as red giving oak parcel db $6 ; wait for keypress db "@" -SaffronGymText_5d16e: ; 5d16e (17:516e) +SaffronGymText_5d16e: TX_FAR _SaffronGymText_5d16e db "@" -SaffronGymText10: ; 5d173 (17:5173) +SaffronGymText10: TX_FAR _SaffronGymText_5d173 db "@" -SaffronGymText11: ; 5d178 (17:5178) +SaffronGymText11: TX_FAR ReceivedTM46Text db $b TX_FAR _TM46ExplanationText db "@" -SaffronGymText12: ; 5d182 (17:5182) +SaffronGymText12: TX_FAR _TM46NoRoomText db "@" -SaffronGymText2: ; 5d187 (17:5187) +SaffronGymText2: TX_ASM ld hl, SaffronGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -SaffronGymText3: ; 5d191 (17:5191) +SaffronGymText3: TX_ASM ld hl, SaffronGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd -SaffronGymText4: ; 5d19b (17:519b) +SaffronGymText4: TX_ASM ld hl, SaffronGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd -SaffronGymText5: ; 5d1a5 (17:51a5) +SaffronGymText5: TX_ASM ld hl, SaffronGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd -SaffronGymText6: ; 5d1af (17:51af) +SaffronGymText6: TX_ASM ld hl, SaffronGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd -SaffronGymText7: ; 5d1b9 (17:51b9) +SaffronGymText7: TX_ASM ld hl, SaffronGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd -SaffronGymText8: ; 5d1c3 (17:51c3) +SaffronGymText8: TX_ASM ld hl, SaffronGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd -SaffronGymText9: ; 5d1cd (17:51cd) +SaffronGymText9: TX_ASM CheckEvent EVENT_BEAT_SABRINA jr nz, .asm_5d1dd @@ -266,94 +266,94 @@ SaffronGymText9: ; 5d1cd (17:51cd) .asm_5d1e3 jp TextScriptEnd -SaffronGymText_5d1e6: ; 5d1e6 (17:51e6) +SaffronGymText_5d1e6: TX_FAR _SaffronGymText_5d1e6 db "@" -SaffronGymText_5d1eb: ; 5d1eb (17:51eb) +SaffronGymText_5d1eb: TX_FAR _SaffronGymText_5d1eb db "@" -SaffronGymBattleText1: ; 5d1f0 (17:51f0) +SaffronGymBattleText1: TX_FAR _SaffronGymBattleText1 db "@" -SaffronGymEndBattleText1: ; 5d1f5 (17:51f5) +SaffronGymEndBattleText1: TX_FAR _SaffronGymEndBattleText1 db "@" -SaffronGymAfterBattleText1: ; 5d1fa (17:51fa) +SaffronGymAfterBattleText1: TX_FAR _SaffronGymAfterBattleText1 db "@" -SaffronGymBattleText2: ; 5d1ff (17:51ff) +SaffronGymBattleText2: TX_FAR _SaffronGymBattleText2 db "@" -SaffronGymEndBattleText2: ; 5d204 (17:5204) +SaffronGymEndBattleText2: TX_FAR _SaffronGymEndBattleText2 db "@" -SaffronGymAfterBattleText2: ; 5d209 (17:5209) +SaffronGymAfterBattleText2: TX_FAR _SaffronGymAfterBattleText2 db "@" -SaffronGymBattleText3: ; 5d20e (17:520e) +SaffronGymBattleText3: TX_FAR _SaffronGymBattleText3 db "@" -SaffronGymEndBattleText3: ; 5d213 (17:5213) +SaffronGymEndBattleText3: TX_FAR _SaffronGymEndBattleText3 db "@" -SaffronGymAfterBattleText3: ; 5d218 (17:5218) +SaffronGymAfterBattleText3: TX_FAR _SaffronGymAfterBattleText3 db "@" -SaffronGymBattleText4: ; 5d21d (17:521d) +SaffronGymBattleText4: TX_FAR _SaffronGymBattleText4 db "@" -SaffronGymEndBattleText4: ; 5d222 (17:5222) +SaffronGymEndBattleText4: TX_FAR _SaffronGymEndBattleText4 db "@" -SaffronGymAfterBattleText4: ; 5d227 (17:5227) +SaffronGymAfterBattleText4: TX_FAR _SaffronGymAfterBattleText4 db "@" -SaffronGymBattleText5: ; 5d22c (17:522c) +SaffronGymBattleText5: TX_FAR _SaffronGymBattleText5 db "@" -SaffronGymEndBattleText5: ; 5d231 (17:5231) +SaffronGymEndBattleText5: TX_FAR _SaffronGymEndBattleText5 db "@" -SaffronGymAfterBattleText5: ; 5d236 (17:5236) +SaffronGymAfterBattleText5: TX_FAR _SaffronGymAfterBattleText5 db "@" -SaffronGymBattleText6: ; 5d23b (17:523b) +SaffronGymBattleText6: TX_FAR _SaffronGymBattleText6 db "@" -SaffronGymEndBattleText6: ; 5d240 (17:5240) +SaffronGymEndBattleText6: TX_FAR _SaffronGymEndBattleText6 db "@" -SaffronGymAfterBattleText6: ; 5d245 (17:5245) +SaffronGymAfterBattleText6: TX_FAR _SaffronGymAfterBattleText6 db "@" -SaffronGymBattleText7: ; 5d24a (17:524a) +SaffronGymBattleText7: TX_FAR _SaffronGymBattleText7 db "@" -SaffronGymEndBattleText7: ; 5d24f (17:524f) +SaffronGymEndBattleText7: TX_FAR _SaffronGymEndBattleText7 db "@" -SaffronGymAfterBattleText7: ; 5d254 (17:5254) +SaffronGymAfterBattleText7: TX_FAR _SaffronGymAfterBattleText7 db "@" diff --git a/scripts/saffronhouse1.asm b/scripts/saffronhouse1.asm index 3aced3c5..5f417978 100755 --- a/scripts/saffronhouse1.asm +++ b/scripts/saffronhouse1.asm @@ -1,27 +1,27 @@ -SaffronHouse1Script: ; 1dddd (7:5ddd) +SaffronHouse1Script: jp EnableAutoTextBoxDrawing -SaffronHouse1TextPointers: ; 1dde0 (7:5de0) +SaffronHouse1TextPointers: dw SaffronHouse1Text1 dw SaffronHouse1Text2 dw SaffronHouse1Text3 dw SaffronHouse1Text4 -SaffronHouse1Text1: ; 1dde8 (7:5de8) +SaffronHouse1Text1: TX_FAR _SaffronHouse1Text1 db "@" -SaffronHouse1Text2: ; 1dded (7:5ded) +SaffronHouse1Text2: TX_FAR _SaffronHouse1Text2 TX_ASM ld a, PIDGEY call PlayCry jp TextScriptEnd -SaffronHouse1Text3: ; 1ddfa (7:5dfa) +SaffronHouse1Text3: TX_FAR _SaffronHouse1Text3 db "@" -SaffronHouse1Text4: ; 1ddff (7:5dff) +SaffronHouse1Text4: TX_FAR _SaffronHouse1Text4 db "@" diff --git a/scripts/saffronhouse2.asm b/scripts/saffronhouse2.asm index 2c159190..b4f6e31c 100755 --- a/scripts/saffronhouse2.asm +++ b/scripts/saffronhouse2.asm @@ -1,10 +1,10 @@ -SaffronHouse2Script: ; 1de3c (7:5e3c) +SaffronHouse2Script: jp EnableAutoTextBoxDrawing -SaffronHouse2TextPointers: ; 1de3f (7:5e3f) +SaffronHouse2TextPointers: dw SaffronHouse2Text1 -SaffronHouse2Text1: ; 1de41 (7:5e41) +SaffronHouse2Text1: TX_ASM CheckEvent EVENT_GOT_TM29 jr nz, .asm_9e72b @@ -27,18 +27,18 @@ SaffronHouse2Text1: ; 1de41 (7:5e41) .asm_fe4e1 jp TextScriptEnd -TM29PreReceiveText: ; 1de75 (7:5e75) +TM29PreReceiveText: TX_FAR _TM29PreReceiveText db "@" -ReceivedTM29Text: ; 1de7a (7:5e7a) +ReceivedTM29Text: TX_FAR _ReceivedTM29Text db $0B, "@" -TM29ExplanationText: ; 1de80 (7:5e80) +TM29ExplanationText: TX_FAR _TM29ExplanationText db "@" -TM29NoRoomText: ; 1de85 (7:5e85) +TM29NoRoomText: TX_FAR _TM29NoRoomText db "@" diff --git a/scripts/saffronmart.asm b/scripts/saffronmart.asm index 9ee1db0e..0bc03362 100755 --- a/scripts/saffronmart.asm +++ b/scripts/saffronmart.asm @@ -1,15 +1,15 @@ -SaffronMartScript: ; 5d409 (17:5409) +SaffronMartScript: jp EnableAutoTextBoxDrawing -SaffronMartTextPointers: ; 5d40c (17:540c) +SaffronMartTextPointers: dw SaffronMartText1 dw SaffronMartText2 dw SaffronMartText3 -SaffronMartText2: ; 5d412 (17:5412) +SaffronMartText2: TX_FAR _SaffronMartText2 db "@" -SaffronMartText3: ; 5d417 (17:5417) +SaffronMartText3: TX_FAR _SaffronMartText3 db "@" diff --git a/scripts/saffronpokecenter.asm b/scripts/saffronpokecenter.asm index 05420812..7fde0502 100755 --- a/scripts/saffronpokecenter.asm +++ b/scripts/saffronpokecenter.asm @@ -1,26 +1,26 @@ -SaffronPokecenterScript: ; 5d535 (17:5535) +SaffronPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -SaffronPokecenterTextPointers: ; 5d53b (17:553b) +SaffronPokecenterTextPointers: dw SaffronPokecenterText1 dw SaffronPokecenterText2 dw SaffronPokecenterText3 dw SaffronPokecenterText4 dw SaffronPokecenterText5 -SaffronPokecenterText1: ; 5d543 (17:5543) +SaffronPokecenterText1: TX_POKECENTER_NURSE -SaffronPokecenterText2: ; 5d544 (17:5544) +SaffronPokecenterText2: TX_FAR _SaffronPokecenterText1 db "@" -SaffronPokecenterText3: ; 5d549 (17:5549) +SaffronPokecenterText3: TX_FAR _SaffronPokecenterText3 db "@" -SaffronPokecenterText4: ; 5d54e (17:554e) +SaffronPokecenterText4: TX_CABLE_CLUB_RECEPTIONIST SaffronPokecenterText5: diff --git a/scripts/school.asm b/scripts/school.asm index 6ee0d36e..a64189e3 100755 --- a/scripts/school.asm +++ b/scripts/school.asm @@ -1,22 +1,22 @@ -SchoolScript: ; 1d54c (7:554c) +SchoolScript: call EnableAutoTextBoxDrawing ret -SchoolTextPointers: ; 1d54f (7:554f) +SchoolTextPointers: dw SchoolText1 dw SchoolText2 dw SchoolText3 -SchoolText1: ; 1d553 (7:5553) +SchoolText1: TX_FAR _SchoolText1 db "@" -SchoolText2: ; 1d558 (7:5558) +SchoolText2: TX_ASM callba Func_f1c0f jp TextScriptEnd -SchoolText3: ; 1d558 (7:5558) +SchoolText3: TX_ASM callba Func_f1c03 jp TextScriptEnd diff --git a/scripts/seafoamislands1.asm b/scripts/seafoamislands1.asm index f9a2e7fc..52561fa7 100755 --- a/scripts/seafoamislands1.asm +++ b/scripts/seafoamislands1.asm @@ -1,4 +1,4 @@ -SeafoamIslands1Script: ; 447e9 (11:47e9) +SeafoamIslands1Script: call EnableAutoTextBoxDrawing SetEvent EVENT_IN_SEAFOAM_ISLANDS ld hl, wFlags_0xcd60 @@ -37,11 +37,11 @@ SeafoamIslands1Script: ; 447e9 (11:47e9) ld hl, Seafoam1HolesCoords jp IsPlayerOnDungeonWarp -Seafoam1HolesCoords: ; 44846 (11:4846) +Seafoam1HolesCoords: db $06,$11 db $06,$18 db $ff -SeafoamIslands1TextPointers: ; 4484b (11:484b) +SeafoamIslands1TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands2.asm b/scripts/seafoamislands2.asm index 2c2962f8..50024bad 100755 --- a/scripts/seafoamislands2.asm +++ b/scripts/seafoamislands2.asm @@ -1,4 +1,4 @@ -SeafoamIslands2Script: ; 46315 (11:6315) +SeafoamIslands2Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -36,11 +36,11 @@ SeafoamIslands2Script: ; 46315 (11:6315) ld hl, Seafoam2HolesCoords jp IsPlayerOnDungeonWarp -Seafoam2HolesCoords: ; 4636d (11:636d) +Seafoam2HolesCoords: db $06,$12 db $06,$17 db $ff -SeafoamIslands2TextPointers: ; 46372 (11:6372) +SeafoamIslands2TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands3.asm b/scripts/seafoamislands3.asm index 6dda7f37..4a7848a4 100755 --- a/scripts/seafoamislands3.asm +++ b/scripts/seafoamislands3.asm @@ -1,4 +1,4 @@ -SeafoamIslands3Script: ; 46451 (11:6451) +SeafoamIslands3Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -36,11 +36,11 @@ SeafoamIslands3Script: ; 46451 (11:6451) ld hl, Seafoam3HolesCoords jp IsPlayerOnDungeonWarp -Seafoam3HolesCoords: ; 464a9 (11:64a9) +Seafoam3HolesCoords: db $06,$13 db $06,$16 db $ff -SeafoamIslands3TextPointers: ; 464ae (11:64ae) +SeafoamIslands3TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index 56ccd2e3..a1e4b1d8 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -1,4 +1,4 @@ -SeafoamIslands4Script: ; 4658d (11:658d) +SeafoamIslands4Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -44,18 +44,18 @@ SeafoamIslands4Script: ; 4658d (11:658d) ld a, [wSeafoamIslands4CurScript] jp JumpTable -Seafoam4HolesCoords: ; 465f6 (11:65f6) +Seafoam4HolesCoords: db $10,$03 db $10,$06 db $ff -SeafoamIslands4ScriptPointers: ; 465fb (11:65fb) +SeafoamIslands4ScriptPointers: dw SeafoamIslands4Script0 dw SeafoamIslands4Script1 dw SeafoamIslands4Script2 dw SeafoamIslands4Script3 -SeafoamIslands4Script0: ; 46603 (11:6603) +SeafoamIslands4Script0: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [wYCoord] @@ -76,13 +76,13 @@ SeafoamIslands4Script0: ; 46603 (11:6603) ld [wSeafoamIslands4CurScript], a ret -RLEMovement46632: ; 46632 (11:6632) +RLEMovement46632: db D_DOWN,6 db D_RIGHT,5 db D_DOWN,3 db $ff -SeafoamIslands4Script1: ; 46639 (11:6639) +SeafoamIslands4Script1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -90,7 +90,7 @@ SeafoamIslands4Script1: ; 46639 (11:6639) ld [wSeafoamIslands4CurScript], a ret -SeafoamIslands4Script2: ; 46644 (11:6644) +SeafoamIslands4Script2: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld a, [wXCoord] @@ -119,20 +119,20 @@ SeafoamIslands4Script2: ; 46644 (11:6644) ld [wSeafoamIslands4CurScript], a ret -RLEData_4667f: ; 4667f (11:667f) +RLEData_4667f: db D_DOWN,$06 db D_RIGHT,$02 db D_DOWN,$04 db D_LEFT,$01 db $FF -RLEData_46688: ; 46688 (11:6688) +RLEData_46688: db D_DOWN,$06 db D_RIGHT,$02 db D_DOWN,$04 db $FF -SeafoamIslands4Script3: ; 4668f (11:668f) +SeafoamIslands4Script3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -140,7 +140,7 @@ SeafoamIslands4Script3: ; 4668f (11:668f) ld [wSeafoamIslands4CurScript], a ret -SeafoamIslands4TextPointers: ; 4669a (11:669a) +SeafoamIslands4TextPointers: dw BoulderText dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index 5901c5ca..af1672a7 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -1,24 +1,24 @@ -SeafoamIslands5Script: ; 46799 (11:6799) +SeafoamIslands5Script: call EnableAutoTextBoxDrawing ld a, [wSeafoamIslands5CurScript] ld hl, SeafoamIslands5ScriptPointers jp JumpTable -SeafoamIslands5Script_467a5: ; 467a5 (11:67a5) +SeafoamIslands5Script_467a5: xor a ld [wJoyIgnore], a ld [wSeafoamIslands5CurScript], a ld [W_CURMAPSCRIPT], a ret -SeafoamIslands5ScriptPointers: ; 467ad (11:67ad) +SeafoamIslands5ScriptPointers: dw SeafoamIslands5Script0 dw SeafoamIslands5Script1 dw SeafoamIslands5Script2 dw SeafoamIslands5Script3 dw SeafoamIslands5Script4 -SeafoamIslands5Script4: ; 467b7 (11:67b7) +SeafoamIslands5Script4: ld a, [wIsInBattle] cp $ff jr z, SeafoamIslands5Script_467a5 @@ -27,7 +27,7 @@ SeafoamIslands5Script4: ; 467b7 (11:67b7) ld [wSeafoamIslands5CurScript], a ret -SeafoamIslands5Script0: ; 467c7 (11:67c7) +SeafoamIslands5Script0: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z ld hl, CoordsData_467fe @@ -53,14 +53,14 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7) ld [wSeafoamIslands5CurScript], a ret -CoordsData_467fe: ; 467fe (11:67fe) +CoordsData_467fe: db $11,$14 db $11,$15 db $10,$14 db $10,$15 db $FF -SeafoamIslands5Script1: ; 46807 (11:6807) +SeafoamIslands5Script1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -70,7 +70,7 @@ SeafoamIslands5Script1: ; 46807 (11:6807) ld [wSeafoamIslands5CurScript], a ret -SeafoamIslands5Script2: ; 46816 (11:6816) +SeafoamIslands5Script2: CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ld a, $0 jr z, .asm_46849 @@ -96,24 +96,24 @@ SeafoamIslands5Script2: ; 46816 (11:6816) ld [wSeafoamIslands5CurScript], a ret -CoordsData_4684d: ; 4684d (11:684d) +CoordsData_4684d: db $0E,$04 db $0E,$05 db $FF -RLEMovementData_46852: ; 46852 (11:6852) +RLEMovementData_46852: db D_UP,$03 db D_RIGHT,$02 db D_UP,$01 db $FF -RLEMovementData_46859: ; 46859 (11:6859) +RLEMovementData_46859: db D_UP,$03 db D_RIGHT,$03 db D_UP,$01 db $FF -SeafoamIslands5Script3: ; 46860 (11:6860) +SeafoamIslands5Script3: ld a, [wSimulatedJoypadStatesIndex] ld b, a cp $1 @@ -125,21 +125,21 @@ SeafoamIslands5Script3: ; 46860 (11:6860) ld [wSeafoamIslands5CurScript], a ret -SeaFoamIslands5Script_46872: ; 46872 (11:6872) +SeaFoamIslands5Script_46872: xor a ld [wWalkBikeSurfState], a ld [wWalkBikeSurfStateCopy], a jp ForceBikeOrSurf -SeafoamIslands5TextPointers: ; 4687c (11:687c) +SeafoamIslands5TextPointers: dw BoulderText dw BoulderText dw SeafoamIslands5Text3 dw SeafoamIslands5Text4 dw SeafoamIslands5Text5 -SeafoamIslands5TrainerHeaders: ; 46886 (11:6886) -SeafoamIslands5TrainerHeader0: ; 46886 (11:6886) +SeafoamIslands5TrainerHeaders: +SeafoamIslands5TrainerHeader0: dbEventFlagBit EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0 @@ -150,7 +150,7 @@ SeafoamIslands5TrainerHeader0: ; 46886 (11:6886) db $ff -SeafoamIslands5Text3: ; 46893 (11:6893) +SeafoamIslands5Text3: TX_ASM ld hl, SeafoamIslands5TrainerHeader0 call TalkToTrainer @@ -158,7 +158,7 @@ SeafoamIslands5Text3: ; 46893 (11:6893) ld [wSeafoamIslands5CurScript], a jp TextScriptEnd -SeafoamIslands5BattleText2: ; 468a2 (11:68a2) +SeafoamIslands5BattleText2: TX_FAR _SeafoamIslands5BattleText2 TX_ASM ld a, ARTICUNO @@ -166,10 +166,10 @@ SeafoamIslands5BattleText2: ; 468a2 (11:68a2) call WaitForSoundToFinish jp TextScriptEnd -SeafoamIslands5Text4: ; 468b2 (11:68b2) +SeafoamIslands5Text4: TX_FAR _SeafoamIslands5Text4 db "@" -SeafoamIslands5Text5: ; 468b7 (11:68b7) +SeafoamIslands5Text5: TX_FAR _SeafoamIslands5Text5 db "@" diff --git a/scripts/silphco1.asm b/scripts/silphco1.asm index cfd51dc1..c0cb169b 100755 --- a/scripts/silphco1.asm +++ b/scripts/silphco1.asm @@ -1,4 +1,4 @@ -SilphCo1Script: ; 5d44e (17:544e) +SilphCo1Script: call EnableAutoTextBoxDrawing CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ret z @@ -8,9 +8,9 @@ SilphCo1Script: ; 5d44e (17:544e) ld [wMissableObjectIndex], a predef_jump ShowObject -SilphCo1TextPointers: ; 5d469 (17:5469) +SilphCo1TextPointers: dw SilphCo1Text1 -SilphCo1Text1: ; 5d46b (17:546b) +SilphCo1Text1: TX_FAR _SilphCo1Text1 db "@" diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index a6f2f860..ed8b9ec9 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -1,4 +1,4 @@ -SilphCo10Script: ; 5a139 (16:6139) +SilphCo10Script: call SilphCo10Script_5a14f call EnableAutoTextBoxDrawing ld hl, SilphCo10TrainerHeaders @@ -8,7 +8,7 @@ SilphCo10Script: ; 5a139 (16:6139) ld [W_SILPHCO10CURSCRIPT], a ret -SilphCo10Script_5a14f: ; 5a14f (16:614f) +SilphCo10Script_5a14f: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -23,23 +23,23 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f) lb bc, 4, 5 predef_jump ReplaceTileBlock -SilphCo10GateCoords: ; 5a173 (16:6173) +SilphCo10GateCoords: db $04,$05 db $FF -SilphCo10Text_5a176: ; 5a176 (16:6176) +SilphCo10Text_5a176: ld a, [$ffe0] and a ret z SetEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR ret -SilphCo10ScriptPointers: ; 5a180 (16:6180) +SilphCo10ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo10TextPointers: ; 5a186 (16:6186) +SilphCo10TextPointers: dw SilphCo10Text1 dw SilphCo10Text2 dw SilphCo10Text3 @@ -47,8 +47,8 @@ SilphCo10TextPointers: ; 5a186 (16:6186) dw PickUpItemText dw PickUpItemText -SilphCo10TrainerHeaders: ; 5a192 (16:6192) -SilphCo10TrainerHeader0: ; 5a192 (16:6192) +SilphCo10TrainerHeaders: +SilphCo10TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_10F_TRAINER_0 @@ -57,7 +57,7 @@ SilphCo10TrainerHeader0: ; 5a192 (16:6192) dw SilphCo10EndBattleText1 ; TextEndBattle dw SilphCo10EndBattleText1 ; TextEndBattle -SilphCo10TrainerHeader1: ; 5a19e (16:619e) +SilphCo10TrainerHeader1: dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_10F_TRAINER_1 @@ -68,19 +68,19 @@ SilphCo10TrainerHeader1: ; 5a19e (16:619e) db $ff -SilphCo10Text1: ; 5a1ab (16:61ab) +SilphCo10Text1: TX_ASM ld hl, SilphCo10TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo10Text2: ; 5a1b5 (16:61b5) +SilphCo10Text2: TX_ASM ld hl, SilphCo10TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo10Text3: ; 5a1bf (16:61bf) +SilphCo10Text3: TX_ASM CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SilphCo10Text_5a1d8 @@ -90,34 +90,34 @@ SilphCo10Text3: ; 5a1bf (16:61bf) call PrintText jp TextScriptEnd -SilphCo10Text_5a1d3: ; 5a1d3 (16:61d3) +SilphCo10Text_5a1d3: TX_FAR _SilphCo10Text_5a1d3 db "@" -SilphCo10Text_5a1d8: ; 5a1d8 (16:61d8) +SilphCo10Text_5a1d8: TX_FAR _SilphCo10Text_5a1d8 db "@" -SilphCo10BattleText1: ; 5a1dd (16:61dd) +SilphCo10BattleText1: TX_FAR _SilphCo10BattleText1 db "@" -SilphCo10EndBattleText1: ; 5a1e2 (16:61e2) +SilphCo10EndBattleText1: TX_FAR _SilphCo10EndBattleText1 db "@" -SilphCo10AfterBattleText1: ; 5a1e7 (16:61e7) +SilphCo10AfterBattleText1: TX_FAR _SilphCo10AfterBattleText1 db "@" -SilphCo10BattleText2: ; 5a1ec (16:61ec) +SilphCo10BattleText2: TX_FAR _SilphCo10BattleText2 db "@" -SilphCo10EndBattleText2: ; 5a1f1 (16:61f1) +SilphCo10EndBattleText2: TX_FAR _SilphCo10EndBattleText2 db "@" -SilphCo10AfterBattleText2: ; 5a1f6 (16:61f6) +SilphCo10AfterBattleText2: TX_FAR _SilphCo10AfterBattleText2 db "@" diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 42e8d574..47924524 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -1,4 +1,4 @@ -SilphCo11Script: ; 62111 (18:60fa) +SilphCo11Script: call SilphCo11Script_62127 call EnableAutoTextBoxDrawing ld hl, SilphCo11TrainerHeaders @@ -8,7 +8,7 @@ SilphCo11Script: ; 62111 (18:60fa) ld [W_SILPHCO11CURSCRIPT], a ret -SilphCo11Script_62127: ; 62127 (18:6110) +SilphCo11Script_62127: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -24,11 +24,11 @@ SilphCo11Script_62127: ; 62127 (18:6110) predef ReplaceTileBlock ret -SilphCo11GateCoords: ; 62134 (18:6134) +SilphCo11GateCoords: db $06,$03 db $FF -SilphCo11Script_6214f: ; 6214f (18:6137) +SilphCo11Script_6214f: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -64,39 +64,39 @@ SilphCo11Script_6214f: ; 6214f (18:6137) ld [$ffe0], a ret -SilphCo11Script_6217b: ; 6217b (18:6163) +SilphCo11Script_6217b: ld a, [$ffe0] and a ret z SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR ret -SilphCo11Script_62185: ; 62185 (18:61c4) +SilphCo11Script_62185: xor a ld [wJoyIgnore], a -SilphCo11Script_62189: ; 62189 (18:61c8) +SilphCo11Script_62189: ld [W_SILPHCO11CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -SilphCo11ScriptPointers: ; 62190 (18:6190) - dw SilphCo11Script0 ; 61ae +SilphCo11ScriptPointers: + dw SilphCo11Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - dw SilphCo11Script3 ; 620c - dw SilphCo11Script4 ; 6254 - dw SilphCo11Script5 ; 6318 - dw SilphCo11Script6 ; 633f - dw SilphCo11Script7 ; 634a - dw SilphCo11Script8 ; 6366 - dw SilphCo11Script9 ; 638d - dw SilphCo11Script10 ; 639d - dw SilphCo11Script11 ; 63bb - dw SilphCo11Script12 ; 63e1 - dw SilphCo11Script13 ; 6427 - dw SilphCo11Script14 ; 6448 - -SilphCo11Script0: ; 621db (18:61db) + dw SilphCo11Script3 + dw SilphCo11Script4 + dw SilphCo11Script5 + dw SilphCo11Script6 + dw SilphCo11Script7 + dw SilphCo11Script8 + dw SilphCo11Script9 + dw SilphCo11Script10 + dw SilphCo11Script11 + dw SilphCo11Script12 + dw SilphCo11Script13 + dw SilphCo11Script14 + +SilphCo11Script0: CheckEvent EVENT_BEAT_SILPH_CO_11F_TRAINER_0 call z, SilphCo11Script_6229c CheckEvent EVENT_782 @@ -127,12 +127,12 @@ SilphCo11Script_621c5: call SilphCo11Script_62189 ret -CoordsData_62211: ; 62211 (18:6211) +CoordsData_62211: db $0D,$06 db $0C,$07 db $FF -MovementData_62216: ; 62216 (18:6216) +MovementData_62216: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN @@ -146,7 +146,7 @@ SilphCo11Script_621ff: ld [wSpriteStateData1 + 3 * $10 + 1], a ret -SilphCo11Script3: ; 62227 (18:6227) +SilphCo11Script3: ld a, [wIsInBattle] cp $ff jp z, SilphCo11Script_62185 @@ -176,7 +176,7 @@ SilphCo11Script3: ; 62227 (18:6227) ld [wJoyIgnore], a jp SilphCo11Script_62189 -SilphCo11Script4: ; 62254 (18:626a) +SilphCo11Script4: ld a, [wd730] bit 0, a ret nz @@ -464,7 +464,7 @@ SilphCo11Script_6246d: predef HideObject ret -SilphCo11TextPointers: ; 62476 (18:62b7) +SilphCo11TextPointers: dw SilphCo11Text1 dw SilphCo11Text2 dw SilphCo11Text3 @@ -476,8 +476,8 @@ SilphCo11TextPointers: ; 62476 (18:62b7) dw SilphCo11Text9 dw SilphCo11Text10 -SilphCo11TrainerHeaders: ; 6248a -SilphCo11TrainerHeader0: ; 6248a +SilphCo11TrainerHeaders: +SilphCo11TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1 db ($3 << 4) dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_1 diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index ecb3b5a5..51bb62bc 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -1,4 +1,4 @@ -SilphCo2Script: ; 59cf1 (16:5cf1) +SilphCo2Script: call SilphCo2Script_59d07 call EnableAutoTextBoxDrawing ld hl, SilphCo2TrainerHeaders @@ -8,7 +8,7 @@ SilphCo2Script: ; 59cf1 (16:5cf1) ld [W_SILPHCO2CURSCRIPT], a ret -SilphCo2Script_59d07: ; 59d07 (16:5d07) +SilphCo2Script_59d07: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -32,12 +32,12 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07) lb bc, 5, 2 predef_jump ReplaceTileBlock -SilphCo2GateCoords: ; 59d3e (16:5d3e) +SilphCo2GateCoords: db $02,$02 db $05,$02 db $FF -SilphCo2Script_59d43: ; 59d43 (16:5d43) +SilphCo2Script_59d43: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -73,7 +73,7 @@ SilphCo2Script_59d43: ; 59d43 (16:5d43) ld [$ffe0], a ret -SilphCo2Script_59d6f: ; 59d6f (16:5d6f) +SilphCo2Script_59d6f: EventFlagAddress hl, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ld a, [$ffe0] and a @@ -86,20 +86,20 @@ SilphCo2Script_59d6f: ; 59d6f (16:5d6f) SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ret -SilphCo2ScriptPointers: ; 59d80 (16:5d80) +SilphCo2ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo2TextPointers: ; 59d86 (16:5d86) +SilphCo2TextPointers: dw SilphCo2Text1 dw SilphCo2Text2 dw SilphCo2Text3 dw SilphCo2Text4 dw SilphCo2Text5 -SilphCo2TrainerHeaders: ; 59d90 (16:5d90) -SilphCo2TrainerHeader0: ; 59d90 (16:5d90) +SilphCo2TrainerHeaders: +SilphCo2TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_0 @@ -108,7 +108,7 @@ SilphCo2TrainerHeader0: ; 59d90 (16:5d90) dw SilphCo2EndBattleText1 ; TextEndBattle dw SilphCo2EndBattleText1 ; TextEndBattle -SilphCo2TrainerHeader1: ; 59d9c (16:5d9c) +SilphCo2TrainerHeader1: dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_1 @@ -117,7 +117,7 @@ SilphCo2TrainerHeader1: ; 59d9c (16:5d9c) dw SilphCo2EndBattleText2 ; TextEndBattle dw SilphCo2EndBattleText2 ; TextEndBattle -SilphCo2TrainerHeader2: ; 59da8 (16:5da8) +SilphCo2TrainerHeader2: dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_2 @@ -126,7 +126,7 @@ SilphCo2TrainerHeader2: ; 59da8 (16:5da8) dw SilphCo2EndBattleText3 ; TextEndBattle dw SilphCo2EndBattleText3 ; TextEndBattle -SilphCo2TrainerHeader3: ; 59db4 (16:5db4) +SilphCo2TrainerHeader3: dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_2F_TRAINER_3 @@ -137,7 +137,7 @@ SilphCo2TrainerHeader3: ; 59db4 (16:5db4) db $ff -SilphCo2Text1: ; 59dc1 (16:5dc1) +SilphCo2Text1: TX_ASM CheckEvent EVENT_GOT_TM36 jr nz, .asm_59de4 @@ -156,90 +156,90 @@ SilphCo2Text1: ; 59dc1 (16:5dc1) call PrintText jp TextScriptEnd -SilphCo2Text_59ded: ; 59ded (16:5ded) +SilphCo2Text_59ded: TX_FAR _SilphCo2Text_59ded db "@" -ReceivedTM36Text: ; 59df2 (16:5df2) +ReceivedTM36Text: TX_FAR _ReceivedTM36Text db $0B, "@" -TM36ExplanationText: ; 59df8 (16:5df8) +TM36ExplanationText: TX_FAR _TM36ExplanationText db "@" -TM36NoRoomText: ; 59dfd (16:5dfd) +TM36NoRoomText: TX_FAR _TM36NoRoomText db "@" -SilphCo2Text2: ; 59e02 (16:5e02) +SilphCo2Text2: TX_ASM ld hl, SilphCo2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo2Text3: ; 59e0c (16:5e0c) +SilphCo2Text3: TX_ASM ld hl, SilphCo2TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo2Text4: ; 59e16 (16:5e16) +SilphCo2Text4: TX_ASM ld hl, SilphCo2TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo2Text5: ; 59e20 (16:5e20) +SilphCo2Text5: TX_ASM ld hl, SilphCo2TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SilphCo2BattleText1: ; 59e2a (16:5e2a) +SilphCo2BattleText1: TX_FAR _SilphCo2BattleText1 db "@" -SilphCo2EndBattleText1: ; 59e2f (16:5e2f) +SilphCo2EndBattleText1: TX_FAR _SilphCo2EndBattleText1 db "@" -SilphCo2AfterBattleText1: ; 59e34 (16:5e34) +SilphCo2AfterBattleText1: TX_FAR _SilphCo2AfterBattleText1 db "@" -SilphCo2BattleText2: ; 59e39 (16:5e39) +SilphCo2BattleText2: TX_FAR _SilphCo2BattleText2 db "@" -SilphCo2EndBattleText2: ; 59e3e (16:5e3e) +SilphCo2EndBattleText2: TX_FAR _SilphCo2EndBattleText2 db "@" -SilphCo2AfterBattleText2: ; 59e43 (16:5e43) +SilphCo2AfterBattleText2: TX_FAR _SilphCo2AfterBattleText2 db "@" -SilphCo2BattleText3: ; 59e48 (16:5e48) +SilphCo2BattleText3: TX_FAR _SilphCo2BattleText3 db "@" -SilphCo2EndBattleText3: ; 59e4d (16:5e4d) +SilphCo2EndBattleText3: TX_FAR _SilphCo2EndBattleText3 db "@" -SilphCo2AfterBattleText3: ; 59e52 (16:5e52) +SilphCo2AfterBattleText3: TX_FAR _SilphCo2AfterBattleText3 db "@" -SilphCo2BattleText4: ; 59e57 (16:5e57) +SilphCo2BattleText4: TX_FAR _SilphCo2BattleText4 db "@" -SilphCo2EndBattleText4: ; 59e5c (16:5e5c) +SilphCo2EndBattleText4: TX_FAR _SilphCo2EndBattleText4 db "@" -SilphCo2AfterBattleText4: ; 59e61 (16:5e61) +SilphCo2AfterBattleText4: TX_FAR _SilphCo2AfterBattleText4 db "@" diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index bdaac452..7be07e6c 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -1,4 +1,4 @@ -SilphCo3Script: ; 59f5b (16:5f5b) +SilphCo3Script: call SilphCo3Script_59f71 call EnableAutoTextBoxDrawing ld hl, SilphCo3TrainerHeaders @@ -8,7 +8,7 @@ SilphCo3Script: ; 59f5b (16:5f5b) ld [W_SILPHCO3CURSCRIPT], a ret -SilphCo3Script_59f71: ; 59f71 (16:5f71) +SilphCo3Script_59f71: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -32,12 +32,12 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71) lb bc, 4, 8 predef_jump ReplaceTileBlock -SilphCo3GateCoords: ; 59fa8 (16:5fa8) +SilphCo3GateCoords: db $04,$04 db $04,$08 db $FF -SilphCo3Script_59fad: ; 59fad (16:5fad) +SilphCo3Script_59fad: EventFlagAddress hl, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ld a, [$ffe0] and a @@ -50,19 +50,19 @@ SilphCo3Script_59fad: ; 59fad (16:5fad) SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ret -SilphCo3ScriptPointers: ; 59fbe (16:5fbe) +SilphCo3ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo3TextPointers: ; 59fc4 (16:5fc4) +SilphCo3TextPointers: dw SilphCo3Text1 dw SilphCo3Text2 dw SilphCo3Text3 dw PickUpItemText -SilphCo3TrainerHeaders: ; 59fcc (16:5fcc) -SilphCo3TrainerHeader0: ; 59fcc (16:5fcc) +SilphCo3TrainerHeaders: +SilphCo3TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_0 @@ -71,7 +71,7 @@ SilphCo3TrainerHeader0: ; 59fcc (16:5fcc) dw SilphCo3EndBattleText1 ; TextEndBattle dw SilphCo3EndBattleText1 ; TextEndBattle -SilphCo3TrainerHeader1: ; 59fd8 (16:5fd8) +SilphCo3TrainerHeader1: dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_3F_TRAINER_1 @@ -82,7 +82,7 @@ SilphCo3TrainerHeader1: ; 59fd8 (16:5fd8) db $ff -SilphCo3Text1: ; 59fe5 (16:5fe5) +SilphCo3Text1: TX_ASM CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SilphCo3Text_59ffe @@ -92,46 +92,46 @@ SilphCo3Text1: ; 59fe5 (16:5fe5) call PrintText jp TextScriptEnd -SilphCo3Text_59ff9: ; 59ff9 (16:5ff9) +SilphCo3Text_59ff9: TX_FAR _SilphCo3Text_59ff9 db "@" -SilphCo3Text_59ffe: ; 59ffe (16:5ffe) +SilphCo3Text_59ffe: TX_FAR _SilphCo3Text_59ffe db "@" -SilphCo3Text2: ; 5a003 (16:6003) +SilphCo3Text2: TX_ASM ld hl, SilphCo3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo3BattleText1: ; 5a00d (16:600d) +SilphCo3BattleText1: TX_FAR _SilphCo3BattleText1 db "@" -SilphCo3EndBattleText1: ; 5a012 (16:6012) +SilphCo3EndBattleText1: TX_FAR _SilphCo3EndBattleText1 db "@" -SilphCo3AfterBattleText1: ; 5a017 (16:6017) +SilphCo3AfterBattleText1: TX_FAR _SilphCo3AfterBattleText1 db "@" -SilphCo3Text3: ; 5a01c (16:601c) +SilphCo3Text3: TX_ASM ld hl, SilphCo3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo3BattleText2: ; 5a026 (16:6026) +SilphCo3BattleText2: TX_FAR _SilphCo3BattleText2 db "@" -SilphCo3EndBattleText2: ; 5a02b (16:602b) +SilphCo3EndBattleText2: TX_FAR _SilphCo3EndBattleText2 db "@" -SilphCo3AfterBattleText2: ; 5a030 (16:6030) +SilphCo3AfterBattleText2: TX_FAR _SilphCo3AfterBattleText2 db "@" diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 0dad6f6b..33f2f884 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -1,4 +1,4 @@ -SilphCo4Script: ; 19d0b (6:5d0b) +SilphCo4Script: call SilphCo4Script_19d21 call EnableAutoTextBoxDrawing ld hl, SilphCo4TrainerHeaders @@ -8,7 +8,7 @@ SilphCo4Script: ; 19d0b (6:5d0b) ld [W_SILPHCO4CURSCRIPT], a ret -SilphCo4Script_19d21: ; 19d21 (6:5d21) +SilphCo4Script_19d21: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -32,12 +32,12 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21) lb bc, 4, 6 predef_jump ReplaceTileBlock -SilphCo4GateCoords: ; 19d58 (6:5d58) +SilphCo4GateCoords: db $06,$02 db $04,$06 db $FF -SilphCo4Script_19d5d: ; 19d5d (6:5d5d) +SilphCo4Script_19d5d: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -73,7 +73,7 @@ SilphCo4Script_19d5d: ; 19d5d (6:5d5d) ld [$ffe0], a ret -SilphCo4Script_19d89: ; 19d89 (6:5d89) +SilphCo4Script_19d89: EventFlagAddress hl, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ld a, [$ffe0] and a @@ -86,12 +86,12 @@ SilphCo4Script_19d89: ; 19d89 (6:5d89) SetEventAfterBranchReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ret -SilphCo4ScriptPointers: ; 19d9a (6:5d9a) +SilphCo4ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo4TextPointers: ; 19da0 (6:5da0) +SilphCo4TextPointers: dw SilphCo4Text1 dw SilphCo4Text2 dw SilphCo4Text3 @@ -100,8 +100,8 @@ SilphCo4TextPointers: ; 19da0 (6:5da0) dw PickUpItemText dw PickUpItemText -SilphCo4TrainerHeaders: ; 19dae (6:5dae) -SilphCo4TrainerHeader0: ; 19dae (6:5dae) +SilphCo4TrainerHeaders: +SilphCo4TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_0 @@ -110,7 +110,7 @@ SilphCo4TrainerHeader0: ; 19dae (6:5dae) dw SilphCo4EndBattleText2 ; TextEndBattle dw SilphCo4EndBattleText2 ; TextEndBattle -SilphCo4TrainerHeader2: ; 19dba (6:5dba) +SilphCo4TrainerHeader2: dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2 @@ -119,7 +119,7 @@ SilphCo4TrainerHeader2: ; 19dba (6:5dba) dw SilphCo4EndBattleText3 ; TextEndBattle dw SilphCo4EndBattleText3 ; TextEndBattle -SilphCo4TrainerHeader3: ; 19dc6 (6:5dc6) +SilphCo4TrainerHeader3: dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_3 @@ -130,71 +130,71 @@ SilphCo4TrainerHeader3: ; 19dc6 (6:5dc6) db $ff -SilphCo4Text1: ; 19dd3 (6:5dd3) +SilphCo4Text1: TX_ASM ld hl, SilphCo4Text_19de0 ld de, SilphCo4Text_19de5 call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo4Text_19de0: ; 19de0 (6:5de0) +SilphCo4Text_19de0: TX_FAR _SilphCo4Text_19de0 db "@" -SilphCo4Text_19de5: ; 19de5 (6:5de5) +SilphCo4Text_19de5: TX_FAR _SilphCo4Text_19de5 db "@" -SilphCo4Text2: ; 19dea (6:5dea) +SilphCo4Text2: TX_ASM ld hl, SilphCo4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo4BattleText2: ; 19df4 (6:5df4) +SilphCo4BattleText2: TX_FAR _SilphCo4BattleText2 db "@" -SilphCo4EndBattleText2: ; 19df9 (6:5df9) +SilphCo4EndBattleText2: TX_FAR _SilphCo4EndBattleText2 db "@" -SilphCo4AfterBattleText2: ; 19dfe (6:5dfe) +SilphCo4AfterBattleText2: TX_FAR _SilphCo4AfterBattleText2 db "@" -SilphCo4Text3: ; 19e03 (6:5e03) +SilphCo4Text3: TX_ASM ld hl, SilphCo4TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo4BattleText3: ; 19e0d (6:5e0d) +SilphCo4BattleText3: TX_FAR _SilphCo4BattleText3 db "@" -SilphCo4EndBattleText3: ; 19e12 (6:5e12) +SilphCo4EndBattleText3: TX_FAR _SilphCo4EndBattleText3 db "@" -SilphCo4AfterBattleText3: ; 19e17 (6:5e17) +SilphCo4AfterBattleText3: TX_FAR _SilphCo4AfterBattleText3 db "@" -SilphCo4Text4: ; 19e1c (6:5e1c) +SilphCo4Text4: TX_ASM ld hl, SilphCo4TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SilphCo4BattleText4: ; 19e26 (6:5e26) +SilphCo4BattleText4: TX_FAR _SilphCo4BattleText4 db "@" -SilphCo4EndBattleText4: ; 19e2b (6:5e2b) +SilphCo4EndBattleText4: TX_FAR _SilphCo4EndBattleText4 db "@" -SilphCo4AfterBattleText4: ; 19e30 (6:5e30) +SilphCo4AfterBattleText4: TX_FAR _SilphCo4AfterBattleText4 db "@" diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index 7380f98f..fa10a7a9 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -1,4 +1,4 @@ -SilphCo5Script: ; 19f37 (6:5f37) +SilphCo5Script: call SilphCo5Script_19f4d call EnableAutoTextBoxDrawing ld hl, SilphCo5TrainerHeaders @@ -8,7 +8,7 @@ SilphCo5Script: ; 19f37 (6:5f37) ld [W_SILPHCO5CURSCRIPT], a ret -SilphCo5Script_19f4d: ; 19f4d (6:5f4d) +SilphCo5Script_19f4d: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -41,13 +41,13 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d) lb bc, 5, 7 predef_jump ReplaceTileBlock -SilphCo5GateCoords: ; 19f97 (6:5f97) +SilphCo5GateCoords: db $02,$03 db $06,$03 db $05,$07 db $FF -SilphCo5Script_19f9e: ; 19f9e (6:5f9e) +SilphCo5Script_19f9e: EventFlagAddress hl, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ld a, [$ffe0] and a @@ -65,12 +65,12 @@ SilphCo5Script_19f9e: ; 19f9e (6:5f9e) SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ret -SilphCo5ScriptPointers: ; 19fb6 (6:5fb6) +SilphCo5ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo5TextPointers: ; 19fbc (6:5fbc) +SilphCo5TextPointers: dw SilphCo5Text1 dw SilphCo5Text2 dw SilphCo5Text3 @@ -83,8 +83,8 @@ SilphCo5TextPointers: ; 19fbc (6:5fbc) dw SilphCo5Text10 dw SilphCo5Text11 -SilphCo5TrainerHeaders: ; 19fd2 (6:5fd2) -Silphco5TrainerHeader0: ; 19fd2 (6:5fd2) +SilphCo5TrainerHeaders: +Silphco5TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0 @@ -93,7 +93,7 @@ Silphco5TrainerHeader0: ; 19fd2 (6:5fd2) dw SilphCo5EndBattleText2 ; TextEndBattle dw SilphCo5EndBattleText2 ; TextEndBattle -Silphco5TrainerHeader2: ; 19fde (6:5fde) +Silphco5TrainerHeader2: dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 @@ -102,7 +102,7 @@ Silphco5TrainerHeader2: ; 19fde (6:5fde) dw SilphCo5EndBattleText3 ; TextEndBattle dw SilphCo5EndBattleText3 ; TextEndBattle -Silphco5TrainerHeader3: ; 19fea (6:5fea) +Silphco5TrainerHeader3: dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 @@ -111,7 +111,7 @@ Silphco5TrainerHeader3: ; 19fea (6:5fea) dw SilphCo5EndBattleText4 ; TextEndBattle dw SilphCo5EndBattleText4 ; TextEndBattle -Silphco5TrainerHeader4: ; 19ff6 (6:5ff6) +Silphco5TrainerHeader4: dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_4 @@ -122,101 +122,101 @@ Silphco5TrainerHeader4: ; 19ff6 (6:5ff6) db $ff -SilphCo5Text1: ; 1a003 (6:6003) +SilphCo5Text1: TX_ASM ld hl, SilphCo5Text_1a010 ld de, SilphCo5Text_1a015 call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo5Text_1a010: ; 1a010 (6:6010) +SilphCo5Text_1a010: TX_FAR _SilphCo5Text_1a010 db "@" -SilphCo5Text_1a015: ; 1a015 (6:6015) +SilphCo5Text_1a015: TX_FAR _SilphCo5Text_1a015 db "@" -SilphCo5Text2: ; 1a01a (6:601a) +SilphCo5Text2: TX_ASM ld hl, Silphco5TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo5BattleText2: ; 1a024 (6:6024) +SilphCo5BattleText2: TX_FAR _SilphCo5BattleText2 db "@" -SilphCo5EndBattleText2: ; 1a029 (6:6029) +SilphCo5EndBattleText2: TX_FAR _SilphCo5EndBattleText2 db "@" -SilphCo5AfterBattleText2: ; 1a02e (6:602e) +SilphCo5AfterBattleText2: TX_FAR _SilphCo5AfterBattleText2 db "@" -SilphCo5Text3: ; 1a033 (6:6033) +SilphCo5Text3: TX_ASM ld hl, Silphco5TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo5BattleText3: ; 1a03d (6:603d) +SilphCo5BattleText3: TX_FAR _SilphCo5BattleText3 db "@" -SilphCo5EndBattleText3: ; 1a042 (6:6042) +SilphCo5EndBattleText3: TX_FAR _SilphCo5EndBattleText3 db "@" -SilphCo5AfterBattleText3: ; 1a047 (6:6047) +SilphCo5AfterBattleText3: TX_FAR _SilphCo5AfterBattleText3 db "@" -SilphCo5Text4: ; 1a04c (6:604c) +SilphCo5Text4: TX_ASM ld hl, Silphco5TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SilphCo5BattleText4: ; 1a056 (6:6056) +SilphCo5BattleText4: TX_FAR _SilphCo5BattleText4 db "@" -SilphCo5EndBattleText4: ; 1a05b (6:605b) +SilphCo5EndBattleText4: TX_FAR _SilphCo5EndBattleText4 db "@" -SilphCo5AfterBattleText4: ; 1a060 (6:6060) +SilphCo5AfterBattleText4: TX_FAR _SilphCo5AfterBattleText4 db "@" -SilphCo5Text5: ; 1a065 (6:6065) +SilphCo5Text5: TX_ASM ld hl, Silphco5TrainerHeader4 call TalkToTrainer jp TextScriptEnd -SilphCo5BattleText5: ; 1a06f (6:606f) +SilphCo5BattleText5: TX_FAR _SilphCo5BattleText5 db "@" -SilphCo5EndBattleText5: ; 1a074 (6:6074) +SilphCo5EndBattleText5: TX_FAR _SilphCo5EndBattleText5 db "@" -SilphCo5AfterBattleText5: ; 1a079 (6:6079) +SilphCo5AfterBattleText5: TX_FAR _SilphCo5AfterBattleText5 db "@" -SilphCo5Text9: ; 1a07e (6:607e) +SilphCo5Text9: TX_FAR _SilphCo5Text9 db "@" -SilphCo5Text10: ; 1a083 (6:6083) +SilphCo5Text10: TX_FAR _SilphCo5Text10 db "@" -SilphCo5Text11: ; 1a088 (6:6088) +SilphCo5Text11: TX_FAR _SilphCo5Text11 db "@" diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index fa199069..28f1eeba 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -1,4 +1,4 @@ -SilphCo6Script: ; 1a1a9 (6:61a9) +SilphCo6Script: call SilphCo6Script_1a1bf call EnableAutoTextBoxDrawing ld hl, SilphCo6TrainerHeaders @@ -8,7 +8,7 @@ SilphCo6Script: ; 1a1a9 (6:61a9) ld [W_SILPHCO6CURSCRIPT], a ret -SilphCo6Script_1a1bf: ; 1a1bf (6:61bf) +SilphCo6Script_1a1bf: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -23,23 +23,23 @@ SilphCo6Script_1a1bf: ; 1a1bf (6:61bf) lb bc, 6, 2 predef_jump ReplaceTileBlock -SilphCo6GateCoords: ; 1a1e3 (6:61e3) +SilphCo6GateCoords: db $06,$02 db $FF -SilphCo6Script_1a1e6: ; 1a1e6 (6:61e6) +SilphCo6Script_1a1e6: ld a, [$ffe0] and a ret z SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR ret -SilphCo6ScriptPointers: ; 1a1f0 (6:61f0) +SilphCo6ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo6TextPointers: ; 1a1f6 (6:61f6) +SilphCo6TextPointers: dw SilphCo6Text1 dw SilphCo6Text2 dw SilphCo6Text3 @@ -51,8 +51,8 @@ SilphCo6TextPointers: ; 1a1f6 (6:61f6) dw PickUpItemText dw PickUpItemText -SilphCo6TrainerHeaders: ; 1a20a (6:620a) -SilphCo6TrainerHeader0: ; 1a20a (6:620a) +SilphCo6TrainerHeaders: +SilphCo6TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_0 @@ -61,7 +61,7 @@ SilphCo6TrainerHeader0: ; 1a20a (6:620a) dw SilphCo6EndBattleText2 ; TextEndBattle dw SilphCo6EndBattleText2 ; TextEndBattle -SilphCo6TrainerHeader2: ; 1a216 (6:6216) +SilphCo6TrainerHeader2: dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2 @@ -70,7 +70,7 @@ SilphCo6TrainerHeader2: ; 1a216 (6:6216) dw SilphCo6EndBattleText3 ; TextEndBattle dw SilphCo6EndBattleText3 ; TextEndBattle -SilphCo6TrainerHeader3: ; 1a222 (6:6222) +SilphCo6TrainerHeader3: dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1 @@ -81,7 +81,7 @@ SilphCo6TrainerHeader3: ; 1a222 (6:6222) db $ff -SilphCo6Script_1a22f: ; 1a22f (6:622f) +SilphCo6Script_1a22f: CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI jr nz, .asm_1a238 jr .asm_1a23a @@ -91,131 +91,131 @@ SilphCo6Script_1a22f: ; 1a22f (6:622f) .asm_1a23a jp PrintText -SilphCo6Text1: ; 1a23d (6:623d) +SilphCo6Text1: TX_ASM ld hl, SilphCo6Text_1a24a ld de, SilphCo6Text_1a24f call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo6Text_1a24a: ; 1a24a (6:624a) +SilphCo6Text_1a24a: TX_FAR _SilphCo6Text_1a24a db "@" -SilphCo6Text_1a24f: ; 1a24f (6:624f) +SilphCo6Text_1a24f: TX_FAR _SilphCo6Text_1a24f db "@" -SilphCo6Text2: ; 1a254 (6:6254) +SilphCo6Text2: TX_ASM ld hl, SilphCo6Text_1a261 ld de, SilphCo6Text_1a266 call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo6Text_1a261: ; 1a261 (6:6261) +SilphCo6Text_1a261: TX_FAR _SilphCo6Text_1a261 db "@" -SilphCo6Text_1a266: ; 1a266 (6:6266) +SilphCo6Text_1a266: TX_FAR _SilphCo6Text_1a266 db "@" -SilphCo6Text3: ; 1a26b (6:626b) +SilphCo6Text3: TX_ASM ld hl, SilphCo6Text_1a278 ld de, SilphCo6Text_1a27d call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo6Text_1a278: ; 1a278 (6:6278) +SilphCo6Text_1a278: TX_FAR _SilphCo6Text_1a278 db "@" -SilphCo6Text_1a27d: ; 1a27d (6:627d) +SilphCo6Text_1a27d: TX_FAR _SilphCo6Text_1a27d db "@" -SilphCo6Text4: ; 1a282 (6:6282) +SilphCo6Text4: TX_ASM ld hl, SilphCo6Text_1a28f ld de, SilphCo6Text_1a294 call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo6Text_1a28f: ; 1a28f (6:628f) +SilphCo6Text_1a28f: TX_FAR _SilphCo6Text_1a28f db "@" -SilphCo6Text_1a294: ; 1a294 (6:6294) +SilphCo6Text_1a294: TX_FAR _SilphCo6Text_1a294 db "@" -SilphCo6Text5: ; 1a299 (6:6299) +SilphCo6Text5: TX_ASM ld hl, SilphCo6Text_1a2a6 ld de, SilphCo6Text_1a2ab call SilphCo6Script_1a22f jp TextScriptEnd -SilphCo6Text_1a2a6: ; 1a2a6 (6:62a6) +SilphCo6Text_1a2a6: TX_FAR _SilphCo6Text_1a2a6 db "@" -SilphCo6Text_1a2ab: ; 1a2ab (6:62ab) +SilphCo6Text_1a2ab: TX_FAR _SilphCo6Text_1a2ab db "@" -SilphCo6Text6: ; 1a2b0 (6:62b0) +SilphCo6Text6: TX_ASM ld hl, SilphCo6TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo6BattleText2: ; 1a2ba (6:62ba) +SilphCo6BattleText2: TX_FAR _SilphCo6BattleText2 db "@" -SilphCo6EndBattleText2: ; 1a2bf (6:62bf) +SilphCo6EndBattleText2: TX_FAR _SilphCo6EndBattleText2 db "@" -SilphCo6AfterBattleText2: ; 1a2c4 (6:62c4) +SilphCo6AfterBattleText2: TX_FAR _SilphCo6AfterBattleText2 db "@" -SilphCo6Text7: ; 1a2c9 (6:62c9) +SilphCo6Text7: TX_ASM ld hl, SilphCo6TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo6BattleText3: ; 1a2d3 (6:62d3) +SilphCo6BattleText3: TX_FAR _SilphCo6BattleText3 db "@" -SilphCo6EndBattleText3: ; 1a2d8 (6:62d8) +SilphCo6EndBattleText3: TX_FAR _SilphCo6EndBattleText3 db "@" -SilphCo6AfterBattleText3: ; 1a2dd (6:62dd) +SilphCo6AfterBattleText3: TX_FAR _SilphCo6AfterBattleText3 db "@" -SilphCo6Text8: ; 1a2e2 (6:62e2) +SilphCo6Text8: TX_ASM ld hl, SilphCo6TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SilphCo6BattleText4: ; 1a2ec (6:62ec) +SilphCo6BattleText4: TX_FAR _SilphCo6BattleText4 db "@" -SilphCo6EndBattleText4: ; 1a2f1 (6:62f1) +SilphCo6EndBattleText4: TX_FAR _SilphCo6EndBattleText4 db "@" -SilphCo6AfterBattleText4: ; 1a2f6 (6:62f6) +SilphCo6AfterBattleText4: TX_FAR _SilphCo6AfterBattleText4 db "@" diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 1634472b..6281783a 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -1,4 +1,4 @@ -SilphCo7Script: ; 51b61 (14:5b61) +SilphCo7Script: call SilphCo7Script_51b77 call EnableAutoTextBoxDrawing ld hl, SilphCo7TrainerHeaders @@ -8,7 +8,7 @@ SilphCo7Script: ; 51b61 (14:5b61) ld [W_SILPHCO7CURSCRIPT], a ret -SilphCo7Script_51b77: ; 51b77 (14:5b77) +SilphCo7Script_51b77: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -41,13 +41,13 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77) lb bc, 6, 10 predef_jump ReplaceTileBlock -SilphCo7GateCoords: ; 51bc1 (14:5bc1) +SilphCo7GateCoords: db $03,$05 db $02,$0A db $06,$0A db $FF -SilphCo7Text_51bc8: ; 51bc8 (14:5bc8) +SilphCo7Text_51bc8: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -83,7 +83,7 @@ SilphCo7Text_51bc8: ; 51bc8 (14:5bc8) ld [$ffe0], a ret -SilphCo7Text_51bf4: ; 51bf4 (14:5bf4) +SilphCo7Text_51bf4: EventFlagAddress hl, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 ld a, [$ffe0] and a @@ -101,16 +101,16 @@ SilphCo7Text_51bf4: ; 51bf4 (14:5bf4) SetEventAfterBranchReuseHL EVENT_SILPH_CO_7_UNLOCKED_DOOR3, EVENT_SILPH_CO_7_UNLOCKED_DOOR1 ret -SilphCo7Text_51c0c: ; 51c0c (14:5c0c) +SilphCo7Text_51c0c: xor a ld [wJoyIgnore], a -SilphCo7Text_51c10: ; 51c10 (14:5c10) +SilphCo7Text_51c10: ld [W_SILPHCO7CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -SilphCo7ScriptPointers: ; 51c17 (14:5c17) +SilphCo7ScriptPointers: dw SilphCo7Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -118,7 +118,7 @@ SilphCo7ScriptPointers: ; 51c17 (14:5c17) dw SilphCo7Script4 dw SilphCo7Script5 -SilphCo7Script0: ; 51c23 (14:5c23) +SilphCo7Script0: CheckEvent EVENT_BEAT_SILPH_CO_RIVAL jp nz, CheckFightingMapTrainers ld hl, CoordsData_51c78 @@ -153,19 +153,19 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld a, $3 jp SilphCo7Text_51c10 -CoordsData_51c78: ; 51c78 (14:5c78) +CoordsData_51c78: db $02,$03 db $03,$03 db $FF -MovementData_51c7d: ; 51c7d (14:5c7d) +MovementData_51c7d: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db $FF -SilphCo7Script3: ; 51c82 (14:5c82) +SilphCo7Script3: ld a, [wd730] bit 0, a ret nz @@ -190,7 +190,7 @@ SilphCo7Script3: ; 51c82 (14:5c82) call SilphCo7Text_51c10 ret -SilphCo7Script4: ; 51cc8 (14:5cc8) +SilphCo7Script4: ld a, [wIsInBattle] cp $ff jp z, SilphCo7Text_51c0c @@ -221,12 +221,12 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld a, $5 jp SilphCo7Text_51c10 -MovementData_51d1a: ; 51d1a (14:5d1a) +MovementData_51d1a: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db $FF -MovementData_51d1d: ; 51d1d (14:5d1d) +MovementData_51d1d: db NPC_MOVEMENT_LEFT db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP @@ -236,7 +236,7 @@ MovementData_51d1d: ; 51d1d (14:5d1d) db NPC_MOVEMENT_DOWN db $FF -SilphCo7Script5: ; 51d25 (14:5d25) +SilphCo7Script5: ld a, [wd730] bit 0, a ret nz @@ -248,7 +248,7 @@ SilphCo7Script5: ; 51d25 (14:5d25) ld [wJoyIgnore], a jp SilphCo7Text_51c10 -SilphCo7TextPointers: ; 51d3f (14:5d3f) +SilphCo7TextPointers: dw SilphCo7Text1 dw SilphCo7Text2 dw SilphCo7Text3 @@ -265,8 +265,8 @@ SilphCo7TextPointers: ; 51d3f (14:5d3f) dw SilphCo7Text14 dw SilphCo7Text15 -SilphCo7TrainerHeaders: ; 51d5d (14:5d5d) -SilphCo7TrainerHeader0: ; 51d5d (14:5d5d) +SilphCo7TrainerHeaders: +SilphCo7TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_0 @@ -275,7 +275,7 @@ SilphCo7TrainerHeader0: ; 51d5d (14:5d5d) dw SilphCo7EndBattleText1 ; TextEndBattle dw SilphCo7EndBattleText1 ; TextEndBattle -SilphCo7TrainerHeader2: ; 51d69 (14:5d69) +SilphCo7TrainerHeader2: dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2 @@ -284,7 +284,7 @@ SilphCo7TrainerHeader2: ; 51d69 (14:5d69) dw SilphCo7EndBattleText2 ; TextEndBattle dw SilphCo7EndBattleText2 ; TextEndBattle -SilphCo7TrainerHeader3: ; 51d75 (14:5d75) +SilphCo7TrainerHeader3: dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3 @@ -293,7 +293,7 @@ SilphCo7TrainerHeader3: ; 51d75 (14:5d75) dw SilphCo7EndBattleText3 ; TextEndBattle dw SilphCo7EndBattleText3 ; TextEndBattle -SilphCo7TrainerHeader4: ; 51d81 (14:5d81) +SilphCo7TrainerHeader4: dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1 @@ -415,100 +415,100 @@ SilphCo7Text4: TX_FAR _SilphCo7Text_51e4b db "@" -SilphCo7Text5: ; 51e50 (14:5e50) +SilphCo7Text5: TX_ASM ld hl, SilphCo7TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo7BattleText1: ; 51e5a (14:5e5a) +SilphCo7BattleText1: TX_FAR _SilphCo7BattleText1 db "@" -SilphCo7EndBattleText1: ; 51e5f (14:5e5f) +SilphCo7EndBattleText1: TX_FAR _SilphCo7EndBattleText1 db "@" -SilphCo7AfterBattleText1: ; 51e64 (14:5e64) +SilphCo7AfterBattleText1: TX_FAR _SilphCo7AfterBattleText1 db "@" -SilphCo7Text6: ; 51e69 (14:5e69) +SilphCo7Text6: TX_ASM ld hl, SilphCo7TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo7BattleText2: ; 51e73 (14:5e73) +SilphCo7BattleText2: TX_FAR _SilphCo7BattleText2 db "@" -SilphCo7EndBattleText2: ; 51e78 (14:5e78) +SilphCo7EndBattleText2: TX_FAR _SilphCo7EndBattleText2 db "@" -SilphCo7AfterBattleText2: ; 51e7d (14:5e7d) +SilphCo7AfterBattleText2: TX_FAR _SilphCo7AfterBattleText2 db "@" -SilphCo7Text7: ; 51e82 (14:5e82) +SilphCo7Text7: TX_ASM ld hl, SilphCo7TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SilphCo7BattleText3: ; 51e8c (14:5e8c) +SilphCo7BattleText3: TX_FAR _SilphCo7BattleText3 db "@" -SilphCo7EndBattleText3: ; 51e91 (14:5e91) +SilphCo7EndBattleText3: TX_FAR _SilphCo7EndBattleText3 db "@" -SilphCo7AfterBattleText3: ; 51e96 (14:5e96) +SilphCo7AfterBattleText3: TX_FAR _SilphCo7AfterBattleText3 db "@" -SilphCo7Text8: ; 51e9b (14:5e9b) +SilphCo7Text8: TX_ASM ld hl, SilphCo7TrainerHeader4 call TalkToTrainer jp TextScriptEnd -SilphCo7BattleText4: ; 51ea5 (14:5ea5) +SilphCo7BattleText4: TX_FAR _SilphCo7BattleText4 db "@" -SilphCo7EndBattleText4: ; 51eaa (14:5eaa) +SilphCo7EndBattleText4: TX_FAR _SilphCo7EndBattleText4 db "@" -SilphCo7AfterBattleText4: ; 51eaf (14:5eaf) +SilphCo7AfterBattleText4: TX_FAR _SilphCo7AfterBattleText4 db "@" -SilphCo7Text9: ; 51eb4 (14:5eb4) +SilphCo7Text9: TX_ASM ld hl, SilphCo7Text_51ebe call PrintText jp TextScriptEnd -SilphCo7Text_51ebe: ; 51ebe (14:5ebe) +SilphCo7Text_51ebe: TX_FAR _SilphCo7Text_51ebe db "@" -SilphCo7Text13: ; 51ec3 (14:5ec3) +SilphCo7Text13: TX_FAR _SilphCo7Text_51ec3 db "@" -SilphCo7Text14: ; 51ec8 (14:5ec8) +SilphCo7Text14: TX_FAR _SilphCo7Text_51ec8 db "@" -SilphCo7Text_51ecd: ; 51ecd (14:5ecd) +SilphCo7Text_51ecd: TX_FAR _SilphCo7Text_51ecd db "@" -SilphCo7Text15: ; 51ed2 (14:5ed2) +SilphCo7Text15: TX_FAR _SilphCo7Text_51ed2 db "@" diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index 9ea985a8..c093c669 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -1,4 +1,4 @@ -SilphCo8Script: ; 56504 (15:6504) +SilphCo8Script: call SilphCo8Script_5651a call EnableAutoTextBoxDrawing ld hl, SilphCo8TrainerHeader0 @@ -8,7 +8,7 @@ SilphCo8Script: ; 56504 (15:6504) ld [W_SILPHCO8CURSCRIPT], a ret -SilphCo8Script_5651a: ; 5651a (15:651a) +SilphCo8Script_5651a: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -23,11 +23,11 @@ SilphCo8Script_5651a: ; 5651a (15:651a) lb bc, 4, 3 predef_jump ReplaceTileBlock -SilphCo8GateCoords: ; 5653e (15:653e) +SilphCo8GateCoords: db $04,$03 db $FF -SilphCo8Script_56541: ; 56541 (15:6541) +SilphCo8Script_56541: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -63,26 +63,26 @@ SilphCo8Script_56541: ; 56541 (15:6541) ld [$ffe0], a ret -SilphCo8Script_5656d: ; 5656d (15:656d) +SilphCo8Script_5656d: ld a, [$ffe0] and a ret z SetEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR ret -SilphCo8ScriptPointers: ; 56577 (15:6577) +SilphCo8ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo8TextPointers: ; 5657d (15:657d) +SilphCo8TextPointers: dw SilphCo8Text1 dw SilphCo8Text2 dw SilphCo8Text3 dw SilphCo8Text4 -SilphCo8TrainerHeaders: ; 56585 (15:6585) -SilphCo8TrainerHeader0: ; 56585 (15:6585) +SilphCo8TrainerHeaders: +SilphCo8TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_0 @@ -91,7 +91,7 @@ SilphCo8TrainerHeader0: ; 56585 (15:6585) dw SilphCo8EndBattleText1 ; TextEndBattle dw SilphCo8EndBattleText1 ; TextEndBattle -SilphCo8TrainerHeader1: ; 56591 (15:6591) +SilphCo8TrainerHeader1: dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_1 @@ -100,7 +100,7 @@ SilphCo8TrainerHeader1: ; 56591 (15:6591) dw SilphCo8EndBattleText2 ; TextEndBattle dw SilphCo8EndBattleText2 ; TextEndBattle -SilphCo8TrainerHeader2: ; 5659d (15:659d) +SilphCo8TrainerHeader2: dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_8F_TRAINER_2 @@ -111,7 +111,7 @@ SilphCo8TrainerHeader2: ; 5659d (15:659d) db $ff -SilphCo8Text1: ; 565aa (15:65aa) +SilphCo8Text1: TX_ASM CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ld hl, SilphCo8Text_565c3 @@ -121,64 +121,64 @@ SilphCo8Text1: ; 565aa (15:65aa) call PrintText jp TextScriptEnd -SilphCo8Text_565be: ; 565be (15:65be) +SilphCo8Text_565be: TX_FAR _SilphCo8Text_565be db "@" -SilphCo8Text_565c3: ; 565c3 (15:65c3) +SilphCo8Text_565c3: TX_FAR _SilphCo8Text_565c3 db "@" -SilphCo8Text2: ; 565c8 (15:65c8) +SilphCo8Text2: TX_ASM ld hl, SilphCo8TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo8Text3: ; 565d2 (15:65d2) +SilphCo8Text3: TX_ASM ld hl, SilphCo8TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo8Text4: ; 565dc (15:65dc) +SilphCo8Text4: TX_ASM ld hl, SilphCo8TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo8BattleText1: ; 565e6 (15:65e6) +SilphCo8BattleText1: TX_FAR _SilphCo8BattleText1 db "@" -SilphCo8EndBattleText1: ; 565eb (15:65eb) +SilphCo8EndBattleText1: TX_FAR _SilphCo8EndBattleText1 db "@" -SilphCo8AfterBattleText1: ; 565f0 (15:65f0) +SilphCo8AfterBattleText1: TX_FAR _SilphCo8AfterBattleText1 db "@" -SilphCo8BattleText2: ; 565f5 (15:65f5) +SilphCo8BattleText2: TX_FAR _SilphCo8BattleText2 db "@" -SilphCo8EndBattleText2: ; 565fa (15:65fa) +SilphCo8EndBattleText2: TX_FAR _SilphCo8EndBattleText2 db "@" -SilphCo8AfterBattleText2: ; 565ff (15:65ff) +SilphCo8AfterBattleText2: TX_FAR _SilphCo8AfterBattleText2 db "@" -SilphCo8BattleText3: ; 56604 (15:6604) +SilphCo8BattleText3: TX_FAR _SilphCo8BattleText3 db "@" -SilphCo8EndBattleText3: ; 56609 (15:6609) +SilphCo8EndBattleText3: TX_FAR _SilphCo8EndBattleText3 db "@" -SilphCo8AfterBattleText3: ; 5660e (15:660e) +SilphCo8AfterBattleText3: TX_FAR _SilphCo8AfterBattleText3 db "@" diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 02638459..3dde7b13 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -1,4 +1,4 @@ -SilphCo9Script: ; 5d7bb (17:57bb) +SilphCo9Script: call SilphCo9Script_5d7d1 call EnableAutoTextBoxDrawing ld hl, SilphCo9TrainerHeaders @@ -8,7 +8,7 @@ SilphCo9Script: ; 5d7bb (17:57bb) ld [W_SILPHCO9CURSCRIPT], a ret -SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) +SilphCo9Script_5d7d1: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -50,14 +50,14 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1) lb bc, 6, 5 predef_jump ReplaceTileBlock -SilphCo9GateCoords: ; 5d82e (17:582e) +SilphCo9GateCoords: db $04,$01 db $02,$09 db $05,$09 db $06,$05 db $FF -SilphCo9Script_5d837: ; 5d837 (17:5837) +SilphCo9Script_5d837: push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -93,7 +93,7 @@ SilphCo9Script_5d837: ; 5d837 (17:5837) ld [$ffe0], a ret -SilphCo9Script_5d863: ; 5d863 (17:5863) +SilphCo9Script_5d863: EventFlagAddress hl, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ld a, [$ffe0] and a @@ -118,19 +118,19 @@ SilphCo9Script_5d863: ; 5d863 (17:5863) SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ret -SilphCo9ScriptPointers: ; 5d885 (17:5885) +SilphCo9ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo9TextPointers: ; 5d88b (17:588b) +SilphCo9TextPointers: dw SilphCo9Text1 dw SilphCo9Text2 dw SilphCo9Text3 dw SilphCo9Text4 -SilphCo9TrainerHeaders: ; 5d893 (17:5893) -SilphCo9TrainerHeader0: ; 5d893 (17:5893) +SilphCo9TrainerHeaders: +SilphCo9TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_0 @@ -139,7 +139,7 @@ SilphCo9TrainerHeader0: ; 5d893 (17:5893) dw SilphCo9EndBattleText1 ; TextEndBattle dw SilphCo9EndBattleText1 ; TextEndBattle -SilphCo9TrainerHeader1: ; 5d89f (17:589f) +SilphCo9TrainerHeader1: dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_1 @@ -148,7 +148,7 @@ SilphCo9TrainerHeader1: ; 5d89f (17:589f) dw SilphCo9EndBattleText2 ; TextEndBattle dw SilphCo9EndBattleText2 ; TextEndBattle -SilphCo9TrainerHeader2: ; 5d8ab (17:58ab) +SilphCo9TrainerHeader2: dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_9F_TRAINER_2 @@ -159,7 +159,7 @@ SilphCo9TrainerHeader2: ; 5d8ab (17:58ab) db $ff -SilphCo9Text1: ; 5d8b8 (17:58b8) +SilphCo9Text1: TX_ASM CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI jr nz, .asm_5d8dc @@ -178,68 +178,68 @@ SilphCo9Text1: ; 5d8b8 (17:58b8) .asm_5d8e2 jp TextScriptEnd -SilphCo9Text_5d8e5: ; 5d8e5 (17:58e5) +SilphCo9Text_5d8e5: TX_FAR _SilphCo9Text_5d8e5 db "@" -SilphCo9Text_5d8ea: ; 5d8ea (17:58ea) +SilphCo9Text_5d8ea: TX_FAR _SilphCo9Text_5d8ea db "@" -SilphCo9Text_5d8ef: ; 5d8ef (17:58ef) +SilphCo9Text_5d8ef: TX_FAR _SilphCo9Text_5d8ef db "@" -SilphCo9Text2: ; 5d8f4 (17:58f4) +SilphCo9Text2: TX_ASM ld hl, SilphCo9TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo9Text3: ; 5d8fe (17:58fe) +SilphCo9Text3: TX_ASM ld hl, SilphCo9TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SilphCo9Text4: ; 5d908 (17:5908) +SilphCo9Text4: TX_ASM ld hl, SilphCo9TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SilphCo9BattleText1: ; 5d912 (17:5912) +SilphCo9BattleText1: TX_FAR _SilphCo9BattleText1 db "@" -SilphCo9EndBattleText1: ; 5d917 (17:5917) +SilphCo9EndBattleText1: TX_FAR _SilphCo9EndBattleText1 db "@" -SilphCo9AfterBattleText1: ; 5d91c (17:591c) +SilphCo9AfterBattleText1: TX_FAR _SilphCo9AfterBattleText1 db "@" -SilphCo9BattleText2: ; 5d921 (17:5921) +SilphCo9BattleText2: TX_FAR _SilphCo9BattleText2 db "@" -SilphCo9EndBattleText2: ; 5d926 (17:5926) +SilphCo9EndBattleText2: TX_FAR _SilphCo9EndBattleText2 db "@" -SilphCo9AfterBattleText2: ; 5d92b (17:592b) +SilphCo9AfterBattleText2: TX_FAR _SilphCo9AfterBattleText2 db "@" -SilphCo9BattleText3: ; 5d930 (17:5930) +SilphCo9BattleText3: TX_FAR _SilphCo9BattleText3 db "@" -SilphCo9EndBattleText3: ; 5d935 (17:5935) +SilphCo9EndBattleText3: TX_FAR _SilphCo9EndBattleText3 db "@" -SilphCo9AfterBattleText3: ; 5d93a (17:593a) +SilphCo9AfterBattleText3: TX_FAR _SilphCo9AfterBattleText3 db "@" diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index d080cfef..9e8f0fe9 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -1,4 +1,4 @@ -SilphCoElevatorScript: ; 457c0 (11:57c0) +SilphCoElevatorScript: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -14,7 +14,7 @@ SilphCoElevatorScript: ; 457c0 (11:57c0) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -SilphCoElevatorScript_457dc: ; 457dc (11:57dc) +SilphCoElevatorScript_457dc: ld hl, wWarpEntries ld a, [wWarpedFromWhichWarp] ld b, a @@ -22,7 +22,7 @@ SilphCoElevatorScript_457dc: ; 457dc (11:57dc) ld c, a call SilphCoElevatorScript_457ea -SilphCoElevatorScript_457ea: ; 457ea (11:57ea) +SilphCoElevatorScript_457ea: inc hl inc hl ld a, b @@ -31,7 +31,7 @@ SilphCoElevatorScript_457ea: ; 457ea (11:57ea) ld [hli], a ret -SilphCoElevatorScript_457f1: ; 457f1 (11:57f1) +SilphCoElevatorScript_457f1: ld hl, SilphCoElavatorFloors call LoadItemList ld hl, SilphCoElevatorWarpMaps @@ -40,7 +40,7 @@ SilphCoElevatorScript_457f1: ; 457f1 (11:57f1) call CopyData ret -SilphCoElavatorFloors: ; 45804 (11:45804) +SilphCoElavatorFloors: db $0B ; num elements in list db FLOOR_1F db FLOOR_2F @@ -55,7 +55,7 @@ SilphCoElavatorFloors: ; 45804 (11:45804) db FLOOR_11F db $FF ; terminator -SilphCoElevatorWarpMaps: ; 45811 (11:45811) +SilphCoElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. @@ -72,15 +72,15 @@ SilphCoElevatorWarpMaps: ; 45811 (11:45811) db $01, SILPH_CO_11F SilphCoElevatorWarpMapsEnd: -SilphCoElevatorScript_45827: ; 45827 (11:5827) +SilphCoElevatorScript_45827: call Delay3 callba ShakeElevator ret -SilphCoElevatorTextPointers: ; 45833 (11:5833) +SilphCoElevatorTextPointers: dw SilphCoElevatorText1 -SilphCoElevatorText1: ; 45835 (11:5835) +SilphCoElevatorText1: TX_ASM call SilphCoElevatorScript_457f1 ld hl, SilphCoElevatorWarpMaps diff --git a/scripts/ssanne1.asm b/scripts/ssanne1.asm index 4814dfe9..3f8861d5 100755 --- a/scripts/ssanne1.asm +++ b/scripts/ssanne1.asm @@ -1,15 +1,15 @@ -SSAnne1Script: ; 61265 (18:5265) +SSAnne1Script: call EnableAutoTextBoxDrawing ret -SSAnne1TextPointers: ; 61269 (18:5269) +SSAnne1TextPointers: dw SSAnne1Text1 dw SSAnne1Text2 -SSAnne1Text1: ; 6126d (18:526d) +SSAnne1Text1: TX_FAR _SSAnne1Text1 db "@" -SSAnne1Text2: ; 61272 (18:5272) +SSAnne1Text2: TX_FAR _SSAnne1Text2 db "@" diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm index 3b53b961..363e24c5 100755 --- a/scripts/ssanne10.asm +++ b/scripts/ssanne10.asm @@ -1,4 +1,4 @@ -SSAnne10Script: ; 61d55 (18:5d55) +SSAnne10Script: call EnableAutoTextBoxDrawing ld hl, SSAnne10TrainerHeaders ld de, SSAnne10ScriptPointers @@ -7,12 +7,12 @@ SSAnne10Script: ; 61d55 (18:5d55) ld [W_SSANNE10CURSCRIPT], a ret -SSAnne10ScriptPointers: ; 61d68 (18:5d68) +SSAnne10ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne10TextPointers: ; 61d6e (18:5d6e) +SSAnne10TextPointers: dw SSAnne10Text1 dw SSAnne10Text2 dw SSAnne10Text3 @@ -25,8 +25,8 @@ SSAnne10TextPointers: ; 61d6e (18:5d6e) dw PickUpItemText dw PickUpItemText -SSAnne10TrainerHeaders: ; 61d84 (18:5d84) -SSAnne10TrainerHeader0: ; 61d84 (18:5d84) +SSAnne10TrainerHeaders: +SSAnne10TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_0 @@ -35,7 +35,7 @@ SSAnne10TrainerHeader0: ; 61d84 (18:5d84) dw SSAnne10EndBattleText1 ; TextEndBattle dw SSAnne10EndBattleText1 ; TextEndBattle -SSAnne10TrainerHeader1: ; 61d90 (18:5d90) +SSAnne10TrainerHeader1: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_1 @@ -44,7 +44,7 @@ SSAnne10TrainerHeader1: ; 61d90 (18:5d90) dw SSAnne10EndBattleText2 ; TextEndBattle dw SSAnne10EndBattleText2 ; TextEndBattle -SSAnne10TrainerHeader2: ; 61d9c (18:5d9c) +SSAnne10TrainerHeader2: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_2 @@ -53,7 +53,7 @@ SSAnne10TrainerHeader2: ; 61d9c (18:5d9c) dw SSAnne10EndBattleText3 ; TextEndBattle dw SSAnne10EndBattleText3 ; TextEndBattle -SSAnne10TrainerHeader3: ; 61da8 (18:5da8) +SSAnne10TrainerHeader3: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_3 @@ -62,7 +62,7 @@ SSAnne10TrainerHeader3: ; 61da8 (18:5da8) dw SSAnne10EndBattleText4 ; TextEndBattle dw SSAnne10EndBattleText4 ; TextEndBattle -SSAnne10TrainerHeader4: ; 61db4 (18:5db4) +SSAnne10TrainerHeader4: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_4 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_4 @@ -71,7 +71,7 @@ SSAnne10TrainerHeader4: ; 61db4 (18:5db4) dw SSAnne10EndBattleText5 ; TextEndBattle dw SSAnne10EndBattleText5 ; TextEndBattle -SSAnne10TrainerHeader5: ; 61dc0 (18:5dc0) +SSAnne10TrainerHeader5: dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_10_TRAINER_5 @@ -82,121 +82,121 @@ SSAnne10TrainerHeader5: ; 61dc0 (18:5dc0) db $ff -SSAnne10Text1: ; 61dcd (18:5dcd) +SSAnne10Text1: TX_ASM ld hl, SSAnne10TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne10Text2: ; 61dd7 (18:5dd7) +SSAnne10Text2: TX_ASM ld hl, SSAnne10TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne10Text3: ; 61de1 (18:5de1) +SSAnne10Text3: TX_ASM ld hl, SSAnne10TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SSAnne10Text4: ; 61deb (18:5deb) +SSAnne10Text4: TX_ASM ld hl, SSAnne10TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SSAnne10Text5: ; 61df5 (18:5df5) +SSAnne10Text5: TX_ASM ld hl, SSAnne10TrainerHeader4 call TalkToTrainer jp TextScriptEnd -SSAnne10Text6: ; 61dff (18:5dff) +SSAnne10Text6: TX_ASM ld hl, SSAnne10TrainerHeader5 call TalkToTrainer jp TextScriptEnd -SSAnne10Text8: ; 61e09 (18:5e09) +SSAnne10Text8: TX_FAR _SSAnne10Text8 TX_ASM ld a, MACHOKE call PlayCry jp TextScriptEnd -SSAnne10BattleText1: ; 61e16 (18:5e16) +SSAnne10BattleText1: TX_FAR _SSAnne10BattleText1 db "@" -SSAnne10EndBattleText1: ; 61e1b (18:5e1b) +SSAnne10EndBattleText1: TX_FAR _SSAnne10EndBattleText1 db "@" -SSAnne10AfterBattleText1: ; 61e20 (18:5e20) +SSAnne10AfterBattleText1: TX_FAR _SSAnne10AfterBattleText1 db "@" -SSAnne10BattleText2: ; 61e25 (18:5e25) +SSAnne10BattleText2: TX_FAR _SSAnne10BattleText2 db "@" -SSAnne10EndBattleText2: ; 61e2a (18:5e2a) +SSAnne10EndBattleText2: TX_FAR _SSAnne10EndBattleText2 db "@" -SSAnne10AfterBattleText2: ; 61e2f (18:5e2f) +SSAnne10AfterBattleText2: TX_FAR _SSAnne10AfterBattleText2 db "@" -SSAnne10BattleText3: ; 61e34 (18:5e34) +SSAnne10BattleText3: TX_FAR _SSAnne10BattleText3 db "@" -SSAnne10EndBattleText3: ; 61e39 (18:5e39) +SSAnne10EndBattleText3: TX_FAR _SSAnne10EndBattleText3 db "@" -SSAnne10AfterBattleText3: ; 61e3e (18:5e3e) +SSAnne10AfterBattleText3: TX_FAR _SSAnne10AfterBattleText3 db "@" -SSAnne10BattleText4: ; 61e43 (18:5e43) +SSAnne10BattleText4: TX_FAR _SSAnne10BattleText4 db "@" -SSAnne10EndBattleText4: ; 61e48 (18:5e48) +SSAnne10EndBattleText4: TX_FAR _SSAnne10EndBattleText4 db "@" -SSAnne10AfterBattleText4: ; 61e4d (18:5e4d) +SSAnne10AfterBattleText4: TX_FAR _SSAnne10AfterBattleText4 db "@" -SSAnne10BattleText5: ; 61e52 (18:5e52) +SSAnne10BattleText5: TX_FAR _SSAnne10BattleText5 db "@" -SSAnne10EndBattleText5: ; 61e57 (18:5e57) +SSAnne10EndBattleText5: TX_FAR _SSAnne10EndBattleText5 db "@" -SSAnne10AfterBattleText5: ; 61e5c (18:5e5c) +SSAnne10AfterBattleText5: TX_FAR _SSAnne10AfterBattleText5 db "@" -SSAnne10BattleText6: ; 61e61 (18:5e61) +SSAnne10BattleText6: TX_FAR _SSAnne10BattleText6 db "@" -SSAnne10EndBattleText6: ; 61e66 (18:5e66) +SSAnne10EndBattleText6: TX_FAR _SSAnne10EndBattleText6 db "@" -SSAnne10AfterBattleText6: ; 61e6b (18:5e6b) +SSAnne10AfterBattleText6: TX_FAR _SSAnne10AfterBattleText6 db "@" -SSAnne10Text7: ; 61e70 (18:5e70) +SSAnne10Text7: TX_FAR _SSAnne10Text7 db "@" diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 3a2e207a..9b011075 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -1,26 +1,26 @@ -SSAnne2Script: ; 6139f (18:539f) +SSAnne2Script: call EnableAutoTextBoxDrawing ld hl, SSAnne2ScriptPointers ld a, [W_SSANNE2CURSCRIPT] jp JumpTable -SSAnne2Script_613ab: ; 613ab (18:53ab) +SSAnne2Script_613ab: xor a ld [wJoyIgnore], a ld [W_SSANNE2CURSCRIPT], a ret -SSAnne2ScriptPointers: ; 613b3 (18:53b3) +SSAnne2ScriptPointers: dw SSAnne2Script0 dw SSAnne2Script1 dw SSAnne2Script2 dw SSAnne2Script3 dw SSAnne2Script4 -SSAnne2Script4: ; 613bd (18:53bd) +SSAnne2Script4: ret -SSAnne2Script0: ; 613be (18:53be) +SSAnne2Script0: ld hl, CoordsData_61411 call ArePlayerCoordsInArray ret nc @@ -54,21 +54,21 @@ SSAnne2Script0: ; 613be (18:53be) ld [W_SSANNE2CURSCRIPT], a ret -MovementData_6140c: ; 6140c (18:540c) +MovementData_6140c: db NPC_MOVEMENT_DOWN -MovementData_6140d: ; 6140d (18:540d) +MovementData_6140d: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db $FF -CoordsData_61411: ; 61411 (18:5411) +CoordsData_61411: db $08,$24 db $08,$25 db $FF -SSAnne2Script_61416: ; 61416 (18:5416) +SSAnne2Script_61416: ld a, [wXCoord] cp $25 jr nz, .asm_61426 @@ -84,7 +84,7 @@ SSAnne2Script_61416: ; 61416 (18:5416) ld [H_SPRITEINDEX], a jp SetSpriteFacingDirectionAndDelay -SSAnne2Script1: ; 61430 (18:5430) +SSAnne2Script1: ld a, [wd730] bit 0, a ret nz @@ -104,7 +104,7 @@ SSAnne2Script1: ; 61430 (18:5430) ld [W_SSANNE2CURSCRIPT], a ret -SSAnne2Script2: ; 6146d (18:546d) +SSAnne2Script2: ld a, [wIsInBattle] cp $ff jp z, SSAnne2Script_613ab @@ -134,18 +134,18 @@ SSAnne2Script2: ; 6146d (18:546d) ld [W_SSANNE2CURSCRIPT], a ret -MovementData_614b7: ; 614b7 (18:54b7) +MovementData_614b7: db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_DOWN -MovementData_614b9: ; 614b9 (18:54b9) +MovementData_614b9: db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_DOWN db $FF -SSAnne2Script3: ; 614be (18:54be) +SSAnne2Script3: ld a, [wd730] bit 0, a ret nz @@ -159,16 +159,16 @@ SSAnne2Script3: ; 614be (18:54be) ld [W_SSANNE2CURSCRIPT], a ret -SSAnne2TextPointers: ; 614db (18:54db) +SSAnne2TextPointers: dw SSAnne2Text1 dw SSAnne2Text2 dw SSAnne2Text3 -SSAnne2Text1: ; 614e1 (18:54e1) +SSAnne2Text1: TX_FAR _SSAnne2Text1 db "@" -SSAnne2Text2: ; 614e6 (18:54e6) +SSAnne2Text2: TX_ASM ld hl, SSAnneRivalBeforeBattleText call PrintText @@ -180,18 +180,18 @@ SSAnne2Text2: ; 614e6 (18:54e6) call SaveEndBattleTextPointers jp TextScriptEnd -SSAnneRivalBeforeBattleText: ; 61500 (18:5500) +SSAnneRivalBeforeBattleText: TX_FAR _SSAnneRivalBeforeBattleText db "@" -SSAnneRivalDefeatedText: ; 61505 (18:5505) +SSAnneRivalDefeatedText: TX_FAR _SSAnneRivalDefeatedText db "@" -SSAnneRivalWonText: ; 6150a (18:550a) +SSAnneRivalWonText: TX_FAR _SSAnneRivalWonText db "@" -SSAnne2Text3: ; 6150f (18:550f) +SSAnne2Text3: TX_FAR _SSAnneRivalCaptainText db "@" diff --git a/scripts/ssanne3.asm b/scripts/ssanne3.asm index 56cbdd9c..e681591a 100755 --- a/scripts/ssanne3.asm +++ b/scripts/ssanne3.asm @@ -1,9 +1,9 @@ -SSAnne3Script: ; 44932 (11:4932) +SSAnne3Script: jp EnableAutoTextBoxDrawing -SSAnne3TextPointers: ; 44935 (11:4935) +SSAnne3TextPointers: dw SSAnne3Text1 -SSAnne3Text1: ; 44937 (11:4937) +SSAnne3Text1: TX_FAR _SSAnne3Text1 db "@" diff --git a/scripts/ssanne4.asm b/scripts/ssanne4.asm index 6cc0e7b9..c9411717 100755 --- a/scripts/ssanne4.asm +++ b/scripts/ssanne4.asm @@ -1,5 +1,5 @@ -SSAnne4Script: ; 6162e (18:562e) +SSAnne4Script: jp EnableAutoTextBoxDrawing -SSAnne4TextPointers: ; 61631 (18:5631) +SSAnne4TextPointers: db "@" diff --git a/scripts/ssanne5.asm b/scripts/ssanne5.asm index 76553563..99fb47cf 100755 --- a/scripts/ssanne5.asm +++ b/scripts/ssanne5.asm @@ -1,4 +1,4 @@ -SSAnne5Script: ; 616ae (18:56ae) +SSAnne5Script: call EnableAutoTextBoxDrawing ld hl, SSAnne5TrainerHeader0 ld de, SSAnne5ScriptPointers @@ -7,20 +7,20 @@ SSAnne5Script: ; 616ae (18:56ae) ld [W_SSANNE5CURSCRIPT], a ret -SSAnne5ScriptPointers: ; 616c1 (18:56c1) +SSAnne5ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne5TextPointers: ; 616c7 (18:56c7) +SSAnne5TextPointers: dw SSAnne5Text1 dw SSAnne5Text2 dw SSAnne5Text3 dw SSAnne5Text4 dw SSAnne5Text5 -SSAnne5TrainerHeaders: ; 616d1 (18:56d1) -SSAnne5TrainerHeader0: ; 616d1 (18:56d1) +SSAnne5TrainerHeaders: +SSAnne5TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_0 @@ -29,7 +29,7 @@ SSAnne5TrainerHeader0: ; 616d1 (18:56d1) dw SSAnne5EndBattleText1 ; TextEndBattle dw SSAnne5EndBattleText1 ; TextEndBattle -SSAnne5TrainerHeader1: ; 616dd (18:56dd) +SSAnne5TrainerHeader1: dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_5_TRAINER_1 @@ -40,50 +40,50 @@ SSAnne5TrainerHeader1: ; 616dd (18:56dd) db $ff -SSAnne5Text1: ; 616ea (18:56ea) +SSAnne5Text1: TX_FAR _SSAnne5Text1 db "@" -SSAnne5Text2: ; 616ef (18:56ef) +SSAnne5Text2: TX_FAR _SSAnne5Text2 db "@" -SSAnne5Text3: ; 616f4 (18:56f4) +SSAnne5Text3: TX_FAR _SSAnne5Text3 db "@" -SSAnne5Text4: ; 616f9 (18:56f9) +SSAnne5Text4: TX_ASM ld hl, SSAnne5TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne5BattleText1: ; 61703 (18:5703) +SSAnne5BattleText1: TX_FAR _SSAnne5BattleText1 db "@" -SSAnne5EndBattleText1: ; 61708 (18:5708) +SSAnne5EndBattleText1: TX_FAR _SSAnne5EndBattleText1 db "@" -SSAnne5AfterBattleText1: ; 6170d (18:570d) +SSAnne5AfterBattleText1: TX_FAR _SSAnne5AfterBattleText1 db "@" -SSAnne5Text5: ; 61712 (18:5712) +SSAnne5Text5: TX_ASM ld hl, SSAnne5TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne5BattleText2: ; 6171c (18:571c) +SSAnne5BattleText2: TX_FAR _SSAnne5BattleText2 db "@" -SSAnne5EndBattleText2: ; 61721 (18:5721) +SSAnne5EndBattleText2: TX_FAR _SSAnne5EndBattleText2 db "@" -SSAnne5AfterBattleText2: ; 61726 (18:5726) +SSAnne5AfterBattleText2: TX_FAR _SSAnne5AfterBattleText2 db "@" diff --git a/scripts/ssanne6.asm b/scripts/ssanne6.asm index fbe8176d..e1998858 100755 --- a/scripts/ssanne6.asm +++ b/scripts/ssanne6.asm @@ -1,8 +1,8 @@ -SSAnne6Script: ; 617b3 (18:57b3) +SSAnne6Script: call EnableAutoTextBoxDrawing ret -SSAnne6TextPointers: ; 617b7 (18:57b7) +SSAnne6TextPointers: dw SSAnne6Text1 dw SSAnne6Text2 dw SSAnne6Text3 @@ -11,31 +11,31 @@ SSAnne6TextPointers: ; 617b7 (18:57b7) dw SSAnne6Text6 dw SSAnne6Text7 -SSAnne6Text1: ; 617c5 (18:57c5) +SSAnne6Text1: TX_FAR _SSAnne6Text1 db "@" -SSAnne6Text2: ; 617ca (18:57ca) +SSAnne6Text2: TX_FAR _SSAnne6Text2 db "@" -SSAnne6Text3: ; 617cf (18:57cf) +SSAnne6Text3: TX_FAR _SSAnne6Text3 db "@" -SSAnne6Text4: ; 617d4 (18:57d4) +SSAnne6Text4: TX_FAR _SSAnne6Text4 db "@" -SSAnne6Text5: ; 617d9 (18:57d9) +SSAnne6Text5: TX_FAR _SSAnne6Text5 db "@" -SSAnne6Text6: ; 617de (18:57de) +SSAnne6Text6: TX_FAR _SSAnne6Text6 db "@" -SSAnne6Text7: ; 617e3 (18:57e3) +SSAnne6Text7: TX_ASM ld hl, SSAnne6Text_61807 call PrintText @@ -55,18 +55,18 @@ SSAnne6Text7: ; 617e3 (18:57e3) call PrintText jp TextScriptEnd -SSAnne6Text_61807: ; 61807 (18:5807) +SSAnne6Text_61807: TX_FAR _SSAnne6Text_61807 db "@" -SSAnne6Text_6180c: ; 6180c (18:580c) +SSAnne6Text_6180c: TX_FAR _SSAnne6Text_6180c db "@" -SSAnne6Text_61811: ; 61811 (18:5811) +SSAnne6Text_61811: TX_FAR _SSAnne6Text_61811 db "@" -SSAnne6Text_61816: ; 61816 (18:5816) +SSAnne6Text_61816: TX_FAR _SSAnne6Text_61816 db "@" diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index 6d07d308..06789cd5 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -1,20 +1,20 @@ -SSAnne7Script: ; 61895 (18:5895) +SSAnne7Script: call SSAnne7Script_6189b jp EnableAutoTextBoxDrawing -SSAnne7Script_6189b: ; 6189b (18:589b) +SSAnne7Script_6189b: CheckEvent EVENT_GOT_HM01 ret nz ld hl, wd72d set 5, [hl] ret -SSAnne7TextPointers: ; 618a7 (18:58a7) +SSAnne7TextPointers: dw SSAnne7Text1 dw SSAnne7Text2 dw SSAnne7Text3 -SSAnne7Text1: ; 618ad (18:58ad) +SSAnne7Text1: TX_ASM CheckEvent EVENT_GOT_HM01 jr nz, .asm_797c4 @@ -41,7 +41,7 @@ SSAnne7Text1: ; 618ad (18:58ad) .asm_0faf5 jp TextScriptEnd -SSAnne7RubText: ; 618ec (18:58ec) +SSAnne7RubText: TX_FAR _SSAnne7RubText TX_ASM ld a, [wAudioROMBank] @@ -65,26 +65,26 @@ SSAnne7RubText: ; 618ec (18:58ec) res 5, [hl] jp TextScriptEnd -ReceivingHM01Text: ; 61927 (18:5927) +ReceivingHM01Text: TX_FAR _ReceivingHM01Text db "@" -ReceivedHM01Text: ; 6192c (18:592c) +ReceivedHM01Text: TX_FAR _ReceivedHM01Text db $11, "@" -SSAnne7Text_61932: ; 61932 (18:5932) +SSAnne7Text_61932: TX_FAR _SSAnne7Text_61932 db "@" -HM01NoRoomText: ; 61937 (18:5937) +HM01NoRoomText: TX_FAR _HM01NoRoomText db "@" -SSAnne7Text2: ; 6193c (18:593c) +SSAnne7Text2: TX_FAR _SSAnne7Text2 db "@" -SSAnne7Text3: ; 61941 (18:5941) +SSAnne7Text3: TX_FAR _SSAnne7Text3 db "@" diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm index 195c9a81..0f0e3850 100755 --- a/scripts/ssanne8.asm +++ b/scripts/ssanne8.asm @@ -1,4 +1,4 @@ -SSAnne8Script: ; 61976 (18:5976) +SSAnne8Script: call EnableAutoTextBoxDrawing ld hl, SSAnne8TrainerHeaders ld de, SSAnne8ScriptPointers @@ -7,12 +7,12 @@ SSAnne8Script: ; 61976 (18:5976) ld [W_SSANNE8CURSCRIPT], a ret -SSAnne8ScriptPointers: ; 61989 (18:5989) +SSAnne8ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne8TextPointers: ; 6198f (18:598f) +SSAnne8TextPointers: dw SSAnne8Text1 dw SSAnne8Text2 dw SSAnne8Text3 @@ -25,8 +25,8 @@ SSAnne8TextPointers: ; 6198f (18:598f) dw PickUpItemText dw SSAnne8Text11 -SSAnne8TrainerHeaders: ; 619a5 (18:59a5) -SSAnne8TrainerHeader0: ; 619a5 (18:59a5) +SSAnne8TrainerHeaders: +SSAnne8TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_0 @@ -35,7 +35,7 @@ SSAnne8TrainerHeader0: ; 619a5 (18:59a5) dw SSAnne8EndBattleText1 ; TextEndBattle dw SSAnne8EndBattleText1 ; TextEndBattle -SSAnne8TrainerHeader1: ; 619b1 (18:59b1) +SSAnne8TrainerHeader1: dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_1 @@ -44,7 +44,7 @@ SSAnne8TrainerHeader1: ; 619b1 (18:59b1) dw SSAnne8EndBattleText2 ; TextEndBattle dw SSAnne8EndBattleText2 ; TextEndBattle -SSAnne8TrainerHeader2: ; 619bd (18:59bd) +SSAnne8TrainerHeader2: dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_2 @@ -53,7 +53,7 @@ SSAnne8TrainerHeader2: ; 619bd (18:59bd) dw SSAnne8EndBattleText3 ; TextEndBattle dw SSAnne8EndBattleText3 ; TextEndBattle -SSAnne8TrainerHeader3: ; 619c9 (18:59c9) +SSAnne8TrainerHeader3: dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_8_TRAINER_3 @@ -64,101 +64,101 @@ SSAnne8TrainerHeader3: ; 619c9 (18:59c9) db $ff -SSAnne8Text1: ; 619d6 (18:59d6) +SSAnne8Text1: TX_ASM ld hl, SSAnne8TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne8Text2: ; 619e0 (18:59e0) +SSAnne8Text2: TX_ASM ld hl, SSAnne8TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne8Text3: ; 619ea (18:59ea) +SSAnne8Text3: TX_ASM ld hl, SSAnne8TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SSAnne8Text4: ; 619f4 (18:59f4) +SSAnne8Text4: TX_ASM ld hl, SSAnne8TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SSAnne8Text8: ; 619fe (18:59fe) +SSAnne8Text8: TX_FAR _SSAnne8Text8 TX_ASM ld a, WIGGLYTUFF call PlayCry jp TextScriptEnd -SSAnne8BattleText1: ; 61a0b (18:5a0b) +SSAnne8BattleText1: TX_FAR _SSAnne8BattleText1 db "@" -SSAnne8EndBattleText1: ; 61a10 (18:5a10) +SSAnne8EndBattleText1: TX_FAR _SSAnne8EndBattleText1 db "@" -SSAnne8AfterBattleText1: ; 61a15 (18:5a15) +SSAnne8AfterBattleText1: TX_FAR _SSAnne8AfterBattleText1 db "@" -SSAnne8BattleText2: ; 61a1a (18:5a1a) +SSAnne8BattleText2: TX_FAR _SSAnne8BattleText2 db "@" -SSAnne8EndBattleText2: ; 61a1f (18:5a1f) +SSAnne8EndBattleText2: TX_FAR _SSAnne8EndBattleText2 db "@" -SSAnne8AfterBattleText2: ; 61a24 (18:5a24) +SSAnne8AfterBattleText2: TX_FAR _SSAnne8AfterBattleText2 db "@" -SSAnne8BattleText3: ; 61a29 (18:5a29) +SSAnne8BattleText3: TX_FAR _SSAnne8BattleText3 db "@" -SSAnne8EndBattleText3: ; 61a2e (18:5a2e) +SSAnne8EndBattleText3: TX_FAR _SSAnne8EndBattleText3 db "@" -SSAnne8AfterBattleText3: ; 61a33 (18:5a33) +SSAnne8AfterBattleText3: TX_FAR _SSAnne8AfterBattleText3 db "@" -SSAnne8BattleText4: ; 61a38 (18:5a38) +SSAnne8BattleText4: TX_FAR _SSAnne8BattleText4 db "@" -SSAnne8EndBattleText4: ; 61a3d (18:5a3d) +SSAnne8EndBattleText4: TX_FAR _SSAnne8EndBattleText4 db "@" -SSAnne8AfterBattleText4: ; 61a42 (18:5a42) +SSAnne8AfterBattleText4: TX_FAR _SSAnne8AfterBattleText4 db "@" -SSAnne8Text5: ; 61a47 (18:5a47) +SSAnne8Text5: TX_FAR _SSAnne8Text5 db "@" -SSAnne8Text6: ; 61a4c (18:5a4c) +SSAnne8Text6: TX_FAR _SSAnne8Text6 db "@" -SSAnne8Text7: ; 61a51 (18:5a51) +SSAnne8Text7: TX_FAR _SSAnne8Text7 db "@" -SSAnne8Text9: ; 61a56 (18:5a56) +SSAnne8Text9: TX_FAR _SSAnne8Text9 db "@" -SSAnne8Text11: ; 61a5b (18:5a5b) +SSAnne8Text11: TX_FAR _SSAnne8Text11 db "@" diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm index 43c3991e..ab11ebc9 100755 --- a/scripts/ssanne9.asm +++ b/scripts/ssanne9.asm @@ -1,4 +1,4 @@ -SSAnne9Script: ; 61b4b (18:5b4b) +SSAnne9Script: call DisableAutoTextBoxDrawing ld hl, SSAnne9TrainerHeaders ld de, SSAnne9ScriptPointers @@ -7,12 +7,12 @@ SSAnne9Script: ; 61b4b (18:5b4b) ld [W_SSANNE9CURSCRIPT], a ret -SSAnne9ScriptPointers: ; 61b64 (18:5b64) +SSAnne9ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne9TextPointers: ; 61b6a (18:5b6a) +SSAnne9TextPointers: dw SSAnne9Text1 dw SSAnne9Text2 dw SSAnne9Text3 @@ -27,8 +27,8 @@ SSAnne9TextPointers: ; 61b6a (18:5b6a) dw SSAnne9Text12 dw SSAnne9Text13 -SSAnne9TrainerHeaders: ; 61b84 (18:5b84) -SSAnne9TrainerHeader0: ; 61b84 (18:5b84) +SSAnne9TrainerHeaders: +SSAnne9TrainerHeader0: dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_0 @@ -37,7 +37,7 @@ SSAnne9TrainerHeader0: ; 61b84 (18:5b84) dw SSAnne9EndBattleText1 ; TextEndBattle dw SSAnne9EndBattleText1 ; TextEndBattle -SSAnne9TrainerHeader1: ; 61b90 (18:5b90) +SSAnne9TrainerHeader1: dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_1 @@ -46,7 +46,7 @@ SSAnne9TrainerHeader1: ; 61b90 (18:5b90) dw SSAnne9EndBattleText2 ; TextEndBattle dw SSAnne9EndBattleText2 ; TextEndBattle -SSAnne9TrainerHeader2: ; 61b9c (18:5b9c) +SSAnne9TrainerHeader2: dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_2 @@ -55,7 +55,7 @@ SSAnne9TrainerHeader2: ; 61b9c (18:5b9c) dw SSAnne9EndBattleText3 ; TextEndBattle dw SSAnne9EndBattleText3 ; TextEndBattle -SSAnne9TrainerHeader3: ; 61ba8 (18:5ba8) +SSAnne9TrainerHeader3: dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SS_ANNE_9_TRAINER_3 @@ -66,31 +66,31 @@ SSAnne9TrainerHeader3: ; 61ba8 (18:5ba8) db $ff -SSAnne9Text1: ; 61bb5 (18:5bb5) +SSAnne9Text1: TX_ASM ld hl, SSAnne9TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SSAnne9Text2: ; 61bbf (18:5bbf) +SSAnne9Text2: TX_ASM ld hl, SSAnne9TrainerHeader1 call TalkToTrainer jp TextScriptEnd -SSAnne9Text3: ; 61bc9 (18:5bc9) +SSAnne9Text3: TX_ASM ld hl, SSAnne9TrainerHeader2 call TalkToTrainer jp TextScriptEnd -SSAnne9Text4: ; 61bd3 (18:5bd3) +SSAnne9Text4: TX_ASM ld hl, SSAnne9TrainerHeader3 call TalkToTrainer jp TextScriptEnd -SSAnne9Text5: ; 61bdd (18:5bdd) +SSAnne9Text5: TX_ASM call SaveScreenTilesToBuffer1 ld hl, SSAnne9Text_61bf2 @@ -100,94 +100,94 @@ SSAnne9Text5: ; 61bdd (18:5bdd) call DisplayPokedex jp TextScriptEnd -SSAnne9Text_61bf2: ; 61bf2 (18:5bf2) +SSAnne9Text_61bf2: TX_FAR _SSAnne9Text_61bf2 db "@" -SSAnne9Text7: ; 61bf7 (18:5bf7) +SSAnne9Text7: TX_ASM ld hl, SSAnne9Text_61c01 call PrintText jp TextScriptEnd -SSAnne9Text_61c01: ; 61c01 (18:5c01) +SSAnne9Text_61c01: TX_FAR _SSAnne9Text_61c01 db "@" -SSAnne9Text8: ; 61c06 (18:5c06) +SSAnne9Text8: TX_ASM ld hl, SSAnne9Text_61c10 call PrintText jp TextScriptEnd -SSAnne9Text_61c10: ; 61c10 (18:5c10) +SSAnne9Text_61c10: TX_FAR _SSAnne9Text_61c10 db "@" -SSAnne9Text10: ; 61c15 (18:5c15) +SSAnne9Text10: TX_ASM callba Func_f2570 jp TextScriptEnd -SSAnne9Text11: ; 61c24 (18:5c24) +SSAnne9Text11: TX_ASM callba Func_f257c jp TextScriptEnd -SSAnne9Text12: ; 61c33 (18:5c33) +SSAnne9Text12: TX_ASM callba Func_f2588 jp TextScriptEnd -SSAnne9Text13: ; 61c42 (18:5c42) +SSAnne9Text13: TX_ASM callba Func_f2594 jp TextScriptEnd -SSAnne9BattleText1: ; 61c51 (18:5c51) +SSAnne9BattleText1: TX_FAR _SSAnne9BattleText1 db "@" -SSAnne9EndBattleText1: ; 61c56 (18:5c56) +SSAnne9EndBattleText1: TX_FAR _SSAnne9EndBattleText1 db "@" -SSAnne9AfterBattleText1: ; 61c5b (18:5c5b) +SSAnne9AfterBattleText1: TX_FAR _SSAnne9AfterBattleText1 db "@" -SSAnne9BattleText2: ; 61c60 (18:5c60) +SSAnne9BattleText2: TX_FAR _SSAnne9BattleText2 db "@" -SSAnne9EndBattleText2: ; 61c65 (18:5c65) +SSAnne9EndBattleText2: TX_FAR _SSAnne9EndBattleText2 db "@" -SSAnne9AfterBattleText2: ; 61c6a (18:5c6a) +SSAnne9AfterBattleText2: TX_FAR _SSAnne9AfterBattleText2 db "@" -SSAnne9BattleText3: ; 61c6f (18:5c6f) +SSAnne9BattleText3: TX_FAR _SSAnne9BattleText3 db "@" -SSAnne9EndBattleText3: ; 61c74 (18:5c74) +SSAnne9EndBattleText3: TX_FAR _SSAnne9EndBattleText3 db "@" -SSAnne9AfterBattleText3: ; 61c79 (18:5c79) +SSAnne9AfterBattleText3: TX_FAR _SSAnne9AfterBattleText3 db "@" -SSAnne9BattleText4: ; 61c7e (18:5c7e) +SSAnne9BattleText4: TX_FAR _SSAnne9BattleText4 db "@" -SSAnne9EndBattleText4: ; 61c83 (18:5c83) +SSAnne9EndBattleText4: TX_FAR _SSAnne9EndBattleText4 db "@" -SSAnne9AfterBattleText4: ; 61c88 (18:5c88) +SSAnne9AfterBattleText4: TX_FAR _SSAnne9AfterBattleText4 db "@" diff --git a/scripts/tradecenter.asm b/scripts/tradecenter.asm index 22a61095..a200e719 100644 --- a/scripts/tradecenter.asm +++ b/scripts/tradecenter.asm @@ -1,4 +1,4 @@ -TradeCenterScript: ; 4fd10 (13:7d10) +TradeCenterScript: call EnableAutoTextBoxDrawing ld a, [$ffaa] cp $2 @@ -30,9 +30,9 @@ TradeCenterScript: ; 4fd10 (13:7d10) ld [wSpriteStateData1 + $19], a ret -TradeCenterTextPointers: ; 4fd4c (13:7d4c) +TradeCenterTextPointers: dw TradeCenterText1 -TradeCenterText1: ; 4fd4e (13:7d4e) +TradeCenterText1: TX_FAR _TradeCenterText1 db "@" diff --git a/scripts/undergroundpathentranceroute5.asm b/scripts/undergroundpathentranceroute5.asm index c93ab7b5..18707c4a 100755 --- a/scripts/undergroundpathentranceroute5.asm +++ b/scripts/undergroundpathentranceroute5.asm @@ -1,15 +1,15 @@ -UndergroundPathEntranceRoute5Script: ; 5d6a9 (17:56a9) +UndergroundPathEntranceRoute5Script: ld a, ROUTE_5 ld [wLastMap], a ret -UndergroundPathEntranceRoute5_5d6af: ; 5d6af (17:56af) +UndergroundPathEntranceRoute5_5d6af: db "@" -UndergroundPathEntranceRoute5TextPointers: ; 5d6b0 (17:56b0) +UndergroundPathEntranceRoute5TextPointers: dw UndergroundPathEntranceRoute5Text1 -UndergroundPathEntranceRoute5Text1: ; 5d6b2 (17:56b2) +UndergroundPathEntranceRoute5Text1: TX_ASM ld a, $9 ld [wWhichTrade], a diff --git a/scripts/undergroundpathentranceroute6.asm b/scripts/undergroundpathentranceroute6.asm index 6d356fec..c6dfdcc9 100755 --- a/scripts/undergroundpathentranceroute6.asm +++ b/scripts/undergroundpathentranceroute6.asm @@ -1,11 +1,11 @@ -UndergroundPathEntranceRoute6Script: ; 5d6ef (17:56ef) +UndergroundPathEntranceRoute6Script: ld a, ROUTE_6 ld [wLastMap], a jp EnableAutoTextBoxDrawing -UndergroundPathEntranceRoute6TextPointers: ; 5d6f7 (17:56f7) +UndergroundPathEntranceRoute6TextPointers: dw UndergroundPathEntranceRoute6Text1 -UndergroundPathEntranceRoute6Text1: ; 5d6f9 (17:56f9) +UndergroundPathEntranceRoute6Text1: TX_FAR _UndergrdTunnelEntRoute6Text1 db "@" diff --git a/scripts/undergroundpathentranceroute7.asm b/scripts/undergroundpathentranceroute7.asm index c188a823..84c8e4d5 100755 --- a/scripts/undergroundpathentranceroute7.asm +++ b/scripts/undergroundpathentranceroute7.asm @@ -1,11 +1,11 @@ -UndergroundPathEntranceRoute7Script: ; 5d72c (17:572c) +UndergroundPathEntranceRoute7Script: ld a, ROUTE_7 ld [wLastMap], a jp EnableAutoTextBoxDrawing -UndergroundPathEntranceRoute7TextPointers: ; 5d734 (17:5734) +UndergroundPathEntranceRoute7TextPointers: dw UndergroundPathEntranceRoute7Text1 -UndergroundPathEntranceRoute7Text1: ; 5d736 (17:5736) +UndergroundPathEntranceRoute7Text1: TX_FAR _UndergroundPathEntRoute7Text1 db "@" diff --git a/scripts/undergroundpathentranceroute7copy.asm b/scripts/undergroundpathentranceroute7copy.asm index d94c9f37..c623eeec 100755 --- a/scripts/undergroundpathentranceroute7copy.asm +++ b/scripts/undergroundpathentranceroute7copy.asm @@ -1,24 +1,24 @@ -UndergroundPathEntranceRoute7CopyScript: ; 5d769 (17:5769) +UndergroundPathEntranceRoute7CopyScript: ld a, ROUTE_7 ld [wLastMap], a ret -UndergroundPathEntranceRoute7CopyTextPointers: ; 5d76f (17:576f) +UndergroundPathEntranceRoute7CopyTextPointers: dw UGPathRoute7EntranceUnusedText_5d773 dw UGPathRoute7EntranceUnusedText_5d77d -UGPathRoute7EntranceUnusedText_5d773: ; 5d773 (17:5773) +UGPathRoute7EntranceUnusedText_5d773: TX_FAR _UGPathRoute7EntranceUnusedText_5d773 db "@" -UGPathRoute7EntranceUnusedText_5d778: ; 5d778 (17:5778) +UGPathRoute7EntranceUnusedText_5d778: TX_FAR _UGPathRoute7EntranceUnusedText_5d778 db "@" -UGPathRoute7EntranceUnusedText_5d77d: ; 5d77d (17:577d) +UGPathRoute7EntranceUnusedText_5d77d: TX_FAR _UGPathRoute7EntranceUnusedText_5d77d db "@" -UGPathRoute7EntranceUnusedText_5d782: ; 5d782 (17:5782) +UGPathRoute7EntranceUnusedText_5d782: TX_FAR _UGPathRoute7EntranceUnusedText_5d782 db "@" diff --git a/scripts/undergroundpathentranceroute8.asm b/scripts/undergroundpathentranceroute8.asm index 873cf902..ad0b60ab 100755 --- a/scripts/undergroundpathentranceroute8.asm +++ b/scripts/undergroundpathentranceroute8.asm @@ -1,11 +1,11 @@ -UndergroundPathEntranceRoute8Script: ; 1e289 (7:6289) +UndergroundPathEntranceRoute8Script: ld a, ROUTE_8 ld [wLastMap], a jp EnableAutoTextBoxDrawing -UndergroundPathEntranceRoute8TextPointers: ; 1e291 (7:6291) +UndergroundPathEntranceRoute8TextPointers: dw UndergroundPathEntranceRoute8Text1 -UndergroundPathEntranceRoute8Text1: ; 1e293 (7:6293) +UndergroundPathEntranceRoute8Text1: TX_FAR _UndergroundPathEntRoute8Text1 db "@" diff --git a/scripts/undergroundpathns.asm b/scripts/undergroundpathns.asm index 96bf82a6..8c744740 100755 --- a/scripts/undergroundpathns.asm +++ b/scripts/undergroundpathns.asm @@ -1,5 +1,5 @@ -UndergroundPathNSScript: ; 61f26 (18:5f26) +UndergroundPathNSScript: jp EnableAutoTextBoxDrawing -UndergroundPathNSTextPointers: ; 61f29 (18:5f29) +UndergroundPathNSTextPointers: db "@" diff --git a/scripts/undergroundpathwe.asm b/scripts/undergroundpathwe.asm index f7e3755e..921d3dab 100755 --- a/scripts/undergroundpathwe.asm +++ b/scripts/undergroundpathwe.asm @@ -1,5 +1,5 @@ -UndergroundPathWEScript: ; 61f4a (18:5f4a) +UndergroundPathWEScript: jp EnableAutoTextBoxDrawing -UndergroundPathWETextPointers: ; 61f4d (18:5f4d) +UndergroundPathWETextPointers: db "@" diff --git a/scripts/unknowndungeon1.asm b/scripts/unknowndungeon1.asm index 9951dc52..3b5fae5d 100755 --- a/scripts/unknowndungeon1.asm +++ b/scripts/unknowndungeon1.asm @@ -1,7 +1,7 @@ -UnknownDungeon1Script: ; 74d0c (1d:4d0c) +UnknownDungeon1Script: jp EnableAutoTextBoxDrawing -UnknownDungeon1TextPointers: ; 74d0f (1d:4d0f) +UnknownDungeon1TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/unknowndungeon2.asm b/scripts/unknowndungeon2.asm index 2bf9fdb4..55ebb752 100755 --- a/scripts/unknowndungeon2.asm +++ b/scripts/unknowndungeon2.asm @@ -1,7 +1,7 @@ -UnknownDungeon2Script: ; 45e0b (11:5e0b) +UnknownDungeon2Script: jp EnableAutoTextBoxDrawing -UnknownDungeon2TextPointers: ; 45e0e (11:5e0e) +UnknownDungeon2TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index 265df358..d239c52f 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -1,4 +1,4 @@ -UnknownDungeon3Script: ; 45ef0 (11:5ef0) +UnknownDungeon3Script: call EnableAutoTextBoxDrawing ld hl, UnknownDungeon3TrainerHeaders ld de, UnknownDungeon3ScriptPointers @@ -7,20 +7,20 @@ UnknownDungeon3Script: ; 45ef0 (11:5ef0) ld [W_UNKNOWNDUNGEON3CURSCRIPT], a ret -UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03) +UnknownDungeon3ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -UnknownDungeon3TextPointers: ; 45f09 (11:5f09) +UnknownDungeon3TextPointers: dw UnknownDungeon3Text1 dw PickUpItemText dw PickUpItemText dw PickUpItemText dw PickUpItemText -UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f) -UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f) +UnknownDungeon3TrainerHeaders: +UnknownDungeon3TrainerHeader0: dbEventFlagBit EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 @@ -31,13 +31,13 @@ UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f) db $ff -UnknownDungeon3Text1: ; 45f1c (11:5f1c) +UnknownDungeon3Text1: TX_ASM ld hl, UnknownDungeon3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -UnknownDungeon3MewtwoText: ; 45f26 (11:5f26) +UnknownDungeon3MewtwoText: TX_FAR _UnknownDungeon3MewtwoText TX_ASM ld a, MEWTWO diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 4e4a4959..5121cfd9 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -1,4 +1,4 @@ -VermilionCityScript: ; 197a1 (6:57a1) +VermilionCityScript: call EnableAutoTextBoxDrawing ld hl, wd492 res 7, [hl] @@ -25,7 +25,7 @@ VermilionCityScript_19869: SetEventReuseHL EVENT_152 ret -VermilionCityScript_197c0: ; 197c0 (6:57c0) +VermilionCityScript_197c0: call Random ld a, [hRandomAdd] ld b, a @@ -35,7 +35,7 @@ VermilionCityScript_197c0: ; 197c0 (6:57c0) ld [wFirstLockTrashCanIndex], a ret -VermilionCityScript_197cb: ; 197cb (6:57cb) +VermilionCityScript_197cb: CheckEventHL EVENT_SS_ANNE_LEFT ret z CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT @@ -45,14 +45,14 @@ VermilionCityScript_197cb: ; 197cb (6:57cb) ld [W_VERMILIONCITYCURSCRIPT], a ret -VermilionCityScriptPointers: ; 197dc (6:57dc) +VermilionCityScriptPointers: dw VermilionCityScript0 dw VermilionCityScript1 dw VermilionCityScript2 dw VermilionCityScript3 dw VermilionCityScript4 -VermilionCityScript0: ; 197e6 (6:57e6) +VermilionCityScript0: ld a, [wPlayerFacingDirection] and a ; cp SPRITE_FACING_DOWN jr nz, .asm_198de @@ -85,11 +85,11 @@ VermilionCityScript0: ; 197e6 (6:57e6) .asm_198de ret -CoordsData_19823: ; 19823 (6:5823) +CoordsData_19823: db $1e,$12 db $ff -VermilionCityScript4: ; 19826 (6:5826) +VermilionCityScript4: ld hl, CoordsData_19823 call ArePlayerCoordsInArray ret c @@ -97,7 +97,7 @@ VermilionCityScript4: ; 19826 (6:5826) ld [W_VERMILIONCITYCURSCRIPT], a ret -VermilionCityScript2: ; 19833 (6:5833) +VermilionCityScript2: ld a, $ff ld [wJoyIgnore], a ld a, D_UP @@ -110,7 +110,7 @@ VermilionCityScript2: ; 19833 (6:5833) ld [W_VERMILIONCITYCURSCRIPT], a ret -VermilionCityScript3: ; 1984e (6:584e) +VermilionCityScript3: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -121,7 +121,7 @@ VermilionCityScript3: ; 1984e (6:584e) ld [W_VERMILIONCITYCURSCRIPT], a ret -VermilionCityScript1: ; 1985f (6:585f) +VermilionCityScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -131,7 +131,7 @@ VermilionCityScript1: ; 1985f (6:585f) ld [W_VERMILIONCITYCURSCRIPT], a ret -VermilionCityTextPointers: ; 1986f (6:586f) +VermilionCityTextPointers: dw VermilionCityText1 dw VermilionCityText2 dw VermilionCityText3 @@ -147,11 +147,11 @@ VermilionCityTextPointers: ; 1986f (6:586f) dw VermilionCityText13 dw VermilionCityText14 -VermilionCityText1: ; 19889 (6:5889) +VermilionCityText1: TX_FAR _VermilionCityText1 db "@" -VermilionCityText2: ; 1988e (6:588e) +VermilionCityText2: TX_ASM CheckEvent EVENT_SS_ANNE_LEFT jr nz, .asm_1989e @@ -164,15 +164,15 @@ VermilionCityText2: ; 1988e (6:588e) .asm_198a4 jp TextScriptEnd -VermilionCityText_198a7: ; 198a7 (6:58a7) +VermilionCityText_198a7: TX_FAR _VermilionCityText_198a7 db "@" -VermilionCityText_198ac: ; 198ac (6:58ac) +VermilionCityText_198ac: TX_FAR _VermilionCityText_198ac db "@" -VermilionCityText3: ; 198b1 (6:58b1) +VermilionCityText3: TX_ASM CheckEvent EVENT_SS_ANNE_LEFT jr nz, .asm_198f6 @@ -209,36 +209,36 @@ VermilionCityText3: ; 198b1 (6:58b1) .asm_198fc jp TextScriptEnd -VermilionCityCoords1: ; 198ff (6:58ff) +VermilionCityCoords1: db $1d,$13 db $1f,$13 db $ff -SSAnneWelcomeText4: ; 19904 (6:5904) +SSAnneWelcomeText4: TX_FAR _SSAnneWelcomeText4 db "@" -SSAnneWelcomeText9: ; 19909 (6:5909) +SSAnneWelcomeText9: TX_FAR _SSAnneWelcomeText9 db "@" -SSAnneFlashedTicketText: ; 1990e (6:590e) +SSAnneFlashedTicketText: TX_FAR _SSAnneFlashedTicketText db "@" -SSAnneNoTicketText: ; 19913 (6:5913) +SSAnneNoTicketText: TX_FAR _SSAnneNoTicketText db "@" -SSAnneNotHereText: ; 19918 (6:5918) +SSAnneNotHereText: TX_FAR _SSAnneNotHereText db "@" -VermilionCityText4: ; 1991d (6:591d) +VermilionCityText4: TX_FAR _VermilionCityText4 db "@" -VermilionCityText5: ; 19922 (6:5922) +VermilionCityText5: TX_FAR _VermilionCityText5 TX_ASM ld a, MACHOP @@ -247,20 +247,20 @@ VermilionCityText5: ; 19922 (6:5922) ld hl, VermilionCityText15 ret -VermilionCityText15: ; 19933 (6:5933) +VermilionCityText15: TX_FAR _VermilionCityText15 db "@" -VermilionCityText6: ; 19938 (6:5938) +VermilionCityText6: TX_FAR _VermilionCityText6 db "@" -VermilionCityText8: ; 1993d (6:593d) +VermilionCityText8: TX_ASM callba Func_f1a8a jp TextScriptEnd -VermilionCityText9: ; 19942 (6:5942) +VermilionCityText9: TX_ASM callba Func_f1a96 jp TextScriptEnd @@ -270,17 +270,17 @@ VermilionCityText12: callba Func_f1aa2 jp TextScriptEnd -VermilionCityText13: ; 19947 (6:5947) +VermilionCityText13: TX_ASM callba Func_f1aae jp TextScriptEnd -VermilionCityText14: ; 1994c (6:594c) +VermilionCityText14: TX_ASM callba Func_f1aba jp TextScriptEnd -VermilionCityText7: ; 19951 (6:5951) +VermilionCityText7: TX_ASM callba Func_f1a0f jp TextScriptEnd diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index cef1766e..e1378db3 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -1,4 +1,4 @@ -VermilionDockScript: ; 1db52 (7:5b52) +VermilionDockScript: call EnableAutoTextBoxDrawing CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK jr nz, .asm_1db8d @@ -36,7 +36,7 @@ VermilionDockScript: ; 1db52 (7:5b52) SetEventReuseHL EVENT_WALKED_OUT_OF_DOCK ret -VermilionDock_1db9b: ; 1db9b (7:5b9b) +VermilionDock_1db9b: SetEventForceReuseHL EVENT_SS_ANNE_LEFT ld a, $ff ld [wJoyIgnore], a @@ -121,7 +121,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) dec [hl] ret -VermilionDock_AnimSmokePuffDriftRight: ; 1dc42 (7:5c42) +VermilionDock_AnimSmokePuffDriftRight: push bc push de ld hl, wOAMBuffer + 4 * $4 + 1 ; x coord @@ -139,7 +139,7 @@ VermilionDock_AnimSmokePuffDriftRight: ; 1dc42 (7:5c42) pop bc ret -VermilionDock_EmitSmokePuff: ; 1dc59 (7:5c59) +VermilionDock_EmitSmokePuff: ; new smoke puff above the S.S. Anne's front smokestack ld a, [wSSAnneSmokeX] sub 16 @@ -154,13 +154,13 @@ VermilionDock_EmitSmokePuff: ; 1dc59 (7:5c59) call WriteOAMBlock ret -VermilionDockOAMBlock: ; 1dc74 (7:5c74) +VermilionDockOAMBlock: db $fc, $10 db $fd, $10 db $fe, $10 db $ff, $10 -VermilionDock_1dc7c: ; 1dc7c (7:5c7c) +VermilionDock_1dc7c: ld h, d ld l, $50 call .asm_1dc86 @@ -178,7 +178,7 @@ VermilionDock_1dc7c: ; 1dc7c (7:5c7c) jr z, .asm_1dc8e ret -VermilionDock_EraseSSAnne: ; 1dc94 (7:5c94) +VermilionDock_EraseSSAnne: ; Fill the area the S.S. Anne occupies in BG map 0 with water tiles. ld hl, wVermilionDockTileMapBuffer ld bc, (5 * BG_MAP_WIDTH) + SCREEN_WIDTH @@ -207,9 +207,9 @@ VermilionDock_EraseSSAnne: ; 1dc94 (7:5c94) call DelayFrames ret -VermilionDockTextPointers: ; 1dcbf (7:5cbf) +VermilionDockTextPointers: dw VermilionDockText1 -VermilionDockText1: ; 1dcc1 (7:5cc1) +VermilionDockText1: TX_FAR _VermilionDockText1 db "@" diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index d672a419..6933890f 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -1,4 +1,4 @@ -VermilionGymScript: ; 5ca26 (17:4a26) +VermilionGymScript: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -16,18 +16,18 @@ VermilionGymScript: ; 5ca26 (17:4a26) ld [W_VERMILIONGYMCURSCRIPT], a ret -VermilionGymScript_5ca4c: ; 5ca4c (17:4a4c) +VermilionGymScript_5ca4c: ld hl, Gym3CityName ld de, Gym3LeaderName jp LoadGymLeaderAndCityName -Gym3CityName: ; 5ca55 (17:4a55) +Gym3CityName: db "VERMILION CITY@" -Gym3LeaderName: ; 5ca64 (17:4a64) +Gym3LeaderName: db "LT.SURGE@" -VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) +VermilionGymScript_5ca6d: CheckEvent EVENT_2ND_LOCK_OPENED jr nz, .asm_5ca78 ld a, $24 @@ -41,27 +41,27 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) lb bc, 2, 2 predef_jump ReplaceTileBlock -VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a) +VermilionGymScript_5ca8a: xor a ld [wJoyIgnore], a ld [W_VERMILIONGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -VermilionGymScriptPointers: ; 5ca95 (17:4a95) +VermilionGymScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw VermilionGymScript3 -VermilionGymScript3: ; 5ca9d (17:4a9d) +VermilionGymScript3: ld a, [wIsInBattle] cp $ff jp z, VermilionGymScript_5ca8a ld a, $f0 ld [wJoyIgnore], a -VermilionGymScript_5caaa: ; 5caaa (17:4aaa) +VermilionGymScript_5caaa: ld a, $6 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -89,7 +89,7 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) jp VermilionGymScript_5ca8a -VermilionGymTextPointers: ; 5cae8 (17:4ae8) +VermilionGymTextPointers: dw VermilionGymText1 dw VermilionGymText2 dw VermilionGymText3 @@ -99,8 +99,8 @@ VermilionGymTextPointers: ; 5cae8 (17:4ae8) dw VermilionGymText7 dw VermilionGymText8 -VermilionGymTrainerHeaders: ; 5caf8 (17:4af8) -VermilionGymTrainerHeader0: ; 5caf8 (17:4af8) +VermilionGymTrainerHeaders: +VermilionGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_0 @@ -109,7 +109,7 @@ VermilionGymTrainerHeader0: ; 5caf8 (17:4af8) dw VermilionGymEndBattleText1 ; TextEndBattle dw VermilionGymEndBattleText1 ; TextEndBattle -VermilionGymTrainerHeader1: ; 5cb04 (17:4b04) +VermilionGymTrainerHeader1: dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_1 @@ -118,7 +118,7 @@ VermilionGymTrainerHeader1: ; 5cb04 (17:4b04) dw VermilionGymEndBattleText2 ; TextEndBattle dw VermilionGymEndBattleText2 ; TextEndBattle -VermilionGymTrainerHeader2: ; 5cb10 (17:4b10) +VermilionGymTrainerHeader2: dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VERMILION_GYM_TRAINER_2 @@ -129,7 +129,7 @@ VermilionGymTrainerHeader2: ; 5cb10 (17:4b10) db $ff -VermilionGymText1: ; 5cb1d (17:4b1d) +VermilionGymText1: TX_ASM CheckEvent EVENT_BEAT_LT_SURGE jr z, .asm_5cb39 @@ -165,87 +165,87 @@ VermilionGymText1: ; 5cb1d (17:4b1d) .asm_5cb6a jp TextScriptEnd -VermilionGymText_5cb6d: ; 5cb6d (17:4b6d) +VermilionGymText_5cb6d: TX_FAR _VermilionGymText_5cb6d db "@" -VermilionGymText_5cb72: ; 5cb72 (17:4b72) +VermilionGymText_5cb72: TX_FAR _VermilionGymText_5cb72 db "@" -VermilionGymText6: ; 5cb77 (17:4b77) +VermilionGymText6: TX_FAR _VermilionGymText_5cb77 db "@" -VermilionGymText7: ; 5cb7c (17:4b7c) +VermilionGymText7: TX_FAR _ReceivedTM24Text db $11 TX_FAR _TM24ExplanationText db "@" -VermilionGymText8: ; 5cb86 (17:4b86) +VermilionGymText8: TX_FAR _TM24NoRoomText db "@" -ReceivedThunderbadgeText: ; 5cb8b (17:4b8b) +ReceivedThunderbadgeText: TX_FAR _ReceivedThunderbadgeText db "@" -VermilionGymText2: ; 5cb90 (17:4b90) +VermilionGymText2: TX_ASM ld hl, VermilionGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -VermilionGymBattleText1: ; 5cb9a (17:4b9a) +VermilionGymBattleText1: TX_FAR _VermilionGymBattleText1 db "@" -VermilionGymEndBattleText1: ; 5cb9f (17:4b9f) +VermilionGymEndBattleText1: TX_FAR _VermilionGymEndBattleText1 db "@" -VermilionGymAfterBattleText1: ; 5cba4 (17:4ba4) +VermilionGymAfterBattleText1: TX_FAR _VermilionGymAfterBattleText1 db "@" -VermilionGymText3: ; 5cba9 (17:4ba9) +VermilionGymText3: TX_ASM ld hl, VermilionGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd -VermilionGymBattleText2: ; 5cbb3 (17:4bb3) +VermilionGymBattleText2: TX_FAR _VermilionGymBattleText2 db "@" -VermilionGymEndBattleText2: ; 5cbb8 (17:4bb8) +VermilionGymEndBattleText2: TX_FAR _VermilionGymEndBattleText2 db "@" -VermilionGymAfterBattleText2: ; 5cbbd (17:4bbd) +VermilionGymAfterBattleText2: TX_FAR _VermilionGymAfterBattleText2 db "@" -VermilionGymText4: ; 5cbc2 (17:4bc2) +VermilionGymText4: TX_ASM ld hl, VermilionGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd -VermilionGymBattleText3: ; 5cbcc (17:4bcc) +VermilionGymBattleText3: TX_FAR _VermilionGymBattleText3 db "@" -VermilionGymEndBattleText3: ; 5cbd1 (17:4bd1) +VermilionGymEndBattleText3: TX_FAR _VermilionGymEndBattleText3 db "@" -VermilionGymAfterBattleText3: ; 5cbd6 (17:4bd6) +VermilionGymAfterBattleText3: TX_FAR _VermilionGymAfterBattleText3 db "@" -VermilionGymText5: ; 5cbdb (17:4bdb) +VermilionGymText5: TX_ASM ld a, [wBeatGymFlags] bit 2, a @@ -259,10 +259,10 @@ VermilionGymText5: ; 5cbdb (17:4bdb) .asm_5cbf1 jp TextScriptEnd -VermilionGymText_5cbf4: ; 5cbf4 (17:4bf4) +VermilionGymText_5cbf4: TX_FAR _VermilionGymText_5cbf4 db "@" -VermilionGymText_5cbf9: ; 5cbf9 (17:4bf9) +VermilionGymText_5cbf9: TX_FAR _VermilionGymText_5cbf9 db "@" diff --git a/scripts/vermilionhouse1.asm b/scripts/vermilionhouse1.asm index bfb3da5f..d2dac4ca 100755 --- a/scripts/vermilionhouse1.asm +++ b/scripts/vermilionhouse1.asm @@ -1,17 +1,17 @@ -VermilionHouse1Script: ; 1dafc (7:5afc) +VermilionHouse1Script: call EnableAutoTextBoxDrawing ret -VermilionHouse1TextPointers: ; 1db00 (7:5b00) +VermilionHouse1TextPointers: dw VermilionHouse1Text1 dw VermilionHouse1Text2 dw VermilionHouse1Text3 -VermilionHouse1Text1: ; 1db06 (7:5b06) +VermilionHouse1Text1: TX_FAR _VermilionHouse1Text1 db "@" -VermilionHouse1Text2: ; 1db0b (7:5b0b) +VermilionHouse1Text2: TX_FAR _VermilionHouse1Text2 TX_ASM ld a, PIDGEY @@ -19,6 +19,6 @@ VermilionHouse1Text2: ; 1db0b (7:5b0b) call WaitForSoundToFinish jp TextScriptEnd -VermilionHouse1Text3: ; 1db1b (7:5b1b) +VermilionHouse1Text3: TX_FAR _VermilionHouse1Text3 db "@" diff --git a/scripts/vermilionhouse2.asm b/scripts/vermilionhouse2.asm index f166ebb8..007df5ec 100755 --- a/scripts/vermilionhouse2.asm +++ b/scripts/vermilionhouse2.asm @@ -1,10 +1,10 @@ -VermilionHouse2Script: ; 56070 (15:6070) +VermilionHouse2Script: jp EnableAutoTextBoxDrawing -VermilionHouse2TextPointers: ; 56073 (15:6073) +VermilionHouse2TextPointers: dw VermilionHouse2Text1 -VermilionHouse2Text1: ; 56075 (15:6075) +VermilionHouse2Text1: TX_ASM ld a, [wd728] bit 3, a @@ -34,24 +34,24 @@ VermilionHouse2Text1: ; 56075 (15:6075) call PrintText jp TextScriptEnd -VermilionHouse2Text_560b1: ; 560b1 (15:60b1) +VermilionHouse2Text_560b1: TX_FAR _VermilionHouse2Text_560b1 db "@" -VermilionHouse2Text_560b6: ; 560b6 (15:60b6) +VermilionHouse2Text_560b6: TX_FAR _VermilionHouse2Text_560b6 db $0B TX_FAR _VermilionHouse2Text_560bb db "@" -VermilionHouse2Text_560c0: ; 560c0 (15:60c0) +VermilionHouse2Text_560c0: TX_FAR _VermilionHouse2Text_560c0 db "@" -VermilionHouse2Text_560c5: ; 560c5 (15:60c5) +VermilionHouse2Text_560c5: TX_FAR _VermilionHouse2Text_560c5 db "@" -VermilionHouse2Text_560ca: ; 560ca (15:60ca) +VermilionHouse2Text_560ca: TX_FAR _VermilionHouse2Text_560ca db "@" diff --git a/scripts/vermilionhouse3.asm b/scripts/vermilionhouse3.asm index fef07152..aeada0d0 100755 --- a/scripts/vermilionhouse3.asm +++ b/scripts/vermilionhouse3.asm @@ -1,9 +1,9 @@ -VermilionHouse3Script: ; 19c12 (6:5c12) +VermilionHouse3Script: jp EnableAutoTextBoxDrawing -VermilionHouse3TextPointers: ; 19c15 (6:5c15) +VermilionHouse3TextPointers: dw VermilionHouse3Text1 -VermilionHouse3Text1: ; 19c17 (6:5c17) +VermilionHouse3Text1: TX_FAR TeachingHMsText db "@" diff --git a/scripts/vermilionmart.asm b/scripts/vermilionmart.asm index 921e7852..ec9f7f18 100755 --- a/scripts/vermilionmart.asm +++ b/scripts/vermilionmart.asm @@ -1,15 +1,15 @@ -VermilionMartScript: ; 5c9e1 (17:49e1) +VermilionMartScript: jp EnableAutoTextBoxDrawing -VermilionMartTextPointers: ; 5c9e4 (17:49e4) +VermilionMartTextPointers: dw VermilionMartText1 dw VermilionMartText2 dw VermilionMartText3 -VermilionMartText2: ; 5c9ea (17:49ea) +VermilionMartText2: TX_FAR _VermilionMartText2 db "@" -VermilionMartText3: ; 5c9ef (17:49ef) +VermilionMartText3: TX_FAR _VermilionMartText3 db "@" diff --git a/scripts/vermilionpokecenter.asm b/scripts/vermilionpokecenter.asm index 72c232b7..15d9dbd9 100755 --- a/scripts/vermilionpokecenter.asm +++ b/scripts/vermilionpokecenter.asm @@ -1,26 +1,26 @@ -VermilionPokecenterScript: ; 5c98f (17:498f) +VermilionPokecenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -VermilionPokecenterTextPointers: ; 5c995 (17:4995) +VermilionPokecenterTextPointers: dw VermilionPokecenterText1 dw VermilionPokecenterText2 dw VermilionPokecenterText3 dw VermilionPokecenterText4 dw VermilionPokecenterText5 -VermilionPokecenterText1: ; 5c99d (17:499d) +VermilionPokecenterText1: TX_POKECENTER_NURSE -VermilionPokecenterText2: ; 5c99e (17:499e) +VermilionPokecenterText2: TX_FAR _VermilionPokecenterText1 db "@" -VermilionPokecenterText3: ; 5c9a3 (17:49a3) +VermilionPokecenterText3: TX_FAR _VermilionPokecenterText3 db "@" -VermilionPokecenterText4: ; 5c9a8 (17:49a8) +VermilionPokecenterText4: TX_CABLE_CLUB_RECEPTIONIST VermilionPokecenterText5: diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index ee88d393..71c3823d 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -1,4 +1,4 @@ -VictoryRoad1Script: ; 5da0a (17:5a0a) +VictoryRoad1Script: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -18,12 +18,12 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) lb bc, 6, 4 predef_jump ReplaceTileBlock -VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a) +VictoryRoad1ScriptPointers: dw VictoryRoad1Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -VictoryRoad1Script0: ; 5da40 (17:5a40) +VictoryRoad1Script0: CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH jp nz, CheckFightingMapTrainers ld hl, CoordsData_5da5c @@ -37,10 +37,10 @@ VictoryRoad1Script0: ; 5da40 (17:5a40) SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH ret -CoordsData_5da5c: ; 5da5c (17:5a5c) +CoordsData_5da5c: db $0D,$11,$FF -VictoryRoad1TextPointers: ; 5da5f (17:5a5f) +VictoryRoad1TextPointers: dw VictoryRoad1Text1 dw VictoryRoad1Text2 dw PickUpItemText @@ -49,8 +49,8 @@ VictoryRoad1TextPointers: ; 5da5f (17:5a5f) dw BoulderText dw BoulderText -VictoryRoad1TrainerHeaders: ; 5da6d (17:5a6d) -VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d) +VictoryRoad1TrainerHeaders: +VictoryRoad1TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0 @@ -59,7 +59,7 @@ VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d) dw VictoryRoad1EndBattleText1 ; TextEndBattle dw VictoryRoad1EndBattleText1 ; TextEndBattle -VictoryRoad1TrainerHeader1: ; 5da79 (17:5a79) +VictoryRoad1TrainerHeader1: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1 @@ -70,38 +70,38 @@ VictoryRoad1TrainerHeader1: ; 5da79 (17:5a79) db $ff -VictoryRoad1Text1: ; 5da86 (17:5a86) +VictoryRoad1Text1: TX_ASM ld hl, VictoryRoad1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -VictoryRoad1Text2: ; 5da90 (17:5a90) +VictoryRoad1Text2: TX_ASM ld hl, VictoryRoad1TrainerHeader1 call TalkToTrainer jp TextScriptEnd -VictoryRoad1BattleText1: ; 5da9a (17:5a9a) +VictoryRoad1BattleText1: TX_FAR _VictoryRoad1BattleText1 db "@" -VictoryRoad1EndBattleText1: ; 5da9f (17:5a9f) +VictoryRoad1EndBattleText1: TX_FAR _VictoryRoad1EndBattleText1 db "@" -VictoryRoad1AfterBattleText1: ; 5daa4 (17:5aa4) +VictoryRoad1AfterBattleText1: TX_FAR _VictoryRoad1AfterBattleText1 db "@" -VictoryRoad1BattleText2: ; 5daa9 (17:5aa9) +VictoryRoad1BattleText2: TX_FAR _VictoryRoad1BattleText2 db "@" -VictoryRoad1EndBattleText2: ; 5daae (17:5aae) +VictoryRoad1EndBattleText2: TX_FAR _VictoryRoad1EndBattleText2 db "@" -VictoryRoad1AfterBattleText2: ; 5dab3 (17:5ab3) +VictoryRoad1AfterBattleText2: TX_FAR _VictoryRoad1AfterBattleText2 db "@" diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index 87635c2e..a638018f 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -1,4 +1,4 @@ -VictoryRoad2Script: ; 5179d (14:579d) +VictoryRoad2Script: ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -15,9 +15,9 @@ VictoryRoad2Script: ; 5179d (14:579d) ld [W_VICTORYROAD2CURSCRIPT], a ret -VictoryRoad2Script_517c4: ; 517c4 (14:57c4) +VictoryRoad2Script_517c4: ResetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH -VictoryRoad2Script_517c9: ; 517c9 (14:57c9) +VictoryRoad2Script_517c9: CheckEvent EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 jr z, .asm_517da push af @@ -30,17 +30,17 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9) ret z ld a, $1d lb bc, 7, 11 -VictoryRoad2Script_517e2: ; 517e2 (14:57e2) +VictoryRoad2Script_517e2: ld [wNewTileBlockID], a predef ReplaceTileBlock ret -VictoryRoad2ScriptPointers: ; 517eb (14:57eb) +VictoryRoad2ScriptPointers: dw VictoryRoad2Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -VictoryRoad2Script0: ; 517f1 (14:57f1) +VictoryRoad2Script0: ld hl, CoordsData_51816 call CheckBoulderCoords jp nc, CheckFightingMapTrainers @@ -64,12 +64,12 @@ VictoryRoad2Script0: ; 517f1 (14:57f1) set 5, [hl] ret -CoordsData_51816: ; 51816 (14:5816) +CoordsData_51816: db $10,$01 db $10,$09 db $FF -VictoryRoad2TextPointers: ; 5181b (14:581b) +VictoryRoad2TextPointers: dw VictoryRoad2Text1 dw VictoryRoad2Text2 dw VictoryRoad2Text3 @@ -84,8 +84,8 @@ VictoryRoad2TextPointers: ; 5181b (14:581b) dw BoulderText dw BoulderText -VictoryRoad2TrainerHeaders: ; 51835 (14:5835) -VictoryRoad2TrainerHeader0: ; 51835 (14:5835) +VictoryRoad2TrainerHeaders: +VictoryRoad2TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0 @@ -94,7 +94,7 @@ VictoryRoad2TrainerHeader0: ; 51835 (14:5835) dw VictoryRoad2EndBattleText1 ; TextEndBattle dw VictoryRoad2EndBattleText1 ; TextEndBattle -VictoryRoad2TrainerHeader2: ; 51841 (14:5841) +VictoryRoad2TrainerHeader2: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2 @@ -103,7 +103,7 @@ VictoryRoad2TrainerHeader2: ; 51841 (14:5841) dw VictoryRoad2EndBattleText2 ; TextEndBattle dw VictoryRoad2EndBattleText2 ; TextEndBattle -VictoryRoad2TrainerHeader3: ; 5184d (14:584d) +VictoryRoad2TrainerHeader3: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3 @@ -112,7 +112,7 @@ VictoryRoad2TrainerHeader3: ; 5184d (14:584d) dw VictoryRoad2EndBattleText3 ; TextEndBattle dw VictoryRoad2EndBattleText3 ; TextEndBattle -VictoryRoad2TrainerHeader4: ; 51859 (14:5859) +VictoryRoad2TrainerHeader4: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4 @@ -121,7 +121,7 @@ VictoryRoad2TrainerHeader4: ; 51859 (14:5859) dw VictoryRoad2EndBattleText4 ; TextEndBattle dw VictoryRoad2EndBattleText4 ; TextEndBattle -VictoryRoad2TrainerHeader5: ; 51865 (14:5865) +VictoryRoad2TrainerHeader5: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5 @@ -130,7 +130,7 @@ VictoryRoad2TrainerHeader5: ; 51865 (14:5865) dw VictoryRoad2EndBattleText5 ; TextEndBattle dw VictoryRoad2EndBattleText5 ; TextEndBattle -VictoryRoad2TrainerHeader6: ; 51871 (14:5871) +VictoryRoad2TrainerHeader6: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6 db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6 @@ -141,43 +141,43 @@ VictoryRoad2TrainerHeader6: ; 51871 (14:5871) db $ff -VictoryRoad2Text1: ; 5187e (14:587e) +VictoryRoad2Text1: TX_ASM ld hl, VictoryRoad2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text2: ; 51888 (14:5888) +VictoryRoad2Text2: TX_ASM ld hl, VictoryRoad2TrainerHeader2 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text3: ; 51892 (14:5892) +VictoryRoad2Text3: TX_ASM ld hl, VictoryRoad2TrainerHeader3 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text4: ; 5189c (14:589c) +VictoryRoad2Text4: TX_ASM ld hl, VictoryRoad2TrainerHeader4 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text5: ; 518a6 (14:58a6) +VictoryRoad2Text5: TX_ASM ld hl, VictoryRoad2TrainerHeader5 call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text6: ; 518b0 (14:58b0) +VictoryRoad2Text6: TX_ASM ld hl, VictoryRoad2TrainerHeader6 call TalkToTrainer jp TextScriptEnd -VictoryRoad2BattleText6: ; 518ba (14:58ba) +VictoryRoad2BattleText6: TX_FAR _VictoryRoad2BattleText6 TX_ASM ld a, MOLTRES @@ -185,62 +185,62 @@ VictoryRoad2BattleText6: ; 518ba (14:58ba) call WaitForSoundToFinish jp TextScriptEnd -VictoryRoad2BattleText1: ; 518ca (14:58ca) +VictoryRoad2BattleText1: TX_FAR _VictoryRoad2BattleText1 db "@" -VictoryRoad2EndBattleText1: ; 518cf (14:58cf) +VictoryRoad2EndBattleText1: TX_FAR _VictoryRoad2EndBattleText1 db "@" -VictoryRoad2AfterBattleText1: ; 518d4 (14:58d4) +VictoryRoad2AfterBattleText1: TX_FAR _VictoryRoad2AfterBattleText1 db "@" -VictoryRoad2BattleText2: ; 518d9 (14:58d9) +VictoryRoad2BattleText2: TX_FAR _VictoryRoad2BattleText2 db "@" -VictoryRoad2EndBattleText2: ; 518de (14:58de) +VictoryRoad2EndBattleText2: TX_FAR _VictoryRoad2EndBattleText2 db "@" -VictoryRoad2AfterBattleText2: ; 518e3 (14:58e3) +VictoryRoad2AfterBattleText2: TX_FAR _VictoryRoad2AfterBattleText2 db "@" -VictoryRoad2BattleText3: ; 518e8 (14:58e8) +VictoryRoad2BattleText3: TX_FAR _VictoryRoad2BattleText3 db "@" -VictoryRoad2EndBattleText3: ; 518ed (14:58ed) +VictoryRoad2EndBattleText3: TX_FAR _VictoryRoad2EndBattleText3 db "@" -VictoryRoad2AfterBattleText3: ; 518f2 (14:58f2) +VictoryRoad2AfterBattleText3: TX_FAR _VictoryRoad2AfterBattleText3 db "@" -VictoryRoad2BattleText4: ; 518f7 (14:58f7) +VictoryRoad2BattleText4: TX_FAR _VictoryRoad2BattleText4 db "@" -VictoryRoad2EndBattleText4: ; 518fc (14:58fc) +VictoryRoad2EndBattleText4: TX_FAR _VictoryRoad2EndBattleText4 db "@" -VictoryRoad2AfterBattleText4: ; 51901 (14:5901) +VictoryRoad2AfterBattleText4: TX_FAR _VictoryRoad2AfterBattleText4 db "@" -VictoryRoad2BattleText5: ; 51906 (14:5906) +VictoryRoad2BattleText5: TX_FAR _VictoryRoad2BattleText5 db "@" -VictoryRoad2EndBattleText5: ; 5190b (14:590b) +VictoryRoad2EndBattleText5: TX_FAR _VictoryRoad2EndBattleText5 db "@" -VictoryRoad2AfterBattleText5: ; 51910 (14:5910) +VictoryRoad2AfterBattleText5: TX_FAR _VictoryRoad2AfterBattleText5 db "@" diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 72e13775..33ed97de 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -1,4 +1,4 @@ -VictoryRoad3Script: ; 44980 (11:4980) +VictoryRoad3Script: call VictoryRoad3Script_44996 call EnableAutoTextBoxDrawing ld hl, VictoryRoad3TrainerHeaders @@ -8,7 +8,7 @@ VictoryRoad3Script: ; 44980 (11:4980) ld [W_VICTORYROAD3CURSCRIPT], a ret -VictoryRoad3Script_44996: ; 44996 (11:4996) +VictoryRoad3Script_44996: ld hl, wd126 bit 5, [hl] res 5, [hl] @@ -20,12 +20,12 @@ VictoryRoad3Script_44996: ; 44996 (11:4996) lb bc, 5, 3 predef_jump ReplaceTileBlock -VictoryRoad3ScriptPointers: ; 449b1 (11:49b1) +VictoryRoad3ScriptPointers: dw VictoryRoad3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -VictoryRoad3Script0: ; 449b7 (11:49b7) +VictoryRoad3Script0: ld hl, wFlags_0xcd60 bit 7, [hl] res 7, [hl] @@ -53,7 +53,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) ld [wMissableObjectIndex], a predef_jump ShowObject -.coordsData_449f9: ; 449f9 (11:49f9) +.coordsData_449f9: db $05,$03 db $0F,$17 db $FF @@ -77,7 +77,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7) jp z, CheckFightingMapTrainers ret -VictoryRoad3TextPointers: ; 44a24 (11:4a24) +VictoryRoad3TextPointers: dw VictoryRoad3Text1 dw VictoryRoad3Text2 dw VictoryRoad3Text3 @@ -89,8 +89,8 @@ VictoryRoad3TextPointers: ; 44a24 (11:4a24) dw BoulderText dw BoulderText -VictoryRoad3TrainerHeaders: ; 44a38 (11:4a38) -VictoryRoad3TrainerHeader0: ; 44a38 (11:4a38) +VictoryRoad3TrainerHeaders: +VictoryRoad3TrainerHeader0: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0 @@ -99,7 +99,7 @@ VictoryRoad3TrainerHeader0: ; 44a38 (11:4a38) dw VictoryRoad3EndBattleText2 ; TextEndBattle dw VictoryRoad3EndBattleText2 ; TextEndBattle -VictoryRoad3TrainerHeader2: ; 44a44 (11:4a44) +VictoryRoad3TrainerHeader2: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2 @@ -108,7 +108,7 @@ VictoryRoad3TrainerHeader2: ; 44a44 (11:4a44) dw VictoryRoad3EndBattleText3 ; TextEndBattle dw VictoryRoad3EndBattleText3 ; TextEndBattle -VictoryRoad3TrainerHeader3: ; 44a50 (11:4a50) +VictoryRoad3TrainerHeader3: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3 @@ -117,7 +117,7 @@ VictoryRoad3TrainerHeader3: ; 44a50 (11:4a50) dw VictoryRoad3EndBattleText4 ; TextEndBattle dw VictoryRoad3EndBattleText4 ; TextEndBattle -VictoryRoad3TrainerHeader4: ; 44a5c (11:4a5c) +VictoryRoad3TrainerHeader4: dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4 @@ -128,74 +128,74 @@ VictoryRoad3TrainerHeader4: ; 44a5c (11:4a5c) db $ff -VictoryRoad3Text1: ; 44a69 (11:4a69) +VictoryRoad3Text1: TX_ASM ld hl, VictoryRoad3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -VictoryRoad3Text2: ; 44a73 (11:4a73) +VictoryRoad3Text2: TX_ASM ld hl, VictoryRoad3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -VictoryRoad3Text3: ; 44a7d (11:4a7d) +VictoryRoad3Text3: TX_ASM ld hl, VictoryRoad3TrainerHeader3 call TalkToTrainer jp TextScriptEnd -VictoryRoad3Text4: ; 44a87 (11:4a87) +VictoryRoad3Text4: TX_ASM ld hl, VictoryRoad3TrainerHeader4 call TalkToTrainer jp TextScriptEnd -VictoryRoad3BattleText2: ; 44a91 (11:4a91) +VictoryRoad3BattleText2: TX_FAR _VictoryRoad3BattleText2 db "@" -VictoryRoad3EndBattleText2: ; 44a96 (11:4a96) +VictoryRoad3EndBattleText2: TX_FAR _VictoryRoad3EndBattleText2 db "@" -VictoryRoad3AfterBattleText2: ; 44a9b (11:4a9b) +VictoryRoad3AfterBattleText2: TX_FAR _VictoryRoad3AfterBattleText2 db "@" -VictoryRoad3BattleText3: ; 44aa0 (11:4aa0) +VictoryRoad3BattleText3: TX_FAR _VictoryRoad3BattleText3 db "@" -VictoryRoad3EndBattleText3: ; 44aa5 (11:4aa5) +VictoryRoad3EndBattleText3: TX_FAR _VictoryRoad3EndBattleText3 db "@" -VictoryRoad3AfterBattleText3: ; 44aaa (11:4aaa) +VictoryRoad3AfterBattleText3: TX_FAR _VictoryRoad3AfterBattleText3 db "@" -VictoryRoad3BattleText4: ; 44aaf (11:4aaf) +VictoryRoad3BattleText4: TX_FAR _VictoryRoad3BattleText4 db "@" -VictoryRoad3EndBattleText4: ; 44ab4 (11:4ab4) +VictoryRoad3EndBattleText4: TX_FAR _VictoryRoad3EndBattleText4 db "@" -VictoryRoad3AfterBattleText4: ; 44ab9 (11:4ab9) +VictoryRoad3AfterBattleText4: TX_FAR _VictoryRoad3AfterBattleText4 db "@" -VictoryRoad3BattleText5: ; 44abe (11:4abe) +VictoryRoad3BattleText5: TX_FAR _VictoryRoad3BattleText5 db "@" -VictoryRoad3EndBattleText5: ; 44ac3 (11:4ac3) +VictoryRoad3EndBattleText5: TX_FAR _VictoryRoad3EndBattleText5 db "@" -VictoryRoad3AfterBattleText5: ; 44ac8 (11:4ac8) +VictoryRoad3AfterBattleText5: TX_FAR _VictoryRoad3AfterBattleText5 db "@" diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index 319e0106..9ba0c714 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -1,31 +1,31 @@ -ViridianCityScript: ; 1902a (6:502a) +ViridianCityScript: call EnableAutoTextBoxDrawing ld hl, ViridianCityScriptPointers ld a, [W_VIRIDIANCITYCURSCRIPT] call JumpTable ret -ViridianCityScriptPointers: ; 19037 (6:5037) - dw ViridianCityScript0 ; 1904d - dw ViridianCityScript1 ; 19054 - dw ViridianCityScript2 ; 19057 - dw ViridianCityScript3 ; 190ca - dw ViridianCityScript4 ; 19104 - dw ViridianCityScript5 ; 1913f - dw ViridianCityScript6 ; 1909d - dw ViridianCityScript7 ; 19191 - dw ViridianCityScript8 ; 191a7 - dw ViridianCityScript9 ; 191cf - dw ViridianCityScript10 ; 191f9 +ViridianCityScriptPointers: + dw ViridianCityScript0 + dw ViridianCityScript1 + dw ViridianCityScript2 + dw ViridianCityScript3 + dw ViridianCityScript4 + dw ViridianCityScript5 + dw ViridianCityScript6 + dw ViridianCityScript7 + dw ViridianCityScript8 + dw ViridianCityScript9 + dw ViridianCityScript10 ViridianCityScript0: call ViridianCityScript_1905b call ViridianCityScript_190ab ret -ViridianCityScript1: ; 19054 +ViridianCityScript1: call ViridianCityScript_19162 -ViridianCityScript2: ; 19057 +ViridianCityScript2: call ViridianCityScript_1905b ret @@ -61,7 +61,7 @@ ViridianCityScript_1905b: ld [W_VIRIDIANCITYCURSCRIPT], a ret -ViridianCityScript6: ; 1909d +ViridianCityScript6: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -87,7 +87,7 @@ ViridianCityScript_190ab: ld [W_VIRIDIANCITYCURSCRIPT], a ret -ViridianCityScript3: ; 190ca +ViridianCityScript3: call ViridianCityScript_190ef call ViridianCityScript_190db ResetEvent EVENT_02F @@ -117,7 +117,7 @@ ViridianCityScript_190ef: ld [$ffee], a ret -ViridianCityScript4: ; 19104 +ViridianCityScript4: call ViridianCityScript_1912a call UpdateSprites call Delay3 @@ -145,7 +145,7 @@ ViridianCityScript_1912a: ld [wSpriteStateData2 + 3 * $10 + 5], a ret -ViridianCityScript5: ; 1913f +ViridianCityScript5: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -188,7 +188,7 @@ ViridianCityScript_19162: ld [wJoyIgnore], a ret -ViridianCityScript7: ; 19191 +ViridianCityScript7: call ViridianCityScript_190ef call ViridianCityScript_190db SetEvent EVENT_02F @@ -198,7 +198,7 @@ ViridianCityScript7: ; 19191 ld [W_VIRIDIANCITYCURSCRIPT], a ret -ViridianCityScript8: ; 191a7 +ViridianCityScript8: call ViridianCityScript_1912a call UpdateSprites call Delay3 @@ -216,7 +216,7 @@ ViridianCityScript8: ; 191a7 ld [W_VIRIDIANCITYCURSCRIPT], a ret -ViridianCityScript9: ; 191cf +ViridianCityScript9: ld de, ViridianCityOldManMovementData2 ld a, [wXCoord] cp 19 @@ -242,7 +242,7 @@ ViridianCityOldManMovementData2: db NPC_MOVEMENT_DOWN db $ff -ViridianCityScript10: ; 191f9 +ViridianCityScript10: ld a, [wd730] bit 0, a ret nz @@ -256,22 +256,22 @@ ViridianCityScript10: ; 191f9 ret ViridianCityTextPointers: - dw ViridianCityText_0 ; 19233 - dw ViridianCityText_1 ; 1923f - dw ViridianCityText_2 ; 1924b - dw ViridianCityText_3 ; 19257 - dw ViridianCityText_4 ; 19263 - dw ViridianCityText_5 ; 1926f - dw ViridianCityText_6 ; 1927b - dw ViridianCityText_7 ; 1928c - dw ViridianCityText_8 ; 192b9 - dw ViridianCityText_9 ; 192c5 - dw ViridianCityText_10 ; 192d1 - dw MartSignText ; 23e5 - dw PokeCenterSignText ; 23ea - dw ViridianCityText_11 ; 192dd - dw ViridianCityText_12 ; 192e9 - dw ViridianCityText_13 ; 19287 + dw ViridianCityText_0 + dw ViridianCityText_1 + dw ViridianCityText_2 + dw ViridianCityText_3 + dw ViridianCityText_4 + dw ViridianCityText_5 + dw ViridianCityText_6 + dw ViridianCityText_7 + dw ViridianCityText_8 + dw ViridianCityText_9 + dw ViridianCityText_10 + dw MartSignText + dw PokeCenterSignText + dw ViridianCityText_11 + dw ViridianCityText_12 + dw ViridianCityText_13 ViridianCityText_0: TX_ASM diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm index 8ac0d8a8..ce27d81c 100755 --- a/scripts/viridianforest.asm +++ b/scripts/viridianforest.asm @@ -1,4 +1,4 @@ -ViridianForestScript: ; 6110d (18:510d) +ViridianForestScript: call EnableAutoTextBoxDrawing ld hl, ViridianForestTrainerHeaders ld de, ViridianForestScriptPointers @@ -7,12 +7,12 @@ ViridianForestScript: ; 6110d (18:510d) ld [W_VIRIDIANFORESTCURSCRIPT], a ret -ViridianForestScriptPointers: ; 61120 (18:5120) +ViridianForestScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -ViridianForestTextPointers: ; 61126 (18:5126) +ViridianForestTextPointers: dw ViridianForestText1 dw ViridianForestText2 dw ViridianForestText3 @@ -30,8 +30,8 @@ ViridianForestTextPointers: ; 61126 (18:5126) dw ViridianForestText15 dw ViridianForestText16 -ViridianForestTrainerHeaders: ; 61142 (18:5142) -ViridianForestTrainerHeader0: ; 61142 (18:5142) +ViridianForestTrainerHeaders: +ViridianForestTrainerHeader0: dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0 @@ -40,7 +40,7 @@ ViridianForestTrainerHeader0: ; 61142 (18:5142) dw ViridianForestEndBattleText1 ; TextEndBattle dw ViridianForestEndBattleText1 ; TextEndBattle -ViridianForestTrainerHeader1: ; 6114e (18:514e) +ViridianForestTrainerHeader1: dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1 @@ -49,7 +49,7 @@ ViridianForestTrainerHeader1: ; 6114e (18:514e) dw ViridianForestEndBattleText2 ; TextEndBattle dw ViridianForestEndBattleText2 ; TextEndBattle -ViridianForestTrainerHeader2: ; 6115a (18:515a) +ViridianForestTrainerHeader2: dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2 @@ -78,21 +78,21 @@ ViridianForestTrainerHeader4: db $ff -ViridianForestText1: ; 61167 (18:5167) +ViridianForestText1: TX_FAR _ViridianForestText1 db "@" -ViridianForestText2: ; 6116c (18:516c) +ViridianForestText2: TX_ASM ld hl, ViridianForestTrainerHeader0 jr ViridianForestTalkToTrainer -ViridianForestText3: ; 61176 (18:5176) +ViridianForestText3: TX_ASM ld hl, ViridianForestTrainerHeader1 jr ViridianForestTalkToTrainer -ViridianForestText4: ; 61180 (18:5180) +ViridianForestText4: TX_ASM ld hl, ViridianForestTrainerHeader2 jr ViridianForestTalkToTrainer @@ -109,96 +109,96 @@ ViridianForestTalkToTrainer: call TalkToTrainer jp TextScriptEnd -ViridianForestBattleText1: ; 6118a (18:518a) +ViridianForestBattleText1: TX_FAR _ViridianForestBattleText1 db "@" -ViridianForestEndBattleText1: ; 6118f (18:518f) +ViridianForestEndBattleText1: TX_FAR _ViridianForestEndBattleText1 db "@" -ViridianForestAfterBattleText1: ; 61194 (18:5194) +ViridianForestAfterBattleText1: TX_FAR _ViridianFrstAfterBattleText1 db "@" -ViridianForestBattleText2: ; 61199 (18:5199) +ViridianForestBattleText2: TX_FAR _ViridianForestBattleText2 db "@" -ViridianForestEndBattleText2: ; 6119e (18:519e) +ViridianForestEndBattleText2: TX_FAR _ViridianForestEndBattleText2 db "@" -ViridianForestAfterBattleText2: ; 611a3 (18:51a3) +ViridianForestAfterBattleText2: TX_FAR _ViridianFrstAfterBattleText2 db "@" -ViridianForestBattleText3: ; 611a8 (18:51a8) +ViridianForestBattleText3: TX_FAR _ViridianForestBattleText3 db "@" -ViridianForestEndBattleText3: ; 611ad (18:51ad) +ViridianForestEndBattleText3: TX_FAR _ViridianForestEndBattleText3 db "@" -ViridianForestAfterBattleText3: ; 611b2 (18:51b2) +ViridianForestAfterBattleText3: TX_FAR _ViridianFrstAfterBattleText3 db "@" -ViridianForestBattleText4: ; 611a8 (18:51a8) +ViridianForestBattleText4: TX_FAR _ViridianForestBattleTextPikaGirl db "@" -ViridianForestEndBattleText4: ; 611ad (18:51ad) +ViridianForestEndBattleText4: TX_FAR _ViridianForestEndBattleTextPikaGirl db "@" -ViridianForestAfterBattleText4: ; 611b2 (18:51b2) +ViridianForestAfterBattleText4: TX_FAR _ViridianForestAfterBattleTextPikaGirl db "@" -ViridianForestBattleText5: ; 611a8 (18:51a8) +ViridianForestBattleText5: TX_FAR _ViridianForestBattleTextSamurai db "@" -ViridianForestEndBattleText5: ; 611ad (18:51ad) +ViridianForestEndBattleText5: TX_FAR _ViridianForestEndBattleTextSamurai db "@" -ViridianForestAfterBattleText5: ; 611b2 (18:51b2) +ViridianForestAfterBattleText5: TX_FAR _ViridianForestAfterBattleTextSamurai db "@" -ViridianForestText10: ; 611b7 (18:51b7) +ViridianForestText10: TX_FAR _ViridianForestText8 db "@" -ViridianForestText11: ; 611bc (18:51bc) +ViridianForestText11: TX_ASM ld hl, Func_f2528 jp ViridianForestScript_6120d -ViridianForestText12: ; 611c1 (18:51c1) +ViridianForestText12: TX_ASM ld hl, Func_f2534 jp ViridianForestScript_6120d -ViridianForestText13: ; 611c6 (18:51c6) +ViridianForestText13: TX_ASM ld hl, Func_f2540 jp ViridianForestScript_6120d -ViridianForestText14: ; 611cb (18:51cb) +ViridianForestText14: TX_ASM ld hl, Func_f254c jp ViridianForestScript_6120d -ViridianForestText15: ; 611d0 (18:51d0) +ViridianForestText15: TX_ASM ld hl, Func_f2558 jp ViridianForestScript_6120d -ViridianForestText16: ; 611d5 (18:51d5) +ViridianForestText16: TX_ASM ld hl, Func_f2528 ViridianForestScript_6120d diff --git a/scripts/viridianforestentrance.asm b/scripts/viridianforestentrance.asm index dcfa03ba..95db8bbc 100755 --- a/scripts/viridianforestentrance.asm +++ b/scripts/viridianforestentrance.asm @@ -1,15 +1,15 @@ -ViridianForestEntranceScript: ; 5d65c (17:565c) +ViridianForestEntranceScript: call EnableAutoTextBoxDrawing ret -ViridianForestEntranceTextPointers: ; 5d65f (17:565f) +ViridianForestEntranceTextPointers: dw ViridianForestEntranceText1 dw ViridianForestEntranceText2 -ViridianForestEntranceText1: ; 5d663 (17:5663) +ViridianForestEntranceText1: TX_FAR _ViridianForestEntranceText1 db "@" -ViridianForestEntranceText2: ; 5d668 (17:5668) +ViridianForestEntranceText2: TX_FAR _ViridianForestEntranceText2 db "@" diff --git a/scripts/viridianforestexit.asm b/scripts/viridianforestexit.asm index 0d4d4b29..af7a8523 100755 --- a/scripts/viridianforestexit.asm +++ b/scripts/viridianforestexit.asm @@ -1,14 +1,14 @@ -ViridianForestExitScript: ; 5d587 (17:5587) +ViridianForestExitScript: jp EnableAutoTextBoxDrawing -ViridianForestExitTextPointers: ; 5d58a (17:558a) +ViridianForestExitTextPointers: dw ViridianForestExitText1 dw ViridianForestExitText2 -ViridianForestExitText1: ; 5d58e (17:558e) +ViridianForestExitText1: TX_FAR _ViridianForestExitText1 db "@" -ViridianForestExitText2: ; 5d593 (17:5593) +ViridianForestExitText2: TX_FAR _ViridianForestExitText2 db "@" diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 873a397d..6cc7e2a7 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -1,4 +1,4 @@ -ViridianGymScript: ; 748a3 (1d:48a3) +ViridianGymScript: ld hl, Gym8CityName ld de, Gym8LeaderName call LoadGymLeaderAndCityName @@ -10,26 +10,26 @@ ViridianGymScript: ; 748a3 (1d:48a3) ld [W_VIRIDIANGYMCURSCRIPT], a ret -Gym8CityName: ; 748bf (1d:48bf) +Gym8CityName: db "VIRIDIAN CITY@" -Gym8LeaderName: ; 748cd (1d:48cd) +Gym8LeaderName: db "GIOVANNI@" -ViridianGymScript_748d6: ; 748d6 (1d:48d6) +ViridianGymScript_748d6: xor a ld [wJoyIgnore], a ld [W_VIRIDIANGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -ViridianGymScriptPointers: ; 748e1 (1d:48e1) +ViridianGymScriptPointers: dw ViridianGymScript0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw ViridianGymScript3 dw ViridianGymScript4 -ViridianGymScript0: ; 748eb (1d:48eb) +ViridianGymScript0: ld a, [wYCoord] ld b, a ld a, [wXCoord] @@ -52,7 +52,7 @@ ViridianGymScript0: ; 748eb (1d:48eb) ;format: ;db y,x ;dw pointer to movement -ViridianGymArrowTilePlayerMovement: ; 74916 (1d:4916) +ViridianGymArrowTilePlayerMovement: db $b,$13 dw ViridianGymArrowMovement1 db $1,$13 @@ -80,43 +80,43 @@ ViridianGymArrowTilePlayerMovement: ; 74916 (1d:4916) db $FF ;format: direction, count -ViridianGymArrowMovement1: ; 74947 (1d:4947) +ViridianGymArrowMovement1: db D_UP,$09,$FF -ViridianGymArrowMovement2: ; 7494a (1d:494a) +ViridianGymArrowMovement2: db D_LEFT,$08,$FF -ViridianGymArrowMovement3: ; 7494d (1d:494d) +ViridianGymArrowMovement3: db D_DOWN,$09,$FF -ViridianGymArrowMovement4: ; 74950 (1d:4950) +ViridianGymArrowMovement4: db D_RIGHT,$06,$FF -ViridianGymArrowMovement5: ; 74953 (1d:4953) +ViridianGymArrowMovement5: db D_DOWN,$02,$FF -ViridianGymArrowMovement6: ; 74956 (1d:4956) +ViridianGymArrowMovement6: db D_DOWN,$07,$FF -ViridianGymArrowMovement7: ; 74959 (1d:4959) +ViridianGymArrowMovement7: db D_RIGHT,$08,$FF -ViridianGymArrowMovement8: ; 7495c (1d:495c) +ViridianGymArrowMovement8: db D_RIGHT,$09,$FF -ViridianGymArrowMovement9: ; 7495f (1d:495f) +ViridianGymArrowMovement9: db D_UP,$08,$FF -ViridianGymArrowMovement10: ; 74962 (1d:4962) +ViridianGymArrowMovement10: db D_UP,$06,$FF -ViridianGymArrowMovement11: ; 74965 (1d:4965) +ViridianGymArrowMovement11: db D_LEFT,$06,$FF -ViridianGymArrowMovement12: ; 74968 (1d:4968) +ViridianGymArrowMovement12: db D_LEFT,$0C,$FF -ViridianGymScript4: ; 7496b (1d:496b) +ViridianGymScript4: ld a, [wSimulatedJoypadStatesIndex] and a jr nz, .asm_74980 @@ -130,13 +130,13 @@ ViridianGymScript4: ; 7496b (1d:496b) .asm_74980 jpba LoadSpinnerArrowTiles -ViridianGymScript3: ; 74988 (1d:4988) +ViridianGymScript3: ld a, [wIsInBattle] cp $ff jp z, ViridianGymScript_748d6 ld a, $f0 ld [wJoyIgnore], a -ViridianGymScript3_74995: ; 74995 (1d:4995) +ViridianGymScript3_74995: ld a, $c ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -168,7 +168,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE jp ViridianGymScript_748d6 -ViridianGymTextPointers: ; 749ec (1d:49ec) +ViridianGymTextPointers: dw ViridianGymText1 dw ViridianGymText2 dw ViridianGymText3 @@ -184,8 +184,8 @@ ViridianGymTextPointers: ; 749ec (1d:49ec) dw ViridianGymText13 dw ViridianGymText14 -ViridianGymTrainerHeaders: ; 74a08 (1d:4a08) -ViridianGymTrainerHeader0: ; 74a08 (1d:4a08) +ViridianGymTrainerHeaders: +ViridianGymTrainerHeader0: dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0 @@ -194,7 +194,7 @@ ViridianGymTrainerHeader0: ; 74a08 (1d:4a08) dw ViridianGymEndBattleText1 ; TextEndBattle dw ViridianGymEndBattleText1 ; TextEndBattle -ViridianGymTrainerHeader1: ; 74a14 (1d:4a14) +ViridianGymTrainerHeader1: dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_1 @@ -203,7 +203,7 @@ ViridianGymTrainerHeader1: ; 74a14 (1d:4a14) dw ViridianGymEndBattleText2 ; TextEndBattle dw ViridianGymEndBattleText2 ; TextEndBattle -ViridianGymTrainerHeader2: ; 74a20 (1d:4a20) +ViridianGymTrainerHeader2: dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_2 @@ -212,7 +212,7 @@ ViridianGymTrainerHeader2: ; 74a20 (1d:4a20) dw ViridianGymEndBattleText3 ; TextEndBattle dw ViridianGymEndBattleText3 ; TextEndBattle -ViridianGymTrainerHeader3: ; 74a2c (1d:4a2c) +ViridianGymTrainerHeader3: dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_3 @@ -221,7 +221,7 @@ ViridianGymTrainerHeader3: ; 74a2c (1d:4a2c) dw ViridianGymEndBattleText4 ; TextEndBattle dw ViridianGymEndBattleText4 ; TextEndBattle -ViridianGymTrainerHeader4: ; 74a38 (1d:4a38) +ViridianGymTrainerHeader4: dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_4 @@ -230,7 +230,7 @@ ViridianGymTrainerHeader4: ; 74a38 (1d:4a38) dw ViridianGymEndBattleText5 ; TextEndBattle dw ViridianGymEndBattleText5 ; TextEndBattle -ViridianGymTrainerHeader5: ; 74a44 (1d:4a44) +ViridianGymTrainerHeader5: dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_5 @@ -239,7 +239,7 @@ ViridianGymTrainerHeader5: ; 74a44 (1d:4a44) dw ViridianGymEndBattleText6 ; TextEndBattle dw ViridianGymEndBattleText6 ; TextEndBattle -ViridianGymTrainerHeader6: ; 74a50 (1d:4a50) +ViridianGymTrainerHeader6: dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1 db ($3 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_6, 1 @@ -248,7 +248,7 @@ ViridianGymTrainerHeader6: ; 74a50 (1d:4a50) dw ViridianGymEndBattleText7 ; TextEndBattle dw ViridianGymEndBattleText7 ; TextEndBattle -ViridianGymTrainerHeader7: ; 74a5c (1d:4a5c) +ViridianGymTrainerHeader7: dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1 db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7, 1 @@ -259,7 +259,7 @@ ViridianGymTrainerHeader7: ; 74a5c (1d:4a5c) db $ff -ViridianGymText1: ; 74a69 (1d:4a69) +ViridianGymText1: TX_ASM CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI jr z, .asm_6de66 @@ -301,179 +301,179 @@ ViridianGymText1: ; 74a69 (1d:4a69) .asm_6dff7 jp TextScriptEnd -ViridianGymText_74ace: ; 74ace (1d:4ace) +ViridianGymText_74ace: TX_FAR _ViridianGymText_74ace db "@" -ViridianGymText_74ad3: ; 74ad3 (1d:4ad3) +ViridianGymText_74ad3: TX_FAR _ViridianGymText_74ad3 db $0b, "@" -ViridianGymText_74ad9: ; 74ad9 (1d:4ad9) +ViridianGymText_74ad9: TX_FAR _ViridianGymText_74ad9 db $0d, "@" -ViridianGymText12: ; 74adf (1d:4adf) +ViridianGymText12: TX_FAR _ViridianGymText12 db "@" -ViridianGymText13: ; 74ae4 (1d:4ae4) +ViridianGymText13: TX_FAR _ReceivedTM27Text db $0b -TM27ExplanationText: ; 74ae9 (1d:4ae9) +TM27ExplanationText: TX_FAR _TM27ExplanationText db "@" -ViridianGymText14: ; 74aee (1d:4aee) +ViridianGymText14: TX_FAR _TM27NoRoomText db "@" -ViridianGymText2: ; 74af3 (1d:4af3) +ViridianGymText2: TX_ASM ld hl, ViridianGymTrainerHeader0 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText1: ; 74afd (1d:4afd) +ViridianGymBattleText1: TX_FAR _ViridianGymBattleText1 db "@" -ViridianGymEndBattleText1: ; 74b02 (1d:4b02) +ViridianGymEndBattleText1: TX_FAR _ViridianGymEndBattleText1 db "@" -ViridianGymAfterBattleText1: ; 74b07 (1d:4b07) +ViridianGymAfterBattleText1: TX_FAR _ViridianGymAfterBattleText1 db "@" -ViridianGymText3: ; 74b0c (1d:4b0c) +ViridianGymText3: TX_ASM ld hl, ViridianGymTrainerHeader1 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText2: ; 74b16 (1d:4b16) +ViridianGymBattleText2: TX_FAR _ViridianGymBattleText2 db "@" -ViridianGymEndBattleText2: ; 74b1b (1d:4b1b) +ViridianGymEndBattleText2: TX_FAR _ViridianGymEndBattleText2 db "@" -ViridianGymAfterBattleText2: ; 74b20 (1d:4b20) +ViridianGymAfterBattleText2: TX_FAR _ViridianGymAfterBattleText2 db "@" -ViridianGymText4: ; 74b25 (1d:4b25) +ViridianGymText4: TX_ASM ld hl, ViridianGymTrainerHeader2 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText3: ; 74b2f (1d:4b2f) +ViridianGymBattleText3: TX_FAR _ViridianGymBattleText3 db "@" -ViridianGymEndBattleText3: ; 74b34 (1d:4b34) +ViridianGymEndBattleText3: TX_FAR _ViridianGymEndBattleText3 db "@" -ViridianGymAfterBattleText3: ; 74b39 (1d:4b39) +ViridianGymAfterBattleText3: TX_FAR _ViridianGymAfterBattleText3 db "@" -ViridianGymText5: ; 74b3e (1d:4b3e) +ViridianGymText5: TX_ASM ld hl, ViridianGymTrainerHeader3 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText4: ; 74b48 (1d:4b48) +ViridianGymBattleText4: TX_FAR _ViridianGymBattleText4 db "@" -ViridianGymEndBattleText4: ; 74b4d (1d:4b4d) +ViridianGymEndBattleText4: TX_FAR _ViridianGymEndBattleText4 db "@" -ViridianGymAfterBattleText4: ; 74b52 (1d:4b52) +ViridianGymAfterBattleText4: TX_FAR _ViridianGymAfterBattleText4 db "@" -ViridianGymText6: ; 74b57 (1d:4b57) +ViridianGymText6: TX_ASM ld hl, ViridianGymTrainerHeader4 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText5: ; 74b61 (1d:4b61) +ViridianGymBattleText5: TX_FAR _ViridianGymBattleText5 db "@" -ViridianGymEndBattleText5: ; 74b66 (1d:4b66) +ViridianGymEndBattleText5: TX_FAR _ViridianGymEndBattleText5 db "@" -ViridianGymAfterBattleText5: ; 74b6b (1d:4b6b) +ViridianGymAfterBattleText5: TX_FAR _ViridianGymAfterBattleText5 db "@" -ViridianGymText7: ; 74b70 (1d:4b70) +ViridianGymText7: TX_ASM ld hl, ViridianGymTrainerHeader5 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText6: ; 74b7a (1d:4b7a) +ViridianGymBattleText6: TX_FAR _ViridianGymBattleText6 db "@" -ViridianGymEndBattleText6: ; 74b7f (1d:4b7f) +ViridianGymEndBattleText6: TX_FAR _ViridianGymEndBattleText6 db "@" -ViridianGymAfterBattleText6: ; 74b84 (1d:4b84) +ViridianGymAfterBattleText6: TX_FAR _ViridianGymAfterBattleText6 db "@" -ViridianGymText8: ; 74b89 (1d:4b89) +ViridianGymText8: TX_ASM ld hl, ViridianGymTrainerHeader6 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText7: ; 74b93 (1d:4b93) +ViridianGymBattleText7: TX_FAR _ViridianGymBattleText7 db "@" -ViridianGymEndBattleText7: ; 74b98 (1d:4b98) +ViridianGymEndBattleText7: TX_FAR _ViridianGymEndBattleText7 db "@" -ViridianGymAfterBattleText7: ; 74b9d (1d:4b9d) +ViridianGymAfterBattleText7: TX_FAR _ViridianGymAfterBattleText7 db "@" -ViridianGymText9: ; 74ba2 (1d:4ba2) +ViridianGymText9: TX_ASM ld hl, ViridianGymTrainerHeader7 call TalkToTrainer jp TextScriptEnd -ViridianGymBattleText8: ; 74bac (1d:4bac) +ViridianGymBattleText8: TX_FAR _ViridianGymBattleText8 db "@" -ViridianGymEndBattleText8: ; 74bb1 (1d:4bb1) +ViridianGymEndBattleText8: TX_FAR _ViridianGymEndBattleText8 db "@" -ViridianGymAfterBattleText8: ; 74bb6 (1d:4bb6) +ViridianGymAfterBattleText8: TX_FAR _ViridianGymAfterBattleText8 db "@" -ViridianGymText10: ; 74bbb (1d:4bbb) +ViridianGymText10: TX_ASM CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI jr nz, .asm_1abd1 @@ -486,10 +486,10 @@ ViridianGymText10: ; 74bbb (1d:4bbb) .asm_6064d jp TextScriptEnd -ViridianGymText_74bd4: ; 74bd4 (1d:4bd4) +ViridianGymText_74bd4: TX_FAR _ViridianGymText_74bd4 db "@" -ViridianGymText_74bd9: ; 74bd9 (1d:4bd9) +ViridianGymText_74bd9: TX_FAR _ViridianGymText_74bd9 db "@" diff --git a/scripts/viridianhouse.asm b/scripts/viridianhouse.asm index 61920489..105c8fb6 100755 --- a/scripts/viridianhouse.asm +++ b/scripts/viridianhouse.asm @@ -1,21 +1,21 @@ -ViridianHouseScript: ; 1d58a (7:558a) +ViridianHouseScript: jp EnableAutoTextBoxDrawing -ViridianHouseTextPointers: ; 1d58d (7:558d) +ViridianHouseTextPointers: dw ViridianHouseText1 dw ViridianHouseText2 dw ViridianHouseText3 dw ViridianHouseText4 -ViridianHouseText1: ; 1d595 (7:5595) +ViridianHouseText1: TX_FAR _ViridianHouseText1 db "@" -ViridianHouseText2: ; 1d59a (7:559a) +ViridianHouseText2: TX_FAR _ViridianHouseText2 db "@" -ViridianHouseText3: ; 1d59f (7:559f) +ViridianHouseText3: TX_ASM ld hl, ViridianHouseText_1d5b1 call PrintText @@ -24,10 +24,10 @@ ViridianHouseText3: ; 1d59f (7:559f) call WaitForSoundToFinish jp TextScriptEnd -ViridianHouseText_1d5b1: ; 1d5b1 (7:55b1) +ViridianHouseText_1d5b1: TX_FAR _ViridianHouseText_1d5b1 db "@" -ViridianHouseText4: ; 1d5b6 (7:55b6) +ViridianHouseText4: TX_FAR _ViridianHouseText4 db "@" diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index b69e24c2..e03694d1 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -1,4 +1,4 @@ -ViridianMartScript: ; 1d46e (7:546e) +ViridianMartScript: call ViridianMartScript_1d47d call EnableAutoTextBoxDrawing ld hl, ViridianMartScriptPointers @@ -6,7 +6,7 @@ ViridianMartScript: ; 1d46e (7:546e) call JumpTable ret -ViridianMartScript_1d47d: ; 1d47d (7:547d) +ViridianMartScript_1d47d: CheckEvent EVENT_OAK_GOT_PARCEL jr nz, .asm_1d489 ld hl, ViridianMartTextPointers @@ -20,12 +20,12 @@ ViridianMartScript_1d47d: ; 1d47d (7:547d) ld [wMapTextPtr+1], a ret -ViridianMartScriptPointers: ; 1d495 (7:5495) +ViridianMartScriptPointers: dw ViridianMartScript0 dw ViridianMartScript1 dw ViridianMartScript2 -ViridianMartScript0: ; 1d49b (7:549b) +ViridianMartScript0: call UpdateSprites ld a, $4 ld [hSpriteIndexOrTextID], a @@ -40,12 +40,12 @@ ViridianMartScript0: ; 1d49b (7:549b) ld [W_VIRIDIANMARKETCURSCRIPT], a ret -RLEMovement1d4bb: ; 1d4bb (7:54bb) +RLEMovement1d4bb: db D_LEFT, $01 db D_UP, $02 db $ff -ViridianMartScript1: ; 1d4c0 (7:54c0) +ViridianMartScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -60,7 +60,7 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) ld [W_VIRIDIANMARKETCURSCRIPT], a ret -ViridianMartScript2: ; 1d4df (7:54df) +ViridianMartScript2: CheckEventHL EVENT_02D ret z CheckAndSetEventReuseHL EVENT_02C @@ -73,7 +73,7 @@ ViridianMartScript2: ; 1d4df (7:54df) predef ShowObject ret -ViridianMartTextPointers: ; 1d4e0 (7:54e0) +ViridianMartTextPointers: dw ViridianMartText1 dw ViridianMartText2 dw ViridianMartText3 @@ -83,23 +83,23 @@ ViridianMartTextPointers: ; 1d4e0 (7:54e0) dw ViridianMartText2 dw ViridianMartText3 -ViridianMartText1: ; 1d4f0 (7:54f0) +ViridianMartText1: TX_FAR _ViridianMartText1 db "@" -ViridianMartText4: ; 1d4f5 (7:54f5) +ViridianMartText4: TX_FAR _ViridianMartText4 db "@" -ViridianMartText5: ; 1d4fa (7:54fa) +ViridianMartText5: TX_FAR ViridianMartParcelQuestText TX_SFX_KEY_ITEM db "@" -ViridianMartText2: ; 1d500 (7:5500) +ViridianMartText2: TX_FAR _ViridianMartText2 db "@" -ViridianMartText3: ; 1d505 (7:5505) +ViridianMartText3: TX_FAR _ViridianMartText3 db "@" diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm index c2e2d283..3bbedf8d 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/viridianpokecenter.asm @@ -1,26 +1,26 @@ -ViridianPokeCenterScript: ; 4425d (11:425d) +ViridianPokeCenterScript: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -ViridianPokecenterTextPointers: ; 44263 (11:4263) +ViridianPokecenterTextPointers: dw ViridianPokeCenterText1 dw ViridianPokeCenterText2 dw ViridianPokeCenterText3 dw ViridianPokeCenterText4 dw ViridianPokeCenterText5 -ViridianPokeCenterText1: ; 4426b (11:426b) +ViridianPokeCenterText1: TX_POKECENTER_NURSE -ViridianPokeCenterText2: ; 4426c (11:426c) +ViridianPokeCenterText2: TX_FAR _ViridianPokeCenterText1 db "@" -ViridianPokeCenterText3: ; 44271 (11:4271) +ViridianPokeCenterText3: TX_FAR _ViridianPokeCenterText3 db "@" -ViridianPokeCenterText4: ; 44276 (11:4276) +ViridianPokeCenterText4: TX_CABLE_CLUB_RECEPTIONIST ViridianPokeCenterText5: @@ -176,7 +176,6 @@ INCLUDE "text/maps/mt_moon_b2f.asm" INCLUDE "text/maps/ss_anne_1.asm" INCLUDE "text/maps/ss_anne_2.asm" INCLUDE "text/maps/ss_anne_3.asm" -INCLUDE "text/maps/ss_anne_4.asm" INCLUDE "text/maps/ss_anne_5.asm" INCLUDE "text/maps/ss_anne_6.asm" INCLUDE "text/maps/ss_anne_7.asm" @@ -215,8 +214,6 @@ INCLUDE "text/maps/safari_zone_secret_house.asm" INCLUDE "text/maps/safari_zone_rest_house_2.asm" INCLUDE "text/maps/safari_zone_rest_house_3.asm" INCLUDE "text/maps/safari_zone_rest_house_4.asm" -INCLUDE "text/maps/unknown_dungeon_1f.asm" -INCLUDE "text/maps/unknown_dungeon_2f.asm" INCLUDE "text/maps/unknown_dungeon_b1f.asm" INCLUDE "text/maps/victory_road_1f.asm" INCLUDE "text/maps/lance.asm" @@ -226,10 +223,6 @@ INCLUDE "text/maps/lorelei.asm" INCLUDE "text/maps/bruno.asm" INCLUDE "text/maps/agatha.asm" INCLUDE "text/maps/rock_tunnel_b2f.asm" -INCLUDE "text/maps/seafoam_islands_1f.asm" -INCLUDE "text/maps/seafoam_islands_b1f.asm" -INCLUDE "text/maps/seafoam_islands_b2f.asm" -INCLUDE "text/maps/seafoam_islands_b3f.asm" INCLUDE "text/maps/seafoam_islands_b4f.asm" _AIBattleWithdrawText:: @@ -2113,7 +2106,6 @@ INCLUDE "text/maps/viridian_forest_entrance.asm" INCLUDE "text/maps/mt_moon_pokecenter.asm" INCLUDE "text/maps/saffron_gates.asm" INCLUDE "text/maps/daycare.asm" -INCLUDE "text/maps/underground_path_route_5_entrance.asm" INCLUDE "text/maps/underground_path_route_6_entrance.asm" INCLUDE "text/maps/underground_path_route_7_entrance.asm" INCLUDE "text/maps/underground_path_route_7_entrance_unused.asm" diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index 95b455c8..45a4692d 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -42,4 +42,3 @@ _AgathaDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done - diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 723021a1..1717c552 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -11,7 +11,7 @@ _BikeShopText_1d815:: line "Do you want it?" done -_BikeShopText_1d81a:: +_BikeShopCantAffordText:: text "Sorry! You can't" line "afford it!" prompt @@ -29,7 +29,7 @@ _BikeShopText_1d824:: line "the BIKE VOUCHER" cont "for a BICYCLE.@@" -_BikeShopText_1d82a:: +_BikeShopComeAgainText:: text "Come back again" line "sometime!" done @@ -68,4 +68,3 @@ _BikeShopText_1d861:: text "Wow. Your BIKE is" line "really cool!" done - diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm index 5403ce1a..dd556a7b 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -90,4 +90,3 @@ _BillsHouseText_1e8da:: cont "some of my rare" cont "#MON on my PC!" done - diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm index 9891ce26..c7db0b2c 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/blues_house.asm @@ -39,4 +39,3 @@ _BluesHouseText3:: text "It's a big map!" line "This is useful!" done - diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm index ddcbdb59..39898eb5 100644 --- a/text/maps/bruno.asm +++ b/text/maps/bruno.asm @@ -35,4 +35,3 @@ _BrunoDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done - diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index e126980f..908fcbb4 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -150,4 +150,3 @@ _CeladonCityText10:: line "CELADON DEPT." cont "STORE!" done - diff --git a/text/maps/celadon_dept_store_1f.asm b/text/maps/celadon_dept_store_1f.asm index cf343206..8d805edc 100644 --- a/text/maps/celadon_dept_store_1f.asm +++ b/text/maps/celadon_dept_store_1f.asm @@ -29,4 +29,3 @@ _CeladonMart1Text3:: text "1F: SERVICE" line " COUNTER" done - diff --git a/text/maps/celadon_dept_store_2f.asm b/text/maps/celadon_dept_store_2f.asm index b1345a05..74869902 100644 --- a/text/maps/celadon_dept_store_2f.asm +++ b/text/maps/celadon_dept_store_2f.asm @@ -20,4 +20,3 @@ _CeladonMart2Text5:: para "2F: TRAINER'S" line " MARKET" done - diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index 42c46591..4006a3bb 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -96,4 +96,3 @@ _TM18NoRoomText:: text "Your pack is full" line "of items!" done - diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/celadon_dept_store_4f.asm index 3124e46f..c17483c1 100644 --- a/text/maps/celadon_dept_store_4f.asm +++ b/text/maps/celadon_dept_store_4f.asm @@ -28,4 +28,3 @@ _CeladonMart4Text4:: line "Element STONEs on" cont "sale now!" done - diff --git a/text/maps/celadon_dept_store_5f.asm b/text/maps/celadon_dept_store_5f.asm index a2bb97f6..1871194b 100644 --- a/text/maps/celadon_dept_store_5f.asm +++ b/text/maps/celadon_dept_store_5f.asm @@ -26,4 +26,3 @@ _CeladonMart5Text2:: _CeladonMart5Text5:: text "5F: DRUG STORE" done - diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm index 0c91b773..319ca3f0 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/celadon_dept_store_roof.asm @@ -133,4 +133,3 @@ _VendingMachineText6:: _VendingMachineText7:: text "Not thirsty!" done - diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm index 7f69e67f..fd31eb20 100644 --- a/text/maps/celadon_diner.asm +++ b/text/maps/celadon_diner.asm @@ -57,4 +57,3 @@ _CeladonDinerText_491b7:: line "I was going to" cont "win it back..." done - diff --git a/text/maps/celadon_game_corner_1.asm b/text/maps/celadon_game_corner_1.asm index c5108c2e..ad8a82b2 100644 --- a/text/maps/celadon_game_corner_1.asm +++ b/text/maps/celadon_game_corner_1.asm @@ -179,4 +179,3 @@ _CeladonGameCornerText_48f09:: para "A switch behind" line "the poster!?" cont "Let's push it!@@" - diff --git a/text/maps/celadon_game_corner_2.asm b/text/maps/celadon_game_corner_2.asm index 7ee54725..c288464d 100755 --- a/text/maps/celadon_game_corner_2.asm +++ b/text/maps/celadon_game_corner_2.asm @@ -2,4 +2,3 @@ _CeladonGameCornerText_48f19:: text "Oops! Forgot the" line "COIN CASE!" done - diff --git a/text/maps/celadon_gym.asm b/text/maps/celadon_gym.asm index c076196f..99833ee1 100644 --- a/text/maps/celadon_gym.asm +++ b/text/maps/celadon_gym.asm @@ -216,4 +216,3 @@ _CeladonGymAfterBattleText8:: para "Wait 'til next" line "time!" done - diff --git a/text/maps/celadon_hotel.asm b/text/maps/celadon_hotel.asm index c9e8bd8b..f2eb059e 100644 --- a/text/maps/celadon_hotel.asm +++ b/text/maps/celadon_hotel.asm @@ -19,4 +19,3 @@ _CeladonHotelText3:: text "Why did she bring" line "her brother?" done - diff --git a/text/maps/celadon_house.asm b/text/maps/celadon_house.asm index c0bb9532..19e59bd6 100644 --- a/text/maps/celadon_house.asm +++ b/text/maps/celadon_house.asm @@ -20,4 +20,3 @@ _CeladonHouseText3:: para "There's no secret" line "switch behind it!" done - diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/celadon_mansion_1f.asm index e106eb1c..23123892 100644 --- a/text/maps/celadon_mansion_1f.asm +++ b/text/maps/celadon_mansion_1f.asm @@ -62,4 +62,3 @@ _CeladonMansion1Text12:: para "You're making me" line "jealous!" done - diff --git a/text/maps/celadon_mansion_2f.asm b/text/maps/celadon_mansion_2f.asm index ecb46da6..b2ecb4fa 100644 --- a/text/maps/celadon_mansion_2f.asm +++ b/text/maps/celadon_mansion_2f.asm @@ -2,4 +2,3 @@ _CeladonMansion2Text1:: text "GAME FREAK" line "Meeting Room" done - diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/celadon_mansion_3f.asm index d4cc4caa..baf86186 100644 --- a/text/maps/celadon_mansion_3f.asm +++ b/text/maps/celadon_mansion_3f.asm @@ -115,4 +115,3 @@ _CeladonMansion3Text8:: text "GAME FREAK" line "Development Room" done - diff --git a/text/maps/celadon_mansion_4f_inside.asm b/text/maps/celadon_mansion_4f_inside.asm index 9749774f..dab81a8d 100644 --- a/text/maps/celadon_mansion_4f_inside.asm +++ b/text/maps/celadon_mansion_4f_inside.asm @@ -8,4 +8,3 @@ _CeladonMansion5Text1:: line "your friends and" cont "trade #MON!" done - diff --git a/text/maps/celadon_mansion_4f_outside.asm b/text/maps/celadon_mansion_4f_outside.asm index 7053d74a..c8fd7ec8 100644 --- a/text/maps/celadon_mansion_4f_outside.asm +++ b/text/maps/celadon_mansion_4f_outside.asm @@ -1,4 +1,3 @@ _CeladonMansion4Text1:: text "I KNOW EVERYTHING!" done - diff --git a/text/maps/celadon_pokecenter.asm b/text/maps/celadon_pokecenter.asm index 32fa7a6a..a04f51c9 100644 --- a/text/maps/celadon_pokecenter.asm +++ b/text/maps/celadon_pokecenter.asm @@ -10,4 +10,3 @@ _CeladonPokecenterText3:: line "CYCLING ROAD from" cont "FUCHSIA!" done - diff --git a/text/maps/celadon_prize_room.asm b/text/maps/celadon_prize_room.asm index 3f96fdfb..6b2bb537 100644 --- a/text/maps/celadon_prize_room.asm +++ b/text/maps/celadon_prize_room.asm @@ -10,4 +10,3 @@ _CeladonPrizeRoomText2:: text "I had a major" line "haul today!" done - diff --git a/text/maps/cerulean_badge_house_1.asm b/text/maps/cerulean_badge_house_1.asm index 9b0066a1..4bba10cd 100644 --- a/text/maps/cerulean_badge_house_1.asm +++ b/text/maps/cerulean_badge_house_1.asm @@ -66,4 +66,3 @@ _CeruleanHouse2Text_74ea5:: line "use STRENGTH out-" cont "side of battle." prompt - diff --git a/text/maps/cerulean_badge_house_2.asm b/text/maps/cerulean_badge_house_2.asm index 69ea9ca2..e5da0622 100755 --- a/text/maps/cerulean_badge_house_2.asm +++ b/text/maps/cerulean_badge_house_2.asm @@ -26,4 +26,3 @@ _CeruleanHouse2Text_74eb9:: text "All #MON will" line "obey you!" prompt - diff --git a/text/maps/cerulean_city.asm b/text/maps/cerulean_city.asm index 712b332f..4c51c5e0 100644 --- a/text/maps/cerulean_city.asm +++ b/text/maps/cerulean_city.asm @@ -230,4 +230,3 @@ _CeruleanCityText17:: para "The Tomboyish" line "Mermaid!" done - diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm index b77831b4..70cbdf0d 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/cerulean_gym.asm @@ -132,4 +132,3 @@ _CeruleanGymText_5c82f:: line "we make a pretty" cont "darn good team!" done - diff --git a/text/maps/cerulean_mart.asm b/text/maps/cerulean_mart.asm index 8ebe0c32..86a74588 100644 --- a/text/maps/cerulean_mart.asm +++ b/text/maps/cerulean_mart.asm @@ -17,4 +17,3 @@ _CeruleanMartText3:: line "make #MON go" cont "up one level!" done - diff --git a/text/maps/cerulean_pokecenter.asm b/text/maps/cerulean_pokecenter.asm index e7933988..497fbce3 100644 --- a/text/maps/cerulean_pokecenter.asm +++ b/text/maps/cerulean_pokecenter.asm @@ -1,4 +1,4 @@ -_CeruleanPokecenterText1:: +_CeruleanPokecenterText2:: text "That BILL!" para "I heard that" @@ -22,4 +22,3 @@ _CeruleanPokecenterText3:: line "to boast about" cont "their #MON?" done - diff --git a/text/maps/cerulean_trashed_house.asm b/text/maps/cerulean_trashed_house.asm index b23f4507..f79540ae 100644 --- a/text/maps/cerulean_trashed_house.asm +++ b/text/maps/cerulean_trashed_house.asm @@ -34,4 +34,3 @@ _CeruleanHouseTrashedText3:: text "TEAM ROCKET left" line "a way out!" done - diff --git a/text/maps/champion.asm b/text/maps/champion.asm index eb0287af..079c2ed4 100644 --- a/text/maps/champion.asm +++ b/text/maps/champion.asm @@ -1,4 +1,4 @@ -_GaryText_760f4:: +_GaryChampionIntroText:: text $53, ": Hey!" para "I was looking" @@ -144,4 +144,3 @@ _GaryText_7612a:: para $52, "!" line "Come with me!" done - diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm index e795aca4..58873c2a 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/cinnabar_gym.asm @@ -250,4 +250,3 @@ _CinnabarGymText_7:: text "Come on, answer" line "the question!" done - diff --git a/text/maps/cinnabar_island.asm b/text/maps/cinnabar_island.asm index bd11ff49..54552a46 100644 --- a/text/maps/cinnabar_island.asm +++ b/text/maps/cinnabar_island.asm @@ -35,4 +35,3 @@ _CinnabarIslandText7:: para "The Hot-Headed" line "Quiz Master!" done - diff --git a/text/maps/cinnabar_lab.asm b/text/maps/cinnabar_lab.asm index 74161166..a93a484d 100644 --- a/text/maps/cinnabar_lab.asm +++ b/text/maps/cinnabar_lab.asm @@ -27,4 +27,3 @@ _Lab1Text5:: text "#MON LAB" line "Testing Room" done - diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/cinnabar_lab_fossil_room.asm index 38deb1ee..565104b3 100644 --- a/text/maps/cinnabar_lab_fossil_room.asm +++ b/text/maps/cinnabar_lab_fossil_room.asm @@ -76,4 +76,3 @@ _Lab4Text_610bd:: text "Aiyah! You come" line "again!" done - diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/cinnabar_lab_metronome_room.asm index b8034889..e2fbb558 100644 --- a/text/maps/cinnabar_lab_metronome_room.asm +++ b/text/maps/cinnabar_lab_metronome_room.asm @@ -61,4 +61,3 @@ _Lab3Text3:: _Lab3Text5:: text "An amber pipe!" done - diff --git a/text/maps/cinnabar_lab_trade_room.asm b/text/maps/cinnabar_lab_trade_room.asm index 3c0a4bfe..196124e7 100644 --- a/text/maps/cinnabar_lab_trade_room.asm +++ b/text/maps/cinnabar_lab_trade_room.asm @@ -7,4 +7,3 @@ _Lab2Text1:: line "rare, prehistoric" cont "#MON!" done - diff --git a/text/maps/cinnabar_mart.asm b/text/maps/cinnabar_mart.asm index 44292ca8..42a41d06 100644 --- a/text/maps/cinnabar_mart.asm +++ b/text/maps/cinnabar_mart.asm @@ -8,4 +8,3 @@ _CinnabarMartText3:: text "It never hurts to" line "have extra items!" done - diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/cinnabar_pokecenter.asm index e3e6cca9..301c9740 100644 --- a/text/maps/cinnabar_pokecenter.asm +++ b/text/maps/cinnabar_pokecenter.asm @@ -20,4 +20,3 @@ _CinnabarPokecenterText3:: para "I think it's" line "worth a try!" done - diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm index 8f59f22f..90833127 100644 --- a/text/maps/copycats_house_2f.asm +++ b/text/maps/copycats_house_2f.asm @@ -94,4 +94,3 @@ _CopycatsHouse2FText_5cd17:: _CopycatsHouse2FText_5cd1c:: text "Huh? Can't see!" done - diff --git a/text/maps/digletts_cave_route_11_entrance.asm b/text/maps/digletts_cave_route_11_entrance.asm index 16cdb562..ecd3225e 100644 --- a/text/maps/digletts_cave_route_11_entrance.asm +++ b/text/maps/digletts_cave_route_11_entrance.asm @@ -6,4 +6,3 @@ _DiglettsCaveEntRoute11Text1:: para "It goes right to" line "VIRIDIAN CITY!" done - diff --git a/text/maps/digletts_cave_route_2_entrance.asm b/text/maps/digletts_cave_route_2_entrance.asm index f6d5589c..a04bbef7 100644 --- a/text/maps/digletts_cave_route_2_entrance.asm +++ b/text/maps/digletts_cave_route_2_entrance.asm @@ -7,4 +7,3 @@ _DiglettsCaveRoute2Text1:: line "FLASH could light" cont "it up..." done - diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index 33d3ca53..5fcd469d 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -176,4 +176,3 @@ _FanClubText6:: line "very vocal about" cont "#MON." done - diff --git a/text/maps/fighting_dojo.asm b/text/maps/fighting_dojo.asm index f5cd5101..a6ccc8c3 100644 --- a/text/maps/fighting_dojo.asm +++ b/text/maps/fighting_dojo.asm @@ -128,4 +128,3 @@ _OtherHitmonText:: text "Better not get" line "greedy..." done - diff --git a/text/maps/fuchsia_city.asm b/text/maps/fuchsia_city.asm index a3cec8c4..0392a1ed 100644 --- a/text/maps/fuchsia_city.asm +++ b/text/maps/fuchsia_city.asm @@ -117,4 +117,3 @@ _FuchsiaCityKabutoText:: _FuchsiaCityText_19b2a:: text "..." done - diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm index 4f0c98b5..195dc8ef 100644 --- a/text/maps/fuchsia_fishing_house.asm +++ b/text/maps/fuchsia_fishing_house.asm @@ -41,4 +41,3 @@ _FuchsiaHouse3Text_5621c:: para "You have no room" line "for my gift!" done - diff --git a/text/maps/fuchsia_house.asm b/text/maps/fuchsia_house.asm index a4b14eb6..7b6556b1 100644 --- a/text/maps/fuchsia_house.asm +++ b/text/maps/fuchsia_house.asm @@ -25,4 +25,3 @@ _FuchsiaHouse1Text3:: para "Did he show you?" done - diff --git a/text/maps/fuchsia_mart.asm b/text/maps/fuchsia_mart.asm index 6764e3a8..574898ce 100644 --- a/text/maps/fuchsia_mart.asm +++ b/text/maps/fuchsia_mart.asm @@ -12,4 +12,3 @@ _FuchsiaMartText3:: cont "up a #MON in" cont "battle!" done - diff --git a/text/maps/fuchsia_meeting_room.asm b/text/maps/fuchsia_meeting_room.asm index 1fa81344..10675ead 100644 --- a/text/maps/fuchsia_meeting_room.asm +++ b/text/maps/fuchsia_meeting_room.asm @@ -24,4 +24,3 @@ _FuchsiaMeetingRoomText3:: para "I think he's got" line "a speech problem!" done - diff --git a/text/maps/fuchsia_pokecenter.asm b/text/maps/fuchsia_pokecenter.asm index 617c3b84..a0def7eb 100644 --- a/text/maps/fuchsia_pokecenter.asm +++ b/text/maps/fuchsia_pokecenter.asm @@ -18,4 +18,3 @@ _FuchsiaPokecenterText3:: cont "The HQ governs" cont "all trainers." done - diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm index e75d46ea..7c61d1ed 100644 --- a/text/maps/fujis_house.asm +++ b/text/maps/fujis_house.asm @@ -83,4 +83,3 @@ _LavenderHouse1Text6:: para "Gone! It's been" line "clipped out!" done - diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index cbb0e52b..8faefd3f 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -26,4 +26,3 @@ _HallofFameRoomText1:: cont "your #MON are" cont "HALL OF FAMERs!" done - diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/indigo_plateau_lobby.asm index bfac25c3..86cfb562 100644 --- a/text/maps/indigo_plateau_lobby.asm +++ b/text/maps/indigo_plateau_lobby.asm @@ -23,4 +23,3 @@ _IndigoPlateauLobbyText3:: cont "next trainer!" cont "Good luck!" done - diff --git a/text/maps/lance.asm b/text/maps/lance.asm index beedd955..9c7bd677 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -61,4 +61,3 @@ _LanceAfterBattleText:: para "He is the real" line "#MON LEAGUE" cont "champion!@@" - diff --git a/text/maps/lavender_house.asm b/text/maps/lavender_house.asm index d92f0c68..66cc85a5 100644 --- a/text/maps/lavender_house.asm +++ b/text/maps/lavender_house.asm @@ -22,4 +22,3 @@ _LavenderHouse2Text_1d9e1:: line "soothed its" cont "restless soul!" done - diff --git a/text/maps/lavender_mart.asm b/text/maps/lavender_mart.asm index 69b8096f..54519890 100644 --- a/text/maps/lavender_mart.asm +++ b/text/maps/lavender_mart.asm @@ -28,4 +28,3 @@ _LavenderMart_5c958:: line "useless, but it" cont "sold for ¥5000!" done - diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/lavender_pokecenter.asm index d982fa75..5ee5b2f5 100644 --- a/text/maps/lavender_pokecenter.asm +++ b/text/maps/lavender_pokecenter.asm @@ -12,4 +12,3 @@ _LavenderPokecenterText3:: cont "to escape from" cont "TEAM ROCKET!" done - diff --git a/text/maps/lavender_town.asm b/text/maps/lavender_town.asm index d3b41ffa..19b6c8c8 100644 --- a/text/maps/lavender_town.asm +++ b/text/maps/lavender_town.asm @@ -62,4 +62,3 @@ _LavenderTownText9:: line "#MON Rest Easy" cont "#MON TOWER" done - diff --git a/text/maps/mansion_1f.asm b/text/maps/mansion_1f.asm index 3ddd5660..a3c517fb 100644 --- a/text/maps/mansion_1f.asm +++ b/text/maps/mansion_1f.asm @@ -27,4 +27,3 @@ _MansionSwitchPressedText:: _MansionSwitchNotPressedText:: text "Not quite yet!" done - diff --git a/text/maps/mansion_2f.asm b/text/maps/mansion_2f.asm index c7e12408..378efb30 100644 --- a/text/maps/mansion_2f.asm +++ b/text/maps/mansion_2f.asm @@ -45,4 +45,3 @@ _Mansion2Text_520c7:: _Mansion2Text_520cc:: text "Not quite yet!" done - diff --git a/text/maps/mansion_3f.asm b/text/maps/mansion_3f.asm index 7e48a844..70331fdf 100644 --- a/text/maps/mansion_3f.asm +++ b/text/maps/mansion_3f.asm @@ -35,4 +35,3 @@ _Mansion3Text5:: para "We named the" line "newborn MEWTWO." done - diff --git a/text/maps/mansion_b1f.asm b/text/maps/mansion_b1f.asm index 78de2abb..1bc1ef89 100644 --- a/text/maps/mansion_b1f.asm +++ b/text/maps/mansion_b1f.asm @@ -37,4 +37,3 @@ _Mansion4Text7:: line "curb its vicious" cont "tendencies..." done - diff --git a/text/maps/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm index 78257980..8c37383d 100644 --- a/text/maps/mr_psychics_house.asm +++ b/text/maps/mr_psychics_house.asm @@ -23,4 +23,3 @@ _TM29NoRoomText:: text "Where do you plan" line "to put this?" done - diff --git a/text/maps/mt_moon_b1f.asm b/text/maps/mt_moon_b1f.asm index 85cdee66..cd995ed5 100644 --- a/text/maps/mt_moon_b1f.asm +++ b/text/maps/mt_moon_b1f.asm @@ -1,4 +1,3 @@ _MtMoonText1:: db $0 done - diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/mt_moon_pokecenter.asm index 610ff254..f45c5598 100644 --- a/text/maps/mt_moon_pokecenter.asm +++ b/text/maps/mt_moon_pokecenter.asm @@ -46,4 +46,3 @@ _MtMoonPokecenterText_4936b:: text "MAN: Well, I don't" line "give refunds!" done - diff --git a/text/maps/museum_1f.asm b/text/maps/museum_1f.asm index 71aeee3c..ecb511aa 100644 --- a/text/maps/museum_1f.asm +++ b/text/maps/museum_1f.asm @@ -105,4 +105,3 @@ _Museum1FText_5c2bc:: text "The AMBER is" line "clear and gold!" done - diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm index 09878dca..7194a927 100644 --- a/text/maps/name_rater.asm +++ b/text/maps/name_rater.asm @@ -58,4 +58,3 @@ _NameRaterText_1dad1:: TX_RAM wcd6d text "!" done - diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm index 6eb603a3..741ad529 100644 --- a/text/maps/pallet_town.asm +++ b/text/maps/pallet_town.asm @@ -65,4 +65,3 @@ _PalletTownText6:: _PalletTownText7:: text $53,"'s house " done - diff --git a/text/maps/pewter_city.asm b/text/maps/pewter_city.asm index 0d7c7de7..03dfcc91 100644 --- a/text/maps/pewter_city.asm +++ b/text/maps/pewter_city.asm @@ -115,4 +115,3 @@ _PewterCityText12:: line "A Stone Gray" cont "City" done - diff --git a/text/maps/pewter_house_1.asm b/text/maps/pewter_house_1.asm index 0fe3e165..450e8372 100644 --- a/text/maps/pewter_house_1.asm +++ b/text/maps/pewter_house_1.asm @@ -22,4 +22,3 @@ _PewterHouse1Text3:: para "If only we had" line "some BADGEs..." done - diff --git a/text/maps/pewter_house_2.asm b/text/maps/pewter_house_2.asm index 34ebc90d..615536f7 100644 --- a/text/maps/pewter_house_2.asm +++ b/text/maps/pewter_house_2.asm @@ -17,4 +17,3 @@ _PewterHouse2Text2:: para "But, it's not a" line "sure thing!" done - diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm index 6eda0d88..29a1f597 100644 --- a/text/maps/pewter_mart.asm +++ b/text/maps/pewter_mart.asm @@ -15,4 +15,3 @@ _PewterMartText_74cd5:: cont "diligently, even" cont "the weak ones!" done - diff --git a/text/maps/pokemon_league_gate.asm b/text/maps/pokemon_league_gate.asm index b817ef81..ac92f4b0 100644 --- a/text/maps/pokemon_league_gate.asm +++ b/text/maps/pokemon_league_gate.asm @@ -17,4 +17,3 @@ _Route22GateText_1e71a:: text "Oh! That is the" line "BOULDERBADGE!" cont "Go right ahead!@@" - diff --git a/text/maps/pokemon_tower_1f.asm b/text/maps/pokemon_tower_1f.asm index b9570d18..50a2cd29 100644 --- a/text/maps/pokemon_tower_1f.asm +++ b/text/maps/pokemon_tower_1f.asm @@ -29,4 +29,3 @@ _PokemonTower1Text5:: line "There are spirits" cont "up to mischief!" done - diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/pokemon_tower_2f.asm index e41112a4..ec2281fd 100644 --- a/text/maps/pokemon_tower_2f.asm +++ b/text/maps/pokemon_tower_2f.asm @@ -55,4 +55,3 @@ _PokemonTower2Text2:: line "might be able to" cont "unmask them." done - diff --git a/text/maps/pokemon_tower_3f.asm b/text/maps/pokemon_tower_3f.asm index 443aecd5..67098e6b 100644 --- a/text/maps/pokemon_tower_3f.asm +++ b/text/maps/pokemon_tower_3f.asm @@ -43,4 +43,3 @@ _PokemonTower3AfterBattleText3:: text "My friends were" line "possessed too!" done - diff --git a/text/maps/pokemon_tower_4f.asm b/text/maps/pokemon_tower_4f.asm index e8fa75b6..771325a0 100644 --- a/text/maps/pokemon_tower_4f.asm +++ b/text/maps/pokemon_tower_4f.asm @@ -43,4 +43,3 @@ _PokemonTower4AfterBattleText3:: line "souls of #MON" cont "rest in peace..." done - diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/pokemon_tower_5f.asm index bbdc3d84..f2cadfcb 100644 --- a/text/maps/pokemon_tower_5f.asm +++ b/text/maps/pokemon_tower_5f.asm @@ -69,4 +69,3 @@ _PokemonTower5Text7:: para $52, "'s #MON" line "are fully healed!" done - diff --git a/text/maps/pokemon_tower_6f.asm b/text/maps/pokemon_tower_6f.asm index ff8bc73c..7532d56d 100644 --- a/text/maps/pokemon_tower_6f.asm +++ b/text/maps/pokemon_tower_6f.asm @@ -59,4 +59,3 @@ _PokemonTower6Text6:: text "Be gone..." line "Intruders..." done - diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm index 31ec248b..652cf37a 100644 --- a/text/maps/pokemon_tower_7f.asm +++ b/text/maps/pokemon_tower_7f.asm @@ -47,4 +47,3 @@ _TowerRescueFujiText:: cont "HOUSE at the foot" cont "of this tower." done - diff --git a/text/maps/power_plant.asm b/text/maps/power_plant.asm index 2ea387d7..e5df6674 100644 --- a/text/maps/power_plant.asm +++ b/text/maps/power_plant.asm @@ -4,4 +4,3 @@ _VoltorbBattleText:: _ZapdosBattleText:: text "Gyaoo!@@" - diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index 9d03f166..e93450da 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -40,4 +40,3 @@ _StandByMeText:: _TVWrongSideText:: text "Oops, wrong side." done - diff --git a/text/maps/rock_tunnel_b1f.asm b/text/maps/rock_tunnel_b1f.asm index 88659e8e..472c52f8 100644 --- a/text/maps/rock_tunnel_b1f.asm +++ b/text/maps/rock_tunnel_b1f.asm @@ -113,4 +113,3 @@ _RockTunnel1Text8:: line "CERULEAN CITY -" cont "LAVENDER TOWN" done - diff --git a/text/maps/rock_tunnel_b2f.asm b/text/maps/rock_tunnel_b2f.asm index 82151475..d0437de7 100644 --- a/text/maps/rock_tunnel_b2f.asm +++ b/text/maps/rock_tunnel_b2f.asm @@ -127,4 +127,3 @@ _RockTunnel2AfterBattleText9:: text "I'm an artist," line "not a fighter." done - diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/rock_tunnel_pokecenter.asm index a5268dd2..ec625e95 100644 --- a/text/maps/rock_tunnel_pokecenter.asm +++ b/text/maps/rock_tunnel_pokecenter.asm @@ -11,4 +11,3 @@ _RockTunnelPokecenterText3:: text "I sold a useless" line "NUGGET for ¥5000!" done - diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/rocket_hideout_b1f.asm index 66ac1fbd..36117804 100644 --- a/text/maps/rocket_hideout_b1f.asm +++ b/text/maps/rocket_hideout_b1f.asm @@ -71,4 +71,3 @@ _RocketHideout1AfterBattleTxt6:: text "Uh-oh, that fight" line "opened the door!" done - diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/rocket_hideout_b2f.asm index 1b0e9439..c13c3593 100644 --- a/text/maps/rocket_hideout_b2f.asm +++ b/text/maps/rocket_hideout_b2f.asm @@ -15,4 +15,3 @@ _RocketHideout2AfterBattleTxt2:: cont "floors. Can you" cont "reach the BOSS?" done - diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/rocket_hideout_b3f.asm index 67bc9c24..a146a383 100644 --- a/text/maps/rocket_hideout_b3f.asm +++ b/text/maps/rocket_hideout_b3f.asm @@ -33,4 +33,3 @@ _RocketHide3AfterBattleText3:: cont "LIFT KEY to run" cont "the elevator!" done - diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm index 6ff48e6e..d9e13457 100644 --- a/text/maps/rocket_hideout_b4f.asm +++ b/text/maps/rocket_hideout_b4f.asm @@ -63,4 +63,3 @@ _RocketHideout4Text_455ec:: text "Oh no! I dropped" line "the LIFT KEY!" done - diff --git a/text/maps/rocket_hideout_elevator.asm b/text/maps/rocket_hideout_elevator.asm index c2ce930b..6f2aa638 100644 --- a/text/maps/rocket_hideout_elevator.asm +++ b/text/maps/rocket_hideout_elevator.asm @@ -1,4 +1,3 @@ _RocketElevatorText_4578b:: text "It appears to" line "need a key.@@" - diff --git a/text/maps/route_1.asm b/text/maps/route_1.asm index e343ea6f..adffd705 100644 --- a/text/maps/route_1.asm +++ b/text/maps/route_1.asm @@ -47,4 +47,3 @@ _Route1Text3:: line "PALLET TOWN -" cont "VIRIDIAN CITY" done - diff --git a/text/maps/route_10.asm b/text/maps/route_10.asm index c78f6068..a56018f0 100644 --- a/text/maps/route_10.asm +++ b/text/maps/route_10.asm @@ -107,4 +107,3 @@ _Route10Text7:: _Route10Text10:: text "POWER PLANT" done - diff --git a/text/maps/route_11.asm b/text/maps/route_11.asm index 1db6066f..451d2bec 100644 --- a/text/maps/route_11.asm +++ b/text/maps/route_11.asm @@ -160,5 +160,3 @@ _Route11AfterBattleText10:: _Route11Text11:: text "DIGLETT's CAVE" done - - diff --git a/text/maps/route_11_gate.asm b/text/maps/route_11_gate.asm index db9ad871..ef371d06 100644 --- a/text/maps/route_11_gate.asm +++ b/text/maps/route_11_gate.asm @@ -12,4 +12,3 @@ _Route11GateText1:: para "He'll help you" line "rename them too!" done - diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/route_11_gate_upstairs.asm index 92eea2fb..10236081 100644 --- a/text/maps/route_11_gate_upstairs.asm +++ b/text/maps/route_11_gate_upstairs.asm @@ -38,4 +38,3 @@ _Route11GateUpstairsText_494d5:: cont "is by way of the" cont "ROCK TUNNEL." done - diff --git a/text/maps/route_12.asm b/text/maps/route_12.asm index cb6479dc..27befda5 100644 --- a/text/maps/route_12.asm +++ b/text/maps/route_12.asm @@ -137,4 +137,3 @@ _Route12Text11:: _Route12Text12:: text "SPORT FISHING AREA" done - diff --git a/text/maps/route_12_gate.asm b/text/maps/route_12_gate.asm index 246c3eac..51d75539 100644 --- a/text/maps/route_12_gate.asm +++ b/text/maps/route_12_gate.asm @@ -2,4 +2,3 @@ _Route12GateText1:: text "There's a lookout" line "spot upstairs." done - diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/route_12_gate_upstairs.asm index 6413bc42..a18e3d57 100644 --- a/text/maps/route_12_gate_upstairs.asm +++ b/text/maps/route_12_gate_upstairs.asm @@ -40,4 +40,3 @@ _Route12GateUpstairsText_495c4:: para "It's #MON TOWER!" done - diff --git a/text/maps/route_12_house.asm b/text/maps/route_12_house.asm index 97046b75..4cb4beee 100644 --- a/text/maps/route_12_house.asm +++ b/text/maps/route_12_house.asm @@ -58,4 +58,3 @@ _Route12HouseText_564d9:: line "you, but you have" cont "no room for it!" done - diff --git a/text/maps/route_13.asm b/text/maps/route_13.asm index c7034eb5..e2718919 100644 --- a/text/maps/route_13.asm +++ b/text/maps/route_13.asm @@ -177,4 +177,3 @@ _Route13Text13:: line "North to SILENCE" cont "BRIDGE" done - diff --git a/text/maps/route_14.asm b/text/maps/route_14.asm index 774f3f99..9a9de78c 100644 --- a/text/maps/route_14.asm +++ b/text/maps/route_14.asm @@ -171,4 +171,3 @@ _Route14Text11:: line "West to FUCHSIA" cont "CITY" done - diff --git a/text/maps/route_15.asm b/text/maps/route_15.asm index 1368b3d5..a23b8500 100644 --- a/text/maps/route_15.asm +++ b/text/maps/route_15.asm @@ -169,4 +169,3 @@ _Route15Text12:: line "West to FUCHSIA" cont "CITY" done - diff --git a/text/maps/route_15_gate.asm b/text/maps/route_15_gate.asm index eb4ca6d3..0a526142 100644 --- a/text/maps/route_15_gate.asm +++ b/text/maps/route_15_gate.asm @@ -5,4 +5,3 @@ _Route15GateText1:: para "PROF.OAK's AIDE" line "came by here." done - diff --git a/text/maps/route_15_gate_upstairs.asm b/text/maps/route_15_gate_upstairs.asm index 310ecdba..ade4a358 100644 --- a/text/maps/route_15_gate_upstairs.asm +++ b/text/maps/route_15_gate_upstairs.asm @@ -22,4 +22,3 @@ _Route15GateUpstairsText_49698:: para "It looks like a" line "small island!" done - diff --git a/text/maps/route_16.asm b/text/maps/route_16.asm index 87c26232..2ef6b02a 100644 --- a/text/maps/route_16.asm +++ b/text/maps/route_16.asm @@ -118,4 +118,3 @@ _Route16Text9:: line "CELADON CITY -" cont "FUCHSIA CITY" done - diff --git a/text/maps/route_16_gate.asm b/text/maps/route_16_gate.asm index f4f03e2f..f548977f 100644 --- a/text/maps/route_16_gate.asm +++ b/text/maps/route_16_gate.asm @@ -20,4 +20,3 @@ _Route16GateText2:: text "How'd you get in?" line "Good effort!" done - diff --git a/text/maps/route_16_gate_upstairs.asm b/text/maps/route_16_gate_upstairs.asm index 55a49274..d76b70ca 100644 --- a/text/maps/route_16_gate_upstairs.asm +++ b/text/maps/route_16_gate_upstairs.asm @@ -24,4 +24,3 @@ _Route16GateUpstairsText_49847:: para "There's a long" line "path over water!" done - diff --git a/text/maps/route_16_house.asm b/text/maps/route_16_house.asm index d84faf38..534cee08 100644 --- a/text/maps/route_16_house.asm +++ b/text/maps/route_16_house.asm @@ -29,4 +29,3 @@ _HM02NoRoomText:: _Route16HouseText_1e652:: text "FEAROW: Kyueen!" done - diff --git a/text/maps/route_17.asm b/text/maps/route_17.asm index da774494..f7f59683 100644 --- a/text/maps/route_17.asm +++ b/text/maps/route_17.asm @@ -193,4 +193,3 @@ _Route17Text16:: text "CYCLING ROAD" line "Slope ends here!" done - diff --git a/text/maps/route_18.asm b/text/maps/route_18.asm index 31e921bd..d09caf82 100644 --- a/text/maps/route_18.asm +++ b/text/maps/route_18.asm @@ -56,4 +56,3 @@ _Route18Text5:: line "No pedestrians" cont "permitted!" done - diff --git a/text/maps/route_18_gate.asm b/text/maps/route_18_gate.asm index 964a32e5..f2f51039 100644 --- a/text/maps/route_18_gate.asm +++ b/text/maps/route_18_gate.asm @@ -12,4 +12,3 @@ _Route18GateText_4992d:: _Route18GateText_49932:: text "Excuse me!" done - diff --git a/text/maps/route_18_gate_upstairs.asm b/text/maps/route_18_gate_upstairs.asm index a1778cb6..0fd2de09 100644 --- a/text/maps/route_18_gate_upstairs.asm +++ b/text/maps/route_18_gate_upstairs.asm @@ -13,5 +13,3 @@ _Route18GateUpstairsText_4999f:: para "There are people" line "swimming!" done - - diff --git a/text/maps/route_19.asm b/text/maps/route_19.asm index ae6e7334..244e31d0 100644 --- a/text/maps/route_19.asm +++ b/text/maps/route_19.asm @@ -155,4 +155,3 @@ _Route19Text11:: line "FUCHSIA CITY -" cont "SEAFOAM ISLANDS" done - diff --git a/text/maps/route_2.asm b/text/maps/route_2.asm index 2419abbe..dd7becc0 100644 --- a/text/maps/route_2.asm +++ b/text/maps/route_2.asm @@ -7,4 +7,3 @@ _Route2Text3:: _Route2Text4:: text "DIGLETT's CAVE" done - diff --git a/text/maps/route_20.asm b/text/maps/route_20.asm index c69dec51..1ccf0b6c 100644 --- a/text/maps/route_20.asm +++ b/text/maps/route_20.asm @@ -154,4 +154,3 @@ _Route20Text12:: _Route20Text11:: text "SEAFOAM ISLANDS" done - diff --git a/text/maps/route_21.asm b/text/maps/route_21.asm index d94bdfac..3451953f 100644 --- a/text/maps/route_21.asm +++ b/text/maps/route_21.asm @@ -135,4 +135,3 @@ _Route21AfterBattleText9:: text "Oh wait! I got a" line "bite! Yeah!" done - diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index f14c8db5..52d1a4c7 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -102,4 +102,3 @@ _Route22FrontGateText:: text "#MON LEAGUE" line "Front Gate" done - diff --git a/text/maps/route_23.asm b/text/maps/route_23.asm index 0807cc91..2ecb020e 100644 --- a/text/maps/route_23.asm +++ b/text/maps/route_23.asm @@ -36,4 +36,3 @@ _Route23Text8:: text "VICTORY ROAD GATE" line "- #MON LEAGUE" done - diff --git a/text/maps/route_25.asm b/text/maps/route_25.asm index f9f0c8ff..4786d830 100644 --- a/text/maps/route_25.asm +++ b/text/maps/route_25.asm @@ -154,4 +154,3 @@ _Route25Text11:: text "SEA COTTAGE" line "BILL lives here!" done - diff --git a/text/maps/route_2_gate.asm b/text/maps/route_2_gate.asm index 6be23d54..566830f8 100644 --- a/text/maps/route_2_gate.asm +++ b/text/maps/route_2_gate.asm @@ -10,4 +10,3 @@ _Route2GateText2:: cont "can get through" cont "ROCK TUNNEL." done - diff --git a/text/maps/route_2_house.asm b/text/maps/route_2_house.asm index 098a8f3e..46fc1062 100644 --- a/text/maps/route_2_house.asm +++ b/text/maps/route_2_house.asm @@ -4,4 +4,3 @@ _Route2HouseText1:: cont "it can still use " cont "moves like CUT!" done - diff --git a/text/maps/route_3.asm b/text/maps/route_3.asm index 049ba9c5..14d44e64 100644 --- a/text/maps/route_3.asm +++ b/text/maps/route_3.asm @@ -143,4 +143,3 @@ _Route3Text10:: text "ROUTE 3" line "MT.MOON AHEAD" done - diff --git a/text/maps/route_4.asm b/text/maps/route_4.asm index e49f1b7a..0a36f4cd 100644 --- a/text/maps/route_4.asm +++ b/text/maps/route_4.asm @@ -33,4 +33,3 @@ _Route4Text6:: line "MT.MOON -" cont "CERULEAN CITY" done - diff --git a/text/maps/route_5.asm b/text/maps/route_5.asm index 4fced687..54ff0f84 100644 --- a/text/maps/route_5.asm +++ b/text/maps/route_5.asm @@ -3,4 +3,3 @@ _Route5Text1:: line "CERULEAN CITY -" cont "VERMILION CITY" done - diff --git a/text/maps/route_6.asm b/text/maps/route_6.asm index 4237fb7d..71760449 100644 --- a/text/maps/route_6.asm +++ b/text/maps/route_6.asm @@ -102,4 +102,3 @@ _Route6Text7:: line "CERULEAN CITY -" cont "VERMILION CITY" done - diff --git a/text/maps/route_7.asm b/text/maps/route_7.asm index 24645b90..6500be96 100644 --- a/text/maps/route_7.asm +++ b/text/maps/route_7.asm @@ -3,4 +3,3 @@ _Route7Text1:: line "CELADON CITY -" cont "LAVENDER TOWN" done - diff --git a/text/maps/route_8.asm b/text/maps/route_8.asm index dc26e193..c0988d70 100644 --- a/text/maps/route_8.asm +++ b/text/maps/route_8.asm @@ -152,4 +152,3 @@ _Route8Text10:: line "CELADON CITY -" cont "LAVENDER TOWN" done - diff --git a/text/maps/safari_zone_center.asm b/text/maps/safari_zone_center.asm index 50ed1e1e..09918f93 100644 --- a/text/maps/safari_zone_center.asm +++ b/text/maps/safari_zone_center.asm @@ -9,4 +9,3 @@ _SafariZoneCenterText3:: line "Button to check" cont "remaining time!" done - diff --git a/text/maps/safari_zone_east.asm b/text/maps/safari_zone_east.asm index 78634e4a..eebe5de7 100644 --- a/text/maps/safari_zone_east.asm +++ b/text/maps/safari_zone_east.asm @@ -14,4 +14,3 @@ _SafariZoneEastText7:: text "CENTER AREA" line "NORTH: AREA 2" done - diff --git a/text/maps/safari_zone_north.asm b/text/maps/safari_zone_north.asm index fdf8b5e8..1e148f0b 100644 --- a/text/maps/safari_zone_north.asm +++ b/text/maps/safari_zone_north.asm @@ -31,4 +31,3 @@ _SafariZoneNorthText7:: line "finding the" cont "SECRET HOUSE!" done - diff --git a/text/maps/safari_zone_rest_house_1.asm b/text/maps/safari_zone_rest_house_1.asm index 2731bdb4..b6c87818 100644 --- a/text/maps/safari_zone_rest_house_1.asm +++ b/text/maps/safari_zone_rest_house_1.asm @@ -9,4 +9,3 @@ _SafariZoneRestHouse1Text2:: line "#MON to take" cont "home as gifts!" done - diff --git a/text/maps/safari_zone_rest_house_2.asm b/text/maps/safari_zone_rest_house_2.asm index 6cdca9c0..94802b13 100644 --- a/text/maps/safari_zone_rest_house_2.asm +++ b/text/maps/safari_zone_rest_house_2.asm @@ -17,4 +17,3 @@ _SafariZoneRestHouse2Text3:: line "I didn't see any" cont "#MON I wanted." done - diff --git a/text/maps/safari_zone_rest_house_3.asm b/text/maps/safari_zone_rest_house_3.asm index f40c3009..d5f7abc8 100644 --- a/text/maps/safari_zone_rest_house_3.asm +++ b/text/maps/safari_zone_rest_house_3.asm @@ -16,4 +16,3 @@ _SafariZoneRestHouse3Text3:: text "Whew! I'm tired" line "from all the fun!" done - diff --git a/text/maps/safari_zone_rest_house_4.asm b/text/maps/safari_zone_rest_house_4.asm index e50c4522..93f02c8f 100644 --- a/text/maps/safari_zone_rest_house_4.asm +++ b/text/maps/safari_zone_rest_house_4.asm @@ -25,4 +25,3 @@ _SafariZoneRestHouse4Text3:: cont "a VAPOREON!" cont "I wonder why?" done - diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm index f285a697..1bbe89fd 100644 --- a/text/maps/safari_zone_secret_house.asm +++ b/text/maps/safari_zone_secret_house.asm @@ -42,4 +42,3 @@ _HM03NoRoomText:: line "room for this" cont "fabulous prize!" done - diff --git a/text/maps/safari_zone_west.asm b/text/maps/safari_zone_west.asm index e10df2a3..dcb2fe6c 100644 --- a/text/maps/safari_zone_west.asm +++ b/text/maps/safari_zone_west.asm @@ -29,4 +29,3 @@ _SafariZoneWestText8:: text "AREA 3" line "EAST: CENTER AREA" done - diff --git a/text/maps/saffron_city.asm b/text/maps/saffron_city.asm index 82687181..a0422c8c 100644 --- a/text/maps/saffron_city.asm +++ b/text/maps/saffron_city.asm @@ -149,4 +149,3 @@ _SaffronCityText25:: para "Release to be" line "determined..." done - diff --git a/text/maps/saffron_gates.asm b/text/maps/saffron_gates.asm index 629ec433..0fd11d88 100644 --- a/text/maps/saffron_gates.asm +++ b/text/maps/saffron_gates.asm @@ -34,4 +34,3 @@ _SaffronGateText_1dff6:: text "Hi, thanks for" line "the cool drinks!" done - diff --git a/text/maps/saffron_gym.asm b/text/maps/saffron_gym.asm index ab1497bf..23cc211b 100644 --- a/text/maps/saffron_gym.asm +++ b/text/maps/saffron_gym.asm @@ -233,4 +233,3 @@ _SaffronGymAfterBattleText7:: line "used telepathy to" cont "read your mind!" done - diff --git a/text/maps/saffron_house.asm b/text/maps/saffron_house.asm index 21ed3b89..214bf089 100644 --- a/text/maps/saffron_house.asm +++ b/text/maps/saffron_house.asm @@ -24,4 +24,3 @@ _SaffronHouse1Text4:: line "increasing the PP" cont "of techniques!" done - diff --git a/text/maps/saffron_mart.asm b/text/maps/saffron_mart.asm index 29c34a1c..a43b0d94 100644 --- a/text/maps/saffron_mart.asm +++ b/text/maps/saffron_mart.asm @@ -11,4 +11,3 @@ _SaffronMartText3:: line "but it revives" cont "fainted #MON!" done - diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/saffron_pokecenter.asm index 9202af9b..8fd47e4f 100644 --- a/text/maps/saffron_pokecenter.asm +++ b/text/maps/saffron_pokecenter.asm @@ -10,4 +10,3 @@ _SaffronPokecenterText3:: cont "why it attracted" cont "TEAM ROCKET!" done - diff --git a/text/maps/seafoam_islands_1f.asm b/text/maps/seafoam_islands_1f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_1f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b1f.asm b/text/maps/seafoam_islands_b1f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_b1f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b2f.asm b/text/maps/seafoam_islands_b2f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_b2f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b3f.asm b/text/maps/seafoam_islands_b3f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/seafoam_islands_b3f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/seafoam_islands_b4f.asm index c4649f4f..04ff0d9b 100644 --- a/text/maps/seafoam_islands_b4f.asm +++ b/text/maps/seafoam_islands_b4f.asm @@ -11,4 +11,3 @@ _SeafoamIslands5Text5:: text "DANGER" line "Fast current!" done - diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 3051fc76..6be83c5d 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -112,4 +112,3 @@ _SilphCo11AfterBattleText2:: line "my BOSS likes his" cont "#MON tough!" done - diff --git a/text/maps/silph_co_1f.asm b/text/maps/silph_co_1f.asm index ca166d31..1ef80189 100644 --- a/text/maps/silph_co_1f.asm +++ b/text/maps/silph_co_1f.asm @@ -5,4 +5,3 @@ _SilphCo1Text1:: line "in the boardroom" cont "on 11F!" done - diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm index 5993bafe..5ef349d5 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -94,4 +94,3 @@ _SilphCo2AfterBattleText4:: line "be merged with" cont "TEAM ROCKET!" done - diff --git a/text/maps/silph_co_3f.asm b/text/maps/silph_co_3f.asm index 0374482d..a514d3ef 100644 --- a/text/maps/silph_co_3f.asm +++ b/text/maps/silph_co_3f.asm @@ -44,4 +44,3 @@ _SilphCo3AfterBattleText2:: cont "them, they'd let" cont "me study #MON!" done - diff --git a/text/maps/silph_co_4f.asm b/text/maps/silph_co_4f.asm index 19494482..5b484ec7 100644 --- a/text/maps/silph_co_4f.asm +++ b/text/maps/silph_co_4f.asm @@ -54,4 +54,3 @@ _SilphCo4AfterBattleText4:: text "I better tell the" line "BOSS on 11F!" done - diff --git a/text/maps/silph_co_5f.asm b/text/maps/silph_co_5f.asm index 78bb8f9e..9c8bfd41 100644 --- a/text/maps/silph_co_5f.asm +++ b/text/maps/silph_co_5f.asm @@ -105,4 +105,3 @@ _SilphCo5Text11:: line "only when traded" cont "by link-cable." done - diff --git a/text/maps/silph_co_6f.asm b/text/maps/silph_co_6f.asm index b3a38aa0..90456b5c 100644 --- a/text/maps/silph_co_6f.asm +++ b/text/maps/silph_co_6f.asm @@ -105,4 +105,3 @@ _SilphCo6AfterBattleText4:: line "justice, you" cont "betray evil!" done - diff --git a/text/maps/silph_co_7f.asm b/text/maps/silph_co_7f.asm index 3eba2f1e..0373355a 100644 --- a/text/maps/silph_co_7f.asm +++ b/text/maps/silph_co_7f.asm @@ -207,4 +207,3 @@ _SilphCo7Text_51ed2:: cont "Don't sweat it!" cont "Smell ya!" done - diff --git a/text/maps/silph_co_8f.asm b/text/maps/silph_co_8f.asm index 898c0600..fabae5e6 100644 --- a/text/maps/silph_co_8f.asm +++ b/text/maps/silph_co_8f.asm @@ -54,4 +54,3 @@ _SilphCo8AfterBattleText3:: text "I'll leave you up" line "to my brothers!" done - diff --git a/text/maps/silph_co_9f.asm b/text/maps/silph_co_9f.asm index f01ffb7b..fd1aa91c 100644 --- a/text/maps/silph_co_9f.asm +++ b/text/maps/silph_co_9f.asm @@ -60,4 +60,3 @@ _SilphCo9AfterBattleText3:: text "My brothers will" line "avenge me!" done - diff --git a/text/maps/ss_anne_1.asm b/text/maps/ss_anne_1.asm index 6032b770..2bbdcbac 100644 --- a/text/maps/ss_anne_1.asm +++ b/text/maps/ss_anne_1.asm @@ -19,4 +19,3 @@ _SSAnne1Text2:: line "challenged by the" cont "more bored ones!" done - diff --git a/text/maps/ss_anne_10.asm b/text/maps/ss_anne_10.asm index f1eb8a77..7df629b5 100644 --- a/text/maps/ss_anne_10.asm +++ b/text/maps/ss_anne_10.asm @@ -110,4 +110,3 @@ _SSAnne10Text7:: line "STRENGTH to move" cont "big rocks!" done - diff --git a/text/maps/ss_anne_2.asm b/text/maps/ss_anne_2.asm index bd33b9d3..ba231ac5 100644 --- a/text/maps/ss_anne_2.asm +++ b/text/maps/ss_anne_2.asm @@ -61,4 +61,3 @@ _SSAnneRivalCaptainText:: para "You should go see" line "him! Smell ya!" done - diff --git a/text/maps/ss_anne_3.asm b/text/maps/ss_anne_3.asm index 8ac96d88..76490594 100644 --- a/text/maps/ss_anne_3.asm +++ b/text/maps/ss_anne_3.asm @@ -5,4 +5,3 @@ _SSAnne3Text1:: para "He even teaches" line "CUT to #MON!" done - diff --git a/text/maps/ss_anne_4.asm b/text/maps/ss_anne_4.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/ss_anne_4.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/ss_anne_5.asm b/text/maps/ss_anne_5.asm index b4935f5b..76cd5631 100644 --- a/text/maps/ss_anne_5.asm +++ b/text/maps/ss_anne_5.asm @@ -50,4 +50,3 @@ _SSAnne5AfterBattleText2:: cont "#MON. I think" cont "there are more." done - diff --git a/text/maps/ss_anne_6.asm b/text/maps/ss_anne_6.asm index 4256eb47..b7784019 100644 --- a/text/maps/ss_anne_6.asm +++ b/text/maps/ss_anne_6.asm @@ -67,4 +67,3 @@ _SSAnne6Text_61816:: para "But, have I enough" line "fillets du beef?" done - diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm index cffb4add..a046e600 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/ss_anne_7.asm @@ -60,4 +60,3 @@ _SSAnne7Text3:: cont "The CAPTAIN's" cont "reading this!" done - diff --git a/text/maps/ss_anne_8.asm b/text/maps/ss_anne_8.asm index 393633e3..7a09303e 100644 --- a/text/maps/ss_anne_8.asm +++ b/text/maps/ss_anne_8.asm @@ -102,4 +102,3 @@ _SSAnne8Text11:: para "I'm on the trail" line "of TEAM ROCKET!" done - diff --git a/text/maps/ss_anne_9.asm b/text/maps/ss_anne_9.asm index 68973b09..c9b29119 100644 --- a/text/maps/ss_anne_9.asm +++ b/text/maps/ss_anne_9.asm @@ -111,4 +111,3 @@ _SSAnne9Text_61c4c:: text "I hear many people" line "get seasick!" done - diff --git a/text/maps/underground_path_route_5_entrance.asm b/text/maps/underground_path_route_5_entrance.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/underground_path_route_5_entrance.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/underground_path_route_6_entrance.asm b/text/maps/underground_path_route_6_entrance.asm index c898d199..dacc44f7 100644 --- a/text/maps/underground_path_route_6_entrance.asm +++ b/text/maps/underground_path_route_6_entrance.asm @@ -3,4 +3,3 @@ _UndergrdTunnelEntRoute6Text1:: line "things in that" cont "UNDERGROUND PATH." done - diff --git a/text/maps/underground_path_route_7_entrance.asm b/text/maps/underground_path_route_7_entrance.asm index dee62853..5cde3614 100644 --- a/text/maps/underground_path_route_7_entrance.asm +++ b/text/maps/underground_path_route_7_entrance.asm @@ -3,4 +3,3 @@ _UndergroundPathEntRoute7Text1:: line "#MON appeared" cont "near CELADON CITY." done - diff --git a/text/maps/underground_path_route_8_entrance.asm b/text/maps/underground_path_route_8_entrance.asm index 0df1dec9..da785c8e 100644 --- a/text/maps/underground_path_route_8_entrance.asm +++ b/text/maps/underground_path_route_8_entrance.asm @@ -3,4 +3,3 @@ _UndergroundPathEntRoute8Text1:: line "in CELADON has a" cont "great selection!" done - diff --git a/text/maps/unknown_dungeon_1f.asm b/text/maps/unknown_dungeon_1f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/unknown_dungeon_1f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/unknown_dungeon_2f.asm b/text/maps/unknown_dungeon_2f.asm deleted file mode 100644 index 139597f9..00000000 --- a/text/maps/unknown_dungeon_2f.asm +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/unknown_dungeon_b1f.asm index bea7df28..7fa72a82 100644 --- a/text/maps/unknown_dungeon_b1f.asm +++ b/text/maps/unknown_dungeon_b1f.asm @@ -1,3 +1,2 @@ _UnknownDungeon3MewtwoText:: text "Mew!@@" - diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index f5e0adba..2b2d125f 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -165,4 +165,3 @@ _VermilionCityText13:: _VermilionCityText14:: text "VERMILION HARBOR" done - diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm index 26c556a7..034de399 100644 --- a/text/maps/vermilion_dock.asm +++ b/text/maps/vermilion_dock.asm @@ -1,3 +1,2 @@ _VermilionDockText1:: db $0, $57 - diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm index 59f730db..0fa28cae 100644 --- a/text/maps/vermilion_fishing_house.asm +++ b/text/maps/vermilion_fishing_house.asm @@ -51,4 +51,3 @@ _VermilionHouse2Text_560ca:: para "You have no room" line "for my gift!" done - diff --git a/text/maps/vermilion_gym.asm b/text/maps/vermilion_gym.asm index 47895757..a7cce733 100644 --- a/text/maps/vermilion_gym.asm +++ b/text/maps/vermilion_gym.asm @@ -163,4 +163,3 @@ _VermilionGymText_5cbf9:: text "Whew! That match" line "was electric!" done - diff --git a/text/maps/vermilion_house.asm b/text/maps/vermilion_house.asm index 806a4b8a..91c18708 100644 --- a/text/maps/vermilion_house.asm +++ b/text/maps/vermilion_house.asm @@ -19,4 +19,3 @@ _VermilionHouse1Text3:: para "VERMILION appears" line "to be safe." done - diff --git a/text/maps/vermilion_mart.asm b/text/maps/vermilion_mart.asm index 9acdf905..10743989 100644 --- a/text/maps/vermilion_mart.asm +++ b/text/maps/vermilion_mart.asm @@ -21,4 +21,3 @@ _VermilionMartText3:: cont "evil. It depends" cont "on the trainer." done - diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/vermilion_pokecenter.asm index 8ba563dc..bbd8842f 100644 --- a/text/maps/vermilion_pokecenter.asm +++ b/text/maps/vermilion_pokecenter.asm @@ -18,4 +18,3 @@ _VermilionPokecenterText3:: cont "fainted while we" cont "were walking!" done - diff --git a/text/maps/victory_road_1f.asm b/text/maps/victory_road_1f.asm index ded9afd6..1523db88 100644 --- a/text/maps/victory_road_1f.asm +++ b/text/maps/victory_road_1f.asm @@ -29,4 +29,3 @@ _VictoryRoad1AfterBattleText2:: text "I concede, you're" line "better than me!" done - diff --git a/text/maps/victory_road_2f.asm b/text/maps/victory_road_2f.asm index 390d8d54..9241619e 100644 --- a/text/maps/victory_road_2f.asm +++ b/text/maps/victory_road_2f.asm @@ -83,4 +83,3 @@ _VictoryRoad2AfterBattleText5:: line "up the challenge" cont "here." done - diff --git a/text/maps/victory_road_3f.asm b/text/maps/victory_road_3f.asm index 66364190..07e0be70 100644 --- a/text/maps/victory_road_3f.asm +++ b/text/maps/victory_road_3f.asm @@ -61,4 +61,3 @@ _VictoryRoad3AfterBattleText5:: line "battles, you get" cont "stronger!" done - diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm index a9a2184e..0cfd1fe8 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -192,4 +192,3 @@ _ViridianCityText14:: text "The GYM's doors" line "are locked..." done - diff --git a/text/maps/viridian_forest.asm b/text/maps/viridian_forest.asm index d3a66091..f88a484c 100644 --- a/text/maps/viridian_forest.asm +++ b/text/maps/viridian_forest.asm @@ -155,4 +155,3 @@ _ViridianForestText14:: line "VIRIDIAN FOREST" cont "PEWTER CITY AHEAD" done - diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/viridian_forest_exit.asm index 04dea7e5..ab6a5a1d 100644 --- a/text/maps/viridian_forest_exit.asm +++ b/text/maps/viridian_forest_exit.asm @@ -17,4 +17,3 @@ _ViridianForestExitText2:: line "down by a special" cont "#MON move." done - diff --git a/text/maps/viridian_gym.asm b/text/maps/viridian_gym.asm index 2df76aec..795447a5 100644 --- a/text/maps/viridian_gym.asm +++ b/text/maps/viridian_gym.asm @@ -234,4 +234,3 @@ _ViridianGymText_74bd9:: line "GIOVANNI was the" cont "GYM LEADER here?" done - diff --git a/text/maps/viridian_house.asm b/text/maps/viridian_house.asm index 5adf059b..757f597a 100644 --- a/text/maps/viridian_house.asm +++ b/text/maps/viridian_house.asm @@ -21,4 +21,3 @@ _ViridianHouseText4:: text "SPEAROW" line "Name: SPEARY" done - diff --git a/text/maps/wardens_house.asm b/text/maps/wardens_house.asm index 09ab1443..d4da3781 100644 --- a/text/maps/wardens_house.asm +++ b/text/maps/wardens_house.asm @@ -81,4 +81,3 @@ _FuchsiaHouse2Text_7517b:: text "Old #MON" line "merchandise." done - |