diff options
Diffstat (limited to 'scripts')
105 files changed, 704 insertions, 694 deletions
diff --git a/scripts/agatha.asm b/scripts/agatha.asm index c116e855..6f611071 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -1,33 +1,34 @@ AgathaScript: - call AgathaScript_76443 + call AgathaShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, AgathaTrainerHeaders ld de, AgathaScriptPointers - ld a, [W_AGATHACURSCRIPT] + ld a, [wAgathaCurScript] call ExecuteCurMapScriptInTable - ld [W_AGATHACURSCRIPT], a + ld [wAgathaCurScript], a ret -AgathaScript_76443: - ld hl, wd126 +AgathaShowOrHideExitBlock: +; Blocks or clears the exit to the next room. + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_BEAT_AGATHAS_ROOM_TRAINER_0 - jr z, .asm_76457 + jr z, .blockExitToNextRoom ld a, $e - jp AgathaScript_76459 -.asm_76457 + jp .setExitBlock +.blockExitToNextRoom ld a, $3b -AgathaScript_76459: +.setExitBlock ld [wNewTileBlockID], a lb bc, 0, 2 predef_jump ReplaceTileBlock -AgathaScript_76464: +ResetAgathaScript: xor a - ld [W_AGATHACURSCRIPT], a + ld [wAgathaCurScript], a ret AgathaScriptPointers: @@ -40,7 +41,8 @@ AgathaScriptPointers: AgathaScript4: ret -AgathaScript_76474: +AgathaScriptWalkIntoRoom: +; Walk six steps upward. ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -53,12 +55,12 @@ AgathaScript_76474: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret AgathaScript0: - ld hl, CoordsData_764d1 + ld hl, AgathaEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a @@ -67,25 +69,25 @@ AgathaScript0: ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a ld a, [wCoordIndex] - cp $3 - jr c, .asm_764b4 + cp $3 ; Is player standing one tile above the exit? + jr c, .stopPlayerFromLeaving CheckAndSetEvent EVENT_AUTOWALKED_INTO_AGATHAS_ROOM - jr z, AgathaScript_76474 -.asm_764b4 + jr z, AgathaScriptWalkIntoRoom +.stopPlayerFromLeaving ld a, $2 ld [hSpriteIndexOrTextID], a - call DisplayTextID + call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret -CoordsData_764d1: +AgathaEntranceCoords: db $0A,$04 db $0A,$05 db $0B,$04 @@ -99,20 +101,20 @@ AgathaScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret AgathaScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff - jp z, AgathaScript_76464 + jp z, ResetAgathaScript ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret AgathaTextPointers: diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 3abbeb7a..c7fd74f9 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -1,7 +1,7 @@ BillsHouseScript: call BillsHouseScript_1e09e call EnableAutoTextBoxDrawing - ld a, [W_BILLSHOUSECURSCRIPT] + ld a, [wBillsHouseCurScript] ld hl, BillsHouseScriptPointers call JumpTable ret @@ -34,7 +34,7 @@ BillsHouseScript_1e09e: .asm_1e0b3 ld a, $9 .asm_1e0b5 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript0: @@ -48,7 +48,7 @@ BillsHouseScript0: xor a ld [wJoyIgnore], a ld a, $1 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript1: @@ -71,7 +71,7 @@ BillsHouseScript2: ld [H_SPRITEINDEX], a call MoveSprite ld a, $3 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret MovementData_1e79c: @@ -111,7 +111,7 @@ BillsHouseScript3: ld [wJoyIgnore], a SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR ld a, $4 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret PikachuMovementData_1e14d: @@ -137,7 +137,7 @@ BillsHouseScript4: ld a, $fc ld [wJoyIgnore], a ld a, $5 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript5: @@ -181,7 +181,7 @@ BillsHouseScript5: ld de, MovementData_1e807 call MoveSprite ld a, $6 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret MovementData_1e807: @@ -204,7 +204,7 @@ BillsHouseScript6: SetEvent EVENT_MET_BILL_2 ; this event seems redundant SetEvent EVENT_MET_BILL ld a, $7 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript7: @@ -221,7 +221,7 @@ BillsHouseScript7: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $8 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret RLE_1e219: @@ -247,7 +247,7 @@ BillsHouseScript8: ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $9 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript9: diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm index 8e0c1765..87016aa8 100755 --- a/scripts/billshouse2.asm +++ b/scripts/billshouse2.asm @@ -9,7 +9,7 @@ Func_f2418: ld hl, BillsHouseText_f2440 call PrintText ld a, $2 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret .asm_f2433 @@ -89,7 +89,7 @@ Func_f24ae: jr nz, .asm_f24d2 call CheckPikachuFollowingPlayer jr z, .asm_f24d2 - ld a, [W_BILLSHOUSECURSCRIPT] + ld a, [wBillsHouseCurScript] cp $5 ld e, $1b ret z diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 5d1c0723..161955c1 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -14,7 +14,7 @@ BluesHouseScript0: ; trigger the next script ld a, 1 - ld [W_BLUESHOUSECURSCRIPT], a + ld [wBluesHouseCurScript], a BluesHouseScript1: ret @@ -65,7 +65,8 @@ DaisyOfferMapText: GotMapText: TX_FAR _GotMapText - db $11, "@" + sound0x0A + db "@" DaisyBagFullText: TX_FAR _DaisyBagFullText diff --git a/scripts/bruno.asm b/scripts/bruno.asm index fcf18b8d..a10a1e49 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -1,33 +1,34 @@ BrunoScript: - call BrunoScript_762ec + call BrunoShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, BrunoTrainerHeaders ld de, BrunoScriptPointers - ld a, [W_BRUNOCURSCRIPT] + ld a, [wBrunoCurScript] call ExecuteCurMapScriptInTable - ld [W_BRUNOCURSCRIPT], a + ld [wBrunoCurScript], a ret -BrunoScript_762ec: - ld hl, wd126 +BrunoShowOrHideExitBlock: +; Blocks or clears the exit to the next room. + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_BEAT_BRUNOS_ROOM_TRAINER_0 - jr z, .asm_76300 + jr z, .blockExitToNextRoom ld a, $5 - jp BrunoScript_76302 -.asm_76300 + jp .setExitBlock +.blockExitToNextRoom ld a, $24 -BrunoScript_76302: +.setExitBlock ld [wNewTileBlockID], a lb bc, 0, 2 predef_jump ReplaceTileBlock -BrunoScript_7630d: +ResetBrunoScript: xor a - ld [W_BRUNOCURSCRIPT], a + ld [wBrunoCurScript], a ret BrunoScriptPointers: @@ -40,7 +41,8 @@ BrunoScriptPointers: BrunoScript4: ret -BrunoScript_7631d: +BrunoScriptWalkIntoRoom: +; Walk six steps upward. ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -53,12 +55,12 @@ BrunoScript_7631d: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_BRUNOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wBrunoCurScript], a + ld [wCurMapScript], a ret BrunoScript0: - ld hl, CoordsData_7637a + ld hl, BrunoEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a @@ -67,25 +69,25 @@ BrunoScript0: ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a ld a, [wCoordIndex] - cp $3 - jr c, .asm_7635d + cp $3 ; Is player standing one tile above the exit? + jr c, .stopPlayerFromLeaving CheckAndSetEvent EVENT_AUTOWALKED_INTO_BRUNOS_ROOM - jr z, BrunoScript_7631d -.asm_7635d + jr z, BrunoScriptWalkIntoRoom +.stopPlayerFromLeaving ld a, $2 ld [hSpriteIndexOrTextID], a - call DisplayTextID + call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_BRUNOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wBrunoCurScript], a + ld [wCurMapScript], a ret -CoordsData_7637a: +BrunoEntranceCoords: db $0A,$04 db $0A,$05 db $0B,$04 @@ -99,15 +101,15 @@ BrunoScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [W_BRUNOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wBrunoCurScript], a + ld [wCurMapScript], a ret BrunoScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff - jp z, BrunoScript_7630d + jp z, ResetBrunoScript ld a, $1 ld [hSpriteIndexOrTextID], a jp DisplayTextID diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm index c36c4ad7..04fa0a28 100755 --- a/scripts/celadoncity.asm +++ b/scripts/celadoncity.asm @@ -1,7 +1,7 @@ CeladonCityScript: call EnableAutoTextBoxDrawing ld hl, CeladonCityScriptPointers - ld a, [W_CELADONCITYCURSCRIPT] + ld a, [wCeladonCityCurScript] call JumpTable ret diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index d0433efd..43aae927 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -3,11 +3,11 @@ CeladonGameCornerScript: call CeladonGameCornerScript_48bec call EnableAutoTextBoxDrawing ld hl, CeladonGameCornerScriptPointers - ld a, [W_CELADONGAMECORNERCURSCRIPT] + ld a, [wCeladonGameCornerCurScript] jp JumpTable CeladonGameCornerScript_48bcf: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z @@ -24,7 +24,7 @@ CeladonGameCornerScript_48bcf: ret CeladonGameCornerScript_48bec: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -38,8 +38,8 @@ CeladonGameCornerScript_48bec: CeladonGameCornerScript_48c07: xor a ld [wJoyIgnore], a - ld [W_CELADONGAMECORNERCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGameCornerCurScript], a + ld [wCurMapScript], a ret CeladonGameCornerScriptPointers: @@ -82,7 +82,7 @@ CeladonGameCornerScript1: ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a ret MovementData_48c5a: @@ -113,11 +113,11 @@ CeladonGameCornerScript2: ld a, HS_GAME_CORNER_ROCKET ld [wMissableObjectIndex], a predef HideObject - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] set 6, [hl] ld a, $0 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a ret CeladonGameCornerTextPointers: @@ -429,7 +429,7 @@ CeladonGameCornerText11: ld [hJoyPressed], a ld [hJoyReleased], a ld a, $1 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a jp TextScriptEnd CeladonGameCornerText_48ece: diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 1021aef1..903ef508 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -1,14 +1,14 @@ CeladonGymScript: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeladonGymScript_48927 call EnableAutoTextBoxDrawing ld hl, CeladonGymTrainerHeaders ld de, CeladonGymScriptPointers - ld a, [W_CELADONGYMCURSCRIPT] + ld a, [wCeladonGymCurScript] call ExecuteCurMapScriptInTable - ld [W_CELADONGYMCURSCRIPT], a + ld [wCeladonGymCurScript], a ret CeladonGymScript_48927: @@ -25,8 +25,8 @@ Gym4LeaderName: CeladonGymText_48943: xor a ld [wJoyIgnore], a - ld [W_CELADONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGymCurScript], a + ld [wCurMapScript], a ret CeladonGymScriptPointers: @@ -178,8 +178,8 @@ CeladonGymText1: ld a, $4 ld [wGymLeaderNo], a ld a, $3 - ld [W_CELADONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGymCurScript], a + ld [wCurMapScript], a .asm_48a5b jp TextScriptEnd diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm index 2dbeca04..e78d86fc 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/celadonmartelevator.asm @@ -1,5 +1,5 @@ CeladonMartElevatorScript: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] push hl diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 4eaa66b9..4243d35c 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -1,13 +1,13 @@ CeruleanCityScript: call EnableAutoTextBoxDrawing ld hl, CeruleanCityScriptPointers - ld a, [W_CERULEANCITYCURSCRIPT] + ld a, [wCeruleanCityCurScript] jp JumpTable CeruleanCityScript_1948c: xor a ld [wJoyIgnore], a - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ld a, HS_CERULEAN_RIVAL ld [wMissableObjectIndex], a predef_jump HideObject @@ -31,7 +31,7 @@ CeruleanCityScript4: call DisplayTextID xor a ld [wJoyIgnore], a - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityScript0: @@ -91,7 +91,7 @@ CeruleanCityScript0: ld [H_SPRITEINDEX], a call MoveSprite ld a, $1 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityCoords1: @@ -140,7 +140,7 @@ CeruleanCityScript1: ld [hJoyHeld], a call CeruleanCityScript_1955d ld a, $2 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityScript2: @@ -171,7 +171,7 @@ CeruleanCityScript2: ld [H_SPRITEINDEX], a call MoveSprite ld a, $3 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityMovement3: @@ -205,7 +205,7 @@ CeruleanCityScript3: ld [wJoyIgnore], a call PlayDefaultMusic ld a, $0 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityTextPointers: @@ -275,7 +275,7 @@ CeruleanCityText2: call EngageMapTrainer call InitBattleEnemyParameters ld a, $4 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a jp TextScriptEnd .asm_4ca20 ld hl, CeruleanCityText_196f3 diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index eae1b364..448ce744 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -1,14 +1,14 @@ CeruleanGymScript: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeruleanGymScript_5c6d0 call EnableAutoTextBoxDrawing ld hl, CeruleanGymTrainerHeaders ld de, CeruleanGymScriptPointers - ld a, [W_CERULEANGYMCURSCRIPT] + ld a, [wCeruleanGymCurScript] call ExecuteCurMapScriptInTable - ld [W_CERULEANGYMCURSCRIPT], a + ld [wCeruleanGymCurScript], a ret CeruleanGymScript_5c6d0: @@ -25,8 +25,8 @@ Gym2LeaderName: CeruleanGymScript_5c6ed: xor a ld [wJoyIgnore], a - ld [W_CERULEANGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeruleanGymCurScript], a + ld [wCurMapScript], a ret CeruleanGymScriptPointers: @@ -132,7 +132,7 @@ CeruleanGymText1: xor a ld [hJoyHeld], a ld a, $3 - ld [W_CERULEANGYMCURSCRIPT], a + ld [wCeruleanGymCurScript], a .asm_5c7bb jp TextScriptEnd diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 02122490..1ebf943a 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -2,11 +2,11 @@ CinnabarGymScript: call CinnabarGymScript_75759 call EnableAutoTextBoxDrawing ld hl, CinnabarGymScriptPointers - ld a, [W_CINNABARGYMCURSCRIPT] + ld a, [wCinnabarGymCurScript] jp JumpTable CinnabarGymScript_75759: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] push hl @@ -30,8 +30,8 @@ Gym7LeaderName: CinnabarGymScript_75792: xor a ld [wJoyIgnore], a - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a ld [wOpponentAfterWrongAnswer], a ret @@ -73,8 +73,8 @@ CinnabarGymScript0: .asm_757cb call MoveSprite ld a, $1 - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a ret MovementData_757d7: @@ -160,8 +160,8 @@ CinnabarGymScript2: ld [wJoyIgnore], a ld [wOpponentAfterWrongAnswer], a ld a, $0 - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a ret CinnabarGymScript_75023: @@ -225,7 +225,7 @@ CinnabarGymScript3_75857: ; deactivate gym trainers SetEventRange EVENT_BEAT_CINNABAR_GYM_TRAINER_0, EVENT_BEAT_CINNABAR_GYM_TRAINER_6 - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] jp CinnabarGymScript_75792 @@ -260,8 +260,8 @@ CinnabarGymScript_750c3: .asm_758d4 ld a, $3 .asm_758d6 - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a jp TextScriptEnd CinnabarGymText1: diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index 2c6fda4e..4dbec159 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -1,11 +1,11 @@ CinnabarIslandScript: call EnableAutoTextBoxDrawing - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ResetEvent EVENT_MANSION_SWITCH_ON ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL ld hl, CinnabarIslandScriptPointers - ld a, [W_CINNABARISLANDCURSCRIPT] + ld a, [wCinnabarIslandCurScript] jp JumpTable CinnabarIslandScriptPointers: @@ -38,7 +38,7 @@ CinnabarIslandScript0: ld [wPlayerFacingDirection], a ld [wJoyIgnore], a ld a, $1 - ld [W_CINNABARISLANDCURSCRIPT], a + ld [wCinnabarIslandCurScript], a ret CinnabarIslandScript1: @@ -47,7 +47,7 @@ CinnabarIslandScript1: ret nz call Delay3 ld a, $0 - ld [W_CINNABARISLANDCURSCRIPT], a + ld [wCinnabarIslandCurScript], a ret CinnabarIslandTextPointers: diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index 44c55168..01d6269b 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -1,7 +1,7 @@ FanClubScript: call EnableAutoTextBoxDrawing ld hl, FanClubScriptPointers - ld a, [W_FANCLUBCURSCRIPT] + ld a, [wFanClubCurScript] call JumpTable ret @@ -39,7 +39,7 @@ FanClubScript_59a44: callab CheckPikachuFaintedOrStatused ret c ld a, $1 - ld [W_FANCLUBCURSCRIPT], a + ld [wFanClubCurScript], a xor a ld [wPlayerMovingDirection], a call UpdateSprites diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index 9a79506e..9d28046f 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -2,16 +2,16 @@ FightingDojoScript: call EnableAutoTextBoxDrawing ld hl, FightingDojoTrainerHeaders ld de, FightingDojoScriptPointers - ld a, [W_FIGHTINGDOJOCURSCRIPT] + ld a, [wFightingDojoCurScript] call ExecuteCurMapScriptInTable - ld [W_FIGHTINGDOJOCURSCRIPT], a + ld [wFightingDojoCurScript], a ret FightingDojoScript_5cd70: xor a ld [wJoyIgnore], a - ld [W_FIGHTINGDOJOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a ret FightingDojoScriptPointers: @@ -76,8 +76,8 @@ FightingDojoScript3: call DisplayTextID xor a ld [wJoyIgnore], a - ld [W_FIGHTINGDOJOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a ret FightingDojoTextPointers: @@ -148,8 +148,8 @@ FightingDojoText1: call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [W_FIGHTINGDOJOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a jr .asm_9dba4 .continue1 ld hl, FightingDojoText_5ce9d diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm index a67cc0c8..8268930d 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -3,13 +3,13 @@ FuchsiaGymScript: call EnableAutoTextBoxDrawing ld hl, FuchsiaGymTrainerHeaders ld de, FuchsiaGymScriptPointers - ld a, [W_FUCHSIAGYMCURSCRIPT] + ld a, [wFuchsiaGymCurScript] call ExecuteCurMapScriptInTable - ld [W_FUCHSIAGYMCURSCRIPT], a + ld [wFuchsiaGymCurScript], a ret FuchsiaGymScript_75453: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z @@ -26,8 +26,8 @@ Gym5LeaderName: FuchsiaGymScript_75477: xor a ld [wJoyIgnore], a - ld [W_FUCHSIAGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFuchsiaGymCurScript], a + ld [wCurMapScript], a ret FuchsiaGymScriptPointers: @@ -171,7 +171,7 @@ FuchsiaGymText1: xor a ld [hJoyHeld], a ld a, $3 - ld [W_FUCHSIAGYMCURSCRIPT], a + ld [wFuchsiaGymCurScript], a .asm_e84c6 jp TextScriptEnd diff --git a/scripts/gary.asm b/scripts/gary.asm index a000cc87..ef1a7328 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -1,14 +1,14 @@ GaryScript: call EnableAutoTextBoxDrawing ld hl, GaryScriptPointers - ld a, [W_GARYCURSCRIPT] + ld a, [wGaryCurScript] call JumpTable ret -GaryScript_75f29: +ResetGaryScript: xor a ld [wJoyIgnore], a - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScriptPointers: @@ -31,16 +31,16 @@ GaryScript1: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement75f63 + ld de, GaryEntrance_RLEMovement call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $2 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret -RLEMovement75f63: +GaryEntrance_RLEMovement: db D_UP, 1 db D_RIGHT, 1 db D_UP, 3 @@ -54,7 +54,7 @@ GaryScript2: xor a ld [wJoyIgnore], a ld hl, wOptions - res 7, [hl] + res 7, [hl] ; Turn on battle animations to make the battle feel more epic. ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -62,27 +62,27 @@ GaryScript2: ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, GaryText_760f9 - ld de, GaryText_760fe + ld hl, GaryDefeatedText + ld de, GaryVictoryText call SaveEndBattleTextPointers ld a, OPP_SONY3 ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] add $0 ; Wow GameFreak ld [wTrainerNo], a xor a ld [hJoyHeld], a ld a, $3 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript3: ld a, [wIsInBattle] cp $ff - jp z, GaryScript_75f29 + jp z, ResetGaryScript call UpdateSprites SetEvent EVENT_BEAT_CHAMPION_RIVAL ld a, $f0 @@ -94,7 +94,7 @@ GaryScript3: ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, $4 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript4: @@ -105,7 +105,7 @@ GaryScript4: ld a, $2 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld de, MovementData_76014 + ld de, OakEntranceAfterVictoryMovement ld a, $2 ld [H_SPRITEINDEX], a call MoveSprite @@ -113,10 +113,10 @@ GaryScript4: ld [wMissableObjectIndex], a predef ShowObject ld a, $5 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret -MovementData_76014: +OakEntranceAfterVictoryMovement: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP @@ -144,7 +144,7 @@ GaryScript5: ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript6: @@ -157,7 +157,7 @@ GaryScript6: ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript7: @@ -169,15 +169,15 @@ GaryScript7: ld a, $5 ld [hSpriteIndexOrTextID], a call GaryScript_760c8 - ld de, MovementData_76080 + ld de, OakExitGaryRoomMovement ld a, $2 ld [H_SPRITEINDEX], a call MoveSprite ld a, $8 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret -MovementData_76080: +OakExitGaryRoomMovement: db NPC_MOVEMENT_UP db NPC_MOVEMENT_UP db $FF @@ -190,23 +190,23 @@ GaryScript8: ld [wMissableObjectIndex], a predef HideObject ld a, $9 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript9: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement760b4 + ld de, WalkToHallOfFame_RLEMovment call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $a - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret -RLEMovement760b4: +WalkToHallOfFame_RLEMovment: db D_UP, 4 db D_LEFT, 1 db $ff @@ -218,7 +218,7 @@ GaryScript10: xor a ld [wJoyIgnore], a ld a, $0 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript_760c8: @@ -239,23 +239,23 @@ GaryTextPointers: GaryText1: TX_ASM CheckEvent EVENT_BEAT_CHAMPION_RIVAL - ld hl, GaryText_760f4 - jr z, .asm_17e9f + ld hl, GaryChampionIntroText + jr z, .printText ld hl, GaryText_76103 -.asm_17e9f +.printText call PrintText jp TextScriptEnd -GaryText_760f4: +GaryChampionIntroText: TX_FAR _GaryChampionIntroText db "@" -GaryText_760f9: - TX_FAR _GaryText_760f9 +GaryDefeatedText: + TX_FAR _GaryDefeatedText db "@" -GaryText_760fe: - TX_FAR _GaryText_760fe +GaryVictoryText: + TX_FAR _GaryVictoryText db "@" GaryText_76103: @@ -268,7 +268,7 @@ GaryText2: GaryText3: TX_ASM - ld a, [W_PLAYERSTARTER] + ld a, [wPlayerStarter] ld [wd11e], a call GetMonName ld hl, GaryText_76120 diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index 8e5d1907..1bba347b 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -1,13 +1,13 @@ HallofFameRoomScript: call EnableAutoTextBoxDrawing ld hl, HallofFameRoomScriptPointers - ld a, [W_HALLOFFAMEROOMCURSCRIPT] + ld a, [wHallOfFameRoomCurScript] jp JumpTable HallofFameRoomScript_5a4aa: xor a ld [wJoyIgnore], a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret HallofFameRoomScriptPointers: @@ -33,25 +33,25 @@ HallofFameRoomScript2: inc hl set 0, [hl] xor a - ld hl, W_LORELEICURSCRIPT + ld hl, wLoreleiCurScript ld [hli], a ld [hli], a ld [hl], a - ld [W_LANCECURSCRIPT], a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wLanceCurScript], a + ld [wHallOfFameRoomCurScript], a ; Elite 4 events ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1 xor a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ld a, PALLET_TOWN ld [wLastBlackoutMap], a callba SaveSAVtoSRAM ld b, 5 -.asm_5a4ff +.delayLoop ld c, 600 / 5 call DelayFrames dec b - jr nz, .asm_5a4ff + jr nz, .delayLoop call WaitForTextScrollButtonPress jp Init @@ -65,7 +65,7 @@ HallofFameRoomScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret RLEMovement5a528: @@ -98,7 +98,7 @@ HallofFameRoomScript1: ld [wMissableObjectIndex], a predef HideObject ld a, $2 - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret HallofFameRoomTextPointers: diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm index 93653931..63f228d0 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/indigoplateaulobby.asm @@ -1,7 +1,7 @@ IndigoPlateauLobbyScript: call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z diff --git a/scripts/lab4.asm b/scripts/lab4.asm index 8177a64c..7d0db339 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -74,7 +74,7 @@ Lab4Text1: ld hl, Lab4Text_75dd5 call PrintText SetEvent EVENT_LAB_HANDING_OVER_FOSSIL_MON - ld a, [W_FOSSILMON] + ld a, [wFossilMon] ld b, a ld c, 30 call GivePokemon diff --git a/scripts/lance.asm b/scripts/lance.asm index b2cf9207..7d67f6cd 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -1,42 +1,44 @@ LanceScript: - call LanceScript_5a2c4 + call LanceShowOrHideEntranceBlocks call EnableAutoTextBoxDrawing ld hl, LanceTrainerHeaders ld de, LanceScriptPointers - ld a, [W_LANCECURSCRIPT] + ld a, [wLanceCurScript] call ExecuteCurMapScriptInTable - ld [W_LANCECURSCRIPT], a + ld [wLanceCurScript], a ret -LanceScript_5a2c4: - ld hl, wd126 +LanceShowOrHideEntranceBlocks: + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z CheckEvent EVENT_LANCES_ROOM_LOCK_DOOR - jr nz, .asm_5a2da + jr nz, .closeEntrance + ; open entrance ld a, $31 ld b, $32 - jp .asm_5a2de + jp .LanceSetEntranceBlocks -.asm_5a2da +.closeEntrance ld a, $72 ld b, $73 -.asm_5a2de +.LanceSetEntranceBlocks +; Replaces the tile blocks so the player can't leave. push bc ld [wNewTileBlockID], a lb bc, 6, 2 - call .asm_5a2f0 + call .LanceSetEntranceBlock pop bc ld a, b ld [wNewTileBlockID], a lb bc, 6, 3 -.asm_5a2f0 +.LanceSetEntranceBlock predef_jump ReplaceTileBlock -LanceScript_5a2f5: +ResetLanceScript: xor a - ld [W_LANCECURSCRIPT], a + ld [wLanceCurScript], a ret LanceScriptPointers: @@ -52,29 +54,29 @@ LanceScript4: LanceScript0: CheckEvent EVENT_BEAT_LANCE ret nz - ld hl, CoordsData_5a33e + ld hl, LanceTriggerMovementCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a ld [hJoyHeld], a ld a, [wCoordIndex] - cp $3 - jr nc, .asm_5a325 + cp $3 ; Is player standing next to Lance's sprite? + jr nc, .notStandingNextToLance ld a, $1 ld [hSpriteIndexOrTextID], a jp DisplayTextID -.asm_5a325 - cp $5 - jr z, LanceScript_5a35b +.notStandingNextToLance + cp $5 ; Is player standing on the entrance staircase? + jr z, WalkToLance CheckAndSetEvent EVENT_LANCES_ROOM_LOCK_DOOR ret nz - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld a, SFX_GO_INSIDE call PlaySound - jp LanceScript_5a2c4 + jp LanceShowOrHideEntranceBlocks -CoordsData_5a33e: +LanceTriggerMovementCoords: db $01,$05 db $02,$06 db $0B,$05 @@ -86,26 +88,27 @@ LanceScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff - jp z, LanceScript_5a2f5 + jp z, ResetLanceScript ld a, $1 ld [hSpriteIndexOrTextID], a jp DisplayTextID -LanceScript_5a35b: +WalkToLance: +; Moves the player down the hallway to Lance's room. ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, RLEList_5a379 + ld de, WalkToLance_RLEList call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_LANCECURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLanceCurScript], a + ld [wCurMapScript], a ret -RLEList_5a379: +WalkToLance_RLEList: db D_UP, $0D db D_LEFT, $0C db D_DOWN, $07 @@ -119,8 +122,8 @@ LanceScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [W_LANCECURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLanceCurScript], a + ld [wCurMapScript], a ret LanceTextPointers: diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index d85dc192..60be524d 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -1,34 +1,35 @@ LoreleiScript: - call LoreleiScript_76191 + call LoreleiShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, LoreleiTrainerHeaders ld de, LoreleiScriptPointers - ld a, [W_LORELEICURSCRIPT] + ld a, [wLoreleiCurScript] call ExecuteCurMapScriptInTable - ld [W_LORELEICURSCRIPT], a + ld [wLoreleiCurScript], a ret -LoreleiScript_76191: - ld hl, wd126 +LoreleiShowOrHideExitBlock: +; Blocks or clears the exit to the next room. + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z ld hl, wBeatLorelei set 1, [hl] CheckEvent EVENT_BEAT_LORELEIS_ROOM_TRAINER_0 - jr z, .asm_761a9 + jr z, .blockExitToNextRoom ld a, $5 - jr .asm_761ab -.asm_761a9 + jr .setExitBlock +.blockExitToNextRoom ld a, $24 -.asm_761ab +.setExitBlock ld [wNewTileBlockID], a lb bc, 0, 2 predef_jump ReplaceTileBlock -LoreleiScript_761b6: +ResetLoreleiScript: xor a - ld [W_LORELEICURSCRIPT], a + ld [wLoreleiCurScript], a ret LoreleiScriptPointers: @@ -41,7 +42,8 @@ LoreleiScriptPointers: LoreleiScript4: ret -LoreleiScript_761c6: +LoreleiScriptWalkIntoRoom: +; Walk six steps upward. ld hl, wSimulatedJoypadStatesEnd ld a, D_UP ld [hli], a @@ -54,12 +56,12 @@ LoreleiScript_761c6: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_LORELEICURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLoreleiCurScript], a + ld [wCurMapScript], a ret LoreleiScript0: - ld hl, CoordsData_76223 + ld hl, LoreleiEntranceCoords call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers xor a @@ -68,25 +70,25 @@ LoreleiScript0: ld [wSimulatedJoypadStatesEnd], a ld [wSimulatedJoypadStatesIndex], a ld a, [wCoordIndex] - cp $3 - jr c, .asm_76206 + cp $3 ; Is player standing one tile above the exit? + jr c, .stopPlayerFromLeaving CheckAndSetEvent EVENT_AUTOWALKED_INTO_LORELEIS_ROOM - jr z, LoreleiScript_761c6 -.asm_76206 + jr z, LoreleiScriptWalkIntoRoom +.stopPlayerFromLeaving ld a, $2 ld [hSpriteIndexOrTextID], a - call DisplayTextID + call DisplayTextID ; "Don't run away!" ld a, D_UP ld [wSimulatedJoypadStatesEnd], a ld a, $1 ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_LORELEICURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLoreleiCurScript], a + ld [wCurMapScript], a ret -CoordsData_76223: +LoreleiEntranceCoords: db $0A,$04 db $0A,$05 db $0B,$04 @@ -100,14 +102,15 @@ LoreleiScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [W_LORELEICURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLoreleiCurScript], a + ld [wCurMapScript], a ret + LoreleiScript2: call EndTrainerBattle ld a, [wIsInBattle] cp $ff - jp z, LoreleiScript_761b6 + jp z, ResetLoreleiScript ld a, $1 ld [hSpriteIndexOrTextID], a jp DisplayTextID diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index 6ee7984e..fb0a92bc 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -3,13 +3,13 @@ Mansion1Script: call EnableAutoTextBoxDrawing ld hl, Mansion1TrainerHeaders ld de, Mansion1ScriptPointers - ld a, [W_MANSION1CURSCRIPT] + ld a, [wMansion1CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION1CURSCRIPT], a + ld [wMansion1CurScript], a ret Mansion1Subscript1: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -106,7 +106,7 @@ Mansion1Text4: jr nz, .asm_4438c ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld hl, MansionSwitchPressedText call PrintText diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index df0d0c36..0ba8a245 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -3,13 +3,13 @@ Mansion2Script: call EnableAutoTextBoxDrawing ld hl, Mansion2TrainerHeaders ld de, Mansion2ScriptPointers - ld a, [W_MANSION2CURSCRIPT] + ld a, [wMansion2CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION2CURSCRIPT], a + ld [wMansion2CurScript], a ret Mansion2Script_51fee: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -112,7 +112,7 @@ Mansion2Text5: jr nz, .asm_520b9 ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld hl, Mansion2Text_520c7 call PrintText diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index e0ad97c2..c71979d5 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -3,13 +3,13 @@ Mansion3Script: call EnableAutoTextBoxDrawing ld hl, Mansion3TrainerHeader0 ld de, Mansion3ScriptPointers - ld a, [W_MANSION3CURSCRIPT] + ld a, [wMansion3CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION3CURSCRIPT], a + ld [wMansion3CurScript], a ret Mansion3Script_52204: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index 028ecc32..12420990 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -3,13 +3,13 @@ Mansion4Script: call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeader0 ld de, Mansion4ScriptPointers - ld a, [W_MANSION4CURSCRIPT] + ld a, [wMansion4CurScript] call ExecuteCurMapScriptInTable - ld [W_MANSION4CURSCRIPT], a + ld [wMansion4CurScript], a ret Mansion4Script_523cf: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm index c8a43a66..604e490a 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/mtmoon1.asm @@ -2,9 +2,9 @@ MtMoon1Script: call EnableAutoTextBoxDrawing ld hl, MtMoon1TrainerHeader0 ld de, MtMoon1ScriptPointers - ld a, [W_MTMOON1CURSCRIPT] + ld a, [wMtMoon1CurScript] call ExecuteCurMapScriptInTable - ld [W_MTMOON1CURSCRIPT], a + ld [wMtMoon1CurScript], a ret MtMoon1ScriptPointers: diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index ab6ce1c2..b8d14bd5 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -2,9 +2,9 @@ MtMoon3Script: call EnableAutoTextBoxDrawing ld hl, MtMoon3TrainerHeaders ld de, MtMoon3ScriptPointers - ld a, [W_MTMOON3CURSCRIPT] + ld a, [wMtMoon3CurScript] call ExecuteCurMapScriptInTable - ld [W_MTMOON3CURSCRIPT], a + ld [wMtMoon3CurScript], a CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD ret z ld hl, CoordsData_49d37 @@ -43,8 +43,8 @@ MtMoon3Script_49cd7: xor a ld [wJoyIgnore], a MtMoon3Script_49ce5: - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a ret MtMoon3Script_49cec: diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 47959247..30e6f594 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -4,7 +4,7 @@ Museum1FScript: xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, Museum1FScriptPointers - ld a, [W_MUSEUM1FCURSCRIPT] + ld a, [wMuseum1FCurScript] call JumpTable ret diff --git a/scripts/museum1f2.asm b/scripts/museum1f2.asm index cefc0fce..7e8878a2 100755 --- a/scripts/museum1f2.asm +++ b/scripts/museum1f2.asm @@ -85,7 +85,7 @@ Func_f1c1b: .asm_f1cd7 ld a, $1 - ld [W_MUSEUM1FCURSCRIPT], a + ld [wMuseum1FCurScript], a jr .asm_f1cfc .asm_f1cde diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 63f09015..5a6b9456 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -6,7 +6,7 @@ OaksLabScript: xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, OaksLabScriptPointers - ld a, [W_OAKSLABCURSCRIPT] + ld a, [wOaksLabCurScript] call JumpTable ret @@ -48,7 +48,7 @@ OaksLabScript0: res 4, [hl] ld a, $1 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript1: @@ -58,7 +58,7 @@ OaksLabScript1: call MoveSprite ld a, $2 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OakEntryMovement: @@ -79,7 +79,7 @@ OaksLabScript2: predef ShowObject ld a, $3 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript3: @@ -102,7 +102,7 @@ OaksLabScript3: call SetSpriteFacingDirectionAndDelay ld a, $4 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret PlayerEntryMovementRLE: @@ -125,7 +125,7 @@ OaksLabScript4: call PlayDefaultMusic ld a, $5 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript5: @@ -155,7 +155,7 @@ OaksLabScript5: ld [wJoyIgnore], a ld a, $6 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript6: @@ -185,7 +185,7 @@ OaksLabScript6: ld [wPlayerMovingDirection], a ld a, $7 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript7: @@ -195,7 +195,7 @@ OaksLabScript7: call Delay3 ld a, $6 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript8: @@ -204,7 +204,7 @@ OaksLabScript8: ld de, .SonyPushesPlayerAwayFromEeveeBall call MoveSprite ld a, $9 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret .SonyPushesPlayerAwayFromEeveeBall @@ -227,7 +227,7 @@ OaksLabScript9: ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay ld a, 1 - ld [W_RIVALSTARTER], a + ld [wRivalStarter], a ld a, EEVEE ld [wd11e], a call GetMonName @@ -238,7 +238,7 @@ OaksLabScript9: call DisplayTextID ld a, $a - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret .asm_1c564 @@ -277,7 +277,7 @@ OaksLabScript10: .asm_1c5a6 call StartSimulatingJoypadStates ld a, $b - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabRLE_PlayerWalksToOak: @@ -298,7 +298,7 @@ OaksLabScript11: ld [wJoyIgnore], a ld a, $c - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript12: @@ -333,7 +333,7 @@ OaksLabScript12: ld [hSpriteIndexOrTextID], a call MoveSprite ld a, $d - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript13: @@ -358,7 +358,7 @@ OaksLabScript13: ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a ld a, $e - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript14: @@ -376,7 +376,7 @@ OaksLabScript14: ld b, $2 .asm_1c660 ld a, b - ld [W_RIVALSTARTER], a + ld [wRivalStarter], a ld a, $ff ^ (A_BUTTON | B_BUTTON) ld [wJoyIgnore], a @@ -393,7 +393,7 @@ OaksLabScript14: predef HealParty SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB ld a, $f - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript15: @@ -418,7 +418,7 @@ OaksLabScript15: .asm_1c6bd ld [wNPCMovementDirections], a ld a, $10 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret .OaksLabMovement_RivalWalksOut1 @@ -442,7 +442,7 @@ OaksLabScript16: predef HideObject call PlayDefaultMusic ld a, $11 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret .asm_1c6ed @@ -479,7 +479,7 @@ OaksLabScript17: ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $12 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript18: @@ -489,7 +489,7 @@ OaksLabScript18: xor a ld [wJoyIgnore], a ld a, $16 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript19: @@ -519,7 +519,7 @@ OaksLabScript19: ld de, wNPCMovementDirections2 call MoveSprite ld a, $14 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript_1c78e: @@ -583,7 +583,7 @@ OaksLabScript20: call DisplayTextID SetEvent EVENT_GOT_POKEDEX ld a, $1 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a SetEvent EVENT_OAK_GOT_PARCEL ld a, HS_LYING_OLD_MAN ld [wMissableObjectIndex], a @@ -605,7 +605,7 @@ OaksLabScript20: ld de, wNPCMovementDirections2 call MoveSprite ld a, $15 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript21: @@ -625,7 +625,7 @@ OaksLabScript21: xor a ld [wJoyIgnore], a ld a, $16 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript22: @@ -801,7 +801,7 @@ OaksLabScript_1c9ac: ld [wWhichEmotionBubble], a predef EmotionBubble ld a, $8 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a jp TextScriptEnd OaksLabText3: @@ -863,7 +863,7 @@ OaksLabText3: call PrintText call OaksLabScript_1c897 ld a, $13 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a jr .asm_1ca6f .asm_1ca4a @@ -1025,7 +1025,7 @@ OaksLabText_1cb3a: OaksLabText18: TX_ASM ld a, PIKACHU - ld [W_PLAYERSTARTER], a + ld [wPlayerStarter], a ld [wd11e], a call GetMonName ld a, $1 diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index ad7ca079..803aa4f3 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -5,7 +5,7 @@ PalletTownScript: .next call EnableAutoTextBoxDrawing ld hl, PalletTownScriptPointers - ld a, [W_PALLETTOWNCURSCRIPT] + ld a, [wPalletTownCurScript] jp JumpTable PalletTownScriptPointers: @@ -47,7 +47,7 @@ PalletTownScript0: ; trigger the next script ld a, 1 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript1: @@ -75,7 +75,7 @@ PalletTownScript1: ld a, SPRITE_FACING_UP ld [wSpriteStateData1 + 1 * $10 + 9], a ld a, 2 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript2: @@ -98,7 +98,7 @@ PalletTownScript2: ; trigger the next script ld a, 3 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript3: @@ -130,7 +130,7 @@ PalletTownScript3: ; trigger the next script ld a, 4 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript4: @@ -139,7 +139,7 @@ PalletTownScript4: ld [wJoyIgnore], a xor a ld [wListScrollOffset], a - ld a, STARTER_PIKACHU_BATTLE + ld a, BATTLE_TYPE_PIKACHU ld [wBattleType], a ld a, PIKACHU ld [wCurOpponent], a @@ -148,7 +148,7 @@ PalletTownScript4: ; trigger the next script ld a, 5 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript5: @@ -169,7 +169,7 @@ PalletTownScript5: ; trigger the next script ld a, 6 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript6: @@ -186,7 +186,7 @@ PalletTownScript6: ; trigger the next script ld a, 7 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript7: @@ -196,7 +196,7 @@ PalletTownScript7: ; trigger the next script ld a, 8 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a ret PalletTownScript8: diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index da29d814..b7271b05 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -3,7 +3,7 @@ PewterCityScript: ld hl, wd492 res 7, [hl] ld hl, PewterCityScriptPointers - ld a, [W_PEWTERCITYCURSCRIPT] + ld a, [wPewterCityCurScript] call JumpTable ret @@ -18,7 +18,7 @@ PewterCityScriptPointers: PewterCityScript0: xor a - ld [W_MUSEUM1FCURSCRIPT], a + ld [wMuseum1FCurScript], a ResetEvent EVENT_BOUGHT_MUSEUM_TICKET call PewterCityScript_1925e ret @@ -76,7 +76,7 @@ PewterCityScript1: ld de, MovementData_PewterMuseumGuyExit call MoveSprite ld a, $2 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret MovementData_PewterMuseumGuyExit: @@ -94,7 +94,7 @@ PewterCityScript2: ld [wMissableObjectIndex], a predef HideObject ld a, $3 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript3: @@ -107,7 +107,7 @@ PewterCityScript3: xor a ld [wJoyIgnore], a ld a, $0 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript4: @@ -141,7 +141,7 @@ PewterCityScript4: ld de, MovementData_PewterGymGuyExit call MoveSprite ld a, $5 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret MovementData_PewterGymGuyExit: @@ -160,7 +160,7 @@ PewterCityScript5: ld [wMissableObjectIndex], a predef HideObject ld a, $6 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript6: @@ -173,7 +173,7 @@ PewterCityScript6: xor a ld [wJoyIgnore], a ld a, $0 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityTextPointers: @@ -226,7 +226,7 @@ PewterCityText3: ld [wSpriteIndex], a call GetSpritePosition2 ld a, $1 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a .asm_193ee jp TextScriptEnd @@ -290,7 +290,7 @@ PewterCityText5: ld [wSpriteIndex], a call GetSpritePosition2 ld a, $4 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a jp TextScriptEnd PewterCityText_1945d: diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 922a3d3e..6014cf33 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -1,14 +1,14 @@ PewterGymScript: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, PewterGymScript_5c3a4 call EnableAutoTextBoxDrawing ld hl, PewterGymTrainerHeaders ld de, PewterGymScriptPointers - ld a, [W_PEWTERGYMCURSCRIPT] + ld a, [wPewterGymCurScript] call ExecuteCurMapScriptInTable - ld [W_PEWTERGYMCURSCRIPT], a + ld [wPewterGymCurScript], a ret PewterGymScript_5c3a4: @@ -26,8 +26,8 @@ Gym1LeaderName: PewterGymScript_5c3bf: xor a ld [wJoyIgnore], a - ld [W_PEWTERGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPewterGymCurScript], a + ld [wCurMapScript], a ret PewterGymScriptPointers: @@ -131,8 +131,8 @@ PewterGymText1: xor a ld [hJoyHeld], a ld a, $3 - ld [W_PEWTERGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPewterGymCurScript], a + ld [wCurMapScript], a .asm_5c49b jp TextScriptEnd diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 28e57d22..0a0aa3d5 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -1,14 +1,14 @@ PokemonTower2Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower2ScriptPointers - ld a, [W_POKEMONTOWER2CURSCRIPT] + ld a, [wPokemonTower2CurScript] jp JumpTable PokemonTower2Script_604fe: xor a ld [wJoyIgnore], a - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a ret PokemonTower2ScriptPointers: @@ -78,8 +78,8 @@ PokemonTower2Script1: call StopAllMusic callba Music_RivalAlternateStart ld a, $2 - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a ret MovementData_605a9: @@ -115,8 +115,8 @@ PokemonTower2Script2: ld [wJoyIgnore], a call PlayDefaultMusic ld a, $0 - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a ret PokemonTower2TextPointers: @@ -141,13 +141,13 @@ PokemonTower2Text1: call SaveEndBattleTextPointers ld a, OPP_SONY2 ld [wCurOpponent], a - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] add $1 ld [wTrainerNo], a ld a, $1 - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a .asm_41852 jp TextScriptEnd diff --git a/scripts/pokemontower3.asm b/scripts/pokemontower3.asm index 453f6baa..8be15c9e 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -2,9 +2,9 @@ PokemonTower3Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower3TrainerHeaders ld de, PokemonTower3ScriptPointers - ld a, [W_POKEMONTOWER3CURSCRIPT] + ld a, [wPokemonTower3CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER3CURSCRIPT], a + ld [wPokemonTower3CurScript], a ret PokemonTower3ScriptPointers: diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm index 2264f6d8..fe7a4e08 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/pokemontower4.asm @@ -2,9 +2,9 @@ PokemonTower4Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower4TrainerHeaders ld de, PokemonTower4ScriptPointers - ld a, [W_POKEMONTOWER4CURSCRIPT] + ld a, [wPokemonTower4CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER4CURSCRIPT], a + ld [wPokemonTower4CurScript], a ret PokemonTower4ScriptPointers: diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index d5d5e1b7..82b912b5 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -2,9 +2,9 @@ PokemonTower5Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower5TrainerHeaders ld de, PokemonTower5ScriptPointers - ld a, [W_POKEMONTOWER5CURSCRIPT] + ld a, [wPokemonTower5CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER5CURSCRIPT], a + ld [wPokemonTower5CurScript], a ret PokemonTower5ScriptPointers: diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index a9b21a89..82c39a41 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -2,16 +2,16 @@ PokemonTower6Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower6TrainerHeaders ld de, PokemonTower6ScriptPointers - ld a, [W_POKEMONTOWER6CURSCRIPT] + ld a, [wPokemonTower6CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER6CURSCRIPT], a + ld [wPokemonTower6CurScript], a ret PokemonTower6Script_60b02: xor a ld [wJoyIgnore], a - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6ScriptPointers: @@ -37,8 +37,8 @@ PokemonTower6Script0: ld a, 30 ld [wCurEnemyLVL], a ld a, $4 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret CoordsData_60b45: @@ -66,8 +66,8 @@ PokemonTower6Script4: xor a ld [wJoyIgnore], a ld a, $0 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret .asm_60b82 ld a, $1 @@ -80,8 +80,8 @@ PokemonTower6Script4: ld hl, wd730 set 7, [hl] ld a, $3 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6Script3: @@ -90,8 +90,8 @@ PokemonTower6Script3: ret nz call Delay3 xor a - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6TextPointers: diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index 34345db9..9a016d84 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -1,7 +1,7 @@ PokemonTower7Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower7ScriptPointers - ld a, [W_POKEMONTOWER7CURSCRIPT] + ld a, [wPokemonTower7CurScript] call JumpTable ret @@ -9,7 +9,7 @@ PokemonTower7Script_60d01: xor a ld [wJoyIgnore], a PokemonTower7Script_60d05: - ld [W_POKEMONTOWER7CURSCRIPT], a + ld [wPokemonTower7CurScript], a ret PokemonTower7ScriptPointers: @@ -245,7 +245,7 @@ PokemonTower7Script11: ld hl, wd72d set 3, [hl] ld a, $0 - ld [W_POKEMONTOWER7CURSCRIPT], a + ld [wPokemonTower7CurScript], a ret PokemonTower7TextPointers: @@ -307,7 +307,7 @@ PokemonTower7Text3: ld [wMissableObjectIndex], a predef ShowObject ld a, $b - ld [W_POKEMONTOWER7CURSCRIPT], a + ld [wPokemonTower7CurScript], a jp TextScriptEnd PokemonTower7Text_60f75: diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index 353ab2f4..c7a5625f 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -1,27 +1,27 @@ PowerPlantScript: call EnableAutoTextBoxDrawing ld hl, PowerPlantTrainerHeaders - ld de, PowerPlantScriptPointers - ld a, [W_POWERPLANTCURSCRIPT] + ld de, .ScriptPointers + ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable - ld [W_POWERPLANTCURSCRIPT], a + ld [wPowerPlantCurScript], a ret -PowerPlantScriptPointers: +.ScriptPointers dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle PowerPlantTextPointers: - dw PowerPlantText1 - dw PowerPlantText2 - dw PowerPlantText3 - dw PowerPlantText4 - dw PowerPlantText5 - dw PowerPlantText6 - dw PowerPlantText7 - dw PowerPlantText8 - dw PowerPlantText9 + dw Voltorb0Text + dw Voltorb1Text + dw Voltorb2Text + dw Voltorb3Text + dw Voltorb4Text + dw Voltorb5Text + dw Voltorb6Text + dw Voltorb7Text + dw ZapdosText dw PickUpItemText dw PickUpItemText dw PickUpItemText @@ -29,82 +29,82 @@ PowerPlantTextPointers: dw PickUpItemText PowerPlantTrainerHeaders: -PowerPlantTrainerHeader0: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_0 +Voltorb0TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_0 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_0 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader1: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_1 +Voltorb1TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_1 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_1 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_1 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader2: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_2 +Voltorb2TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_2 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_2 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader3: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_3 +Voltorb3TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_3 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_3 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader4: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_4 +Voltorb4TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_4 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_4 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader5: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_5 +Voltorb5TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_5 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_5 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader6: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_6 +Voltorb6TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_6 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_6 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader7: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_7, 1 +Voltorb7TrainerHeader: + dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_7, 1 + dwEventFlagAddress EVENT_BEAT_POWER_PLANT_VOLTORB_7, 1 dw VoltorbBattleText ; TextBeforeBattle dw VoltorbBattleText ; TextAfterBattle dw VoltorbBattleText ; TextEndBattle dw VoltorbBattleText ; TextEndBattle -PowerPlantTrainerHeader8: - dbEventFlagBit EVENT_BEAT_POWER_PLANT_TRAINER_8, 1 +ZapdosTrainerHeader: + dbEventFlagBit EVENT_BEAT_ZAPDOS, 1 db 0 ; view range - dwEventFlagAddress EVENT_BEAT_POWER_PLANT_TRAINER_8, 1 + dwEventFlagAddress EVENT_BEAT_ZAPDOS, 1 dw ZapdosBattleText ; TextBeforeBattle dw ZapdosBattleText ; TextAfterBattle dw ZapdosBattleText ; TextEndBattle @@ -114,53 +114,53 @@ PowerPlantTrainerHeader8: InitVoltorbBattle: call TalkToTrainer - ld a, [W_CURMAPSCRIPT] - ld [W_POWERPLANTCURSCRIPT], a + ld a, [wCurMapScript] + ld [wPowerPlantCurScript], a jp TextScriptEnd -PowerPlantText1: +Voltorb0Text: TX_ASM - ld hl, PowerPlantTrainerHeader0 + ld hl, Voltorb0TrainerHeader jr InitVoltorbBattle -PowerPlantText2: +Voltorb1Text: TX_ASM - ld hl, PowerPlantTrainerHeader1 + ld hl, Voltorb1TrainerHeader jr InitVoltorbBattle -PowerPlantText3: +Voltorb2Text: TX_ASM - ld hl, PowerPlantTrainerHeader2 + ld hl, Voltorb2TrainerHeader jr InitVoltorbBattle -PowerPlantText4: +Voltorb3Text: TX_ASM - ld hl, PowerPlantTrainerHeader3 + ld hl, Voltorb3TrainerHeader jr InitVoltorbBattle -PowerPlantText5: +Voltorb4Text: TX_ASM - ld hl, PowerPlantTrainerHeader4 + ld hl, Voltorb4TrainerHeader jr InitVoltorbBattle -PowerPlantText6: +Voltorb5Text: TX_ASM - ld hl, PowerPlantTrainerHeader5 + ld hl, Voltorb5TrainerHeader jr InitVoltorbBattle -PowerPlantText7: +Voltorb6Text: TX_ASM - ld hl, PowerPlantTrainerHeader6 + ld hl, Voltorb6TrainerHeader jr InitVoltorbBattle -PowerPlantText8: +Voltorb7Text: TX_ASM - ld hl, PowerPlantTrainerHeader7 + ld hl, Voltorb7TrainerHeader jr InitVoltorbBattle -PowerPlantText9: +ZapdosText: TX_ASM - ld hl, PowerPlantTrainerHeader8 + ld hl, ZapdosTrainerHeader jr InitVoltorbBattle VoltorbBattleText: diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index ac699aba..35c9026a 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -3,13 +3,13 @@ RocketHideout1Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout1TrainerHeaders ld de, RocketHideout1ScriptPointers - ld a, [W_ROCKETHIDEOUT1CURSCRIPT] + ld a, [wRocketHideout1CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT1CURSCRIPT], a + ld [wRocketHideout1CurScript], a ret RocketHideout1Script_44be0: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index 1436f7c4..b29e5396 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -2,9 +2,9 @@ RocketHideout2Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout2TrainerHeaders ld de, RocketHideout2ScriptPointers - ld a, [W_ROCKETHIDEOUT2CURSCRIPT] + ld a, [wRocketHideout2CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT2CURSCRIPT], a + ld [wRocketHideout2CurScript], a ret RocketHideout2ScriptPointers: @@ -30,7 +30,7 @@ RocketHideout2Script0: ld a, $ff ld [wJoyIgnore], a ld a, $3 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -310,7 +310,7 @@ RocketHideout2Script3: ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret LoadSpinnerArrowTiles: diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index 4e83b32a..ac08e868 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -2,9 +2,9 @@ RocketHideout3Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout3TrainerHeaders ld de, RocketHideout3ScriptPointers - ld a, [W_ROCKETHIDEOUT3CURSCRIPT] + ld a, [wRocketHideout3CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT3CURSCRIPT], a + ld [wRocketHideout3CurScript], a ret RocketHideout3ScriptPointers: @@ -30,7 +30,7 @@ RocketHideout3Script0: ld a, $ff ld [wJoyIgnore], a ld a, $3 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -140,7 +140,7 @@ RocketHideout3Script3: ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret RocketHideout3TextPointers: diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 9c2c4d82..2b3e0e89 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -2,9 +2,9 @@ RocketHideout4Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout4TrainerHeader0 ld de, RocketHideout4ScriptPointers - ld a, [W_ROCKETHIDEOUT4CURSCRIPT] + ld a, [wRocketHideout4CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT4CURSCRIPT], a + ld [wRocketHideout4CurScript], a ret RocketHideout4Script_45510: @@ -13,8 +13,8 @@ RocketHideout4Script_45510: xor a ld [wJoyIgnore], a RocketHideout4Script_4551e: - ld [W_ROCKETHIDEOUT4CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRocketHideout4CurScript], a + ld [wCurMapScript], a ret RocketHideout4Script_45525: @@ -61,11 +61,11 @@ RocketHideout4Script3: call GBFadeInFromBlack xor a ld [wJoyIgnore], a - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ld a, $0 - ld [W_ROCKETHIDEOUT4CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRocketHideout4CurScript], a + ld [wCurMapScript], a ret RocketHideout4Script0: @@ -363,8 +363,8 @@ RocketHideout4Text0: xor a ld [hJoyHeld], a ld a, $3 - ld [W_ROCKETHIDEOUT4CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRocketHideout4CurScript], a + ld [wCurMapScript], a jr .asm_45801 .asm_457fb diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm index 5a5e7ae2..526ac3cc 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/rockethideoutelevator.asm @@ -1,5 +1,5 @@ RocketHideoutElevatorScript: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] push hl diff --git a/scripts/rocktunnel1.asm b/scripts/rocktunnel1.asm index c32c1036..2819c350 100755 --- a/scripts/rocktunnel1.asm +++ b/scripts/rocktunnel1.asm @@ -2,9 +2,9 @@ RockTunnel1Script: call EnableAutoTextBoxDrawing ld hl, RockTunnel1TrainerHeaders ld de, RockTunnel1ScriptPointers - ld a, [W_ROCKTUNNEL1CURSCRIPT] + ld a, [wRockTunnel1CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKTUNNEL1CURSCRIPT], a + ld [wRockTunnel1CurScript], a ret RockTunnel1ScriptPointers: diff --git a/scripts/rocktunnel2.asm b/scripts/rocktunnel2.asm index d522ba0e..7ac3f426 100755 --- a/scripts/rocktunnel2.asm +++ b/scripts/rocktunnel2.asm @@ -2,9 +2,9 @@ RockTunnel2Script: call EnableAutoTextBoxDrawing ld hl, RockTunnel2TrainerHeaders ld de, RockTunnel2ScriptPointers - ld a, [W_ROCKTUNNEL2CURSCRIPT] + ld a, [wRockTunnel2CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKTUNNEL2CURSCRIPT], a + ld [wRockTunnel2CurScript], a ret RockTunnel2ScriptPointers: diff --git a/scripts/route10.asm b/scripts/route10.asm index 3337f870..ca0ab190 100755 --- a/scripts/route10.asm +++ b/scripts/route10.asm @@ -2,9 +2,9 @@ Route10Script: call EnableAutoTextBoxDrawing ld hl, Route10TrainerHeaders ld de, Route10ScriptPointers - ld a, [W_ROUTE10CURSCRIPT] + ld a, [wRoute10CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE10CURSCRIPT], a + ld [wRoute10CurScript], a ret Route10ScriptPointers: diff --git a/scripts/route11.asm b/scripts/route11.asm index 0c41f113..ab3509c5 100755 --- a/scripts/route11.asm +++ b/scripts/route11.asm @@ -2,9 +2,9 @@ Route11Script: call EnableAutoTextBoxDrawing ld hl, Route11TrainerHeaders ld de, Route11ScriptPointers - ld a, [W_ROUTE11CURSCRIPT] + ld a, [wRoute11CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE11CURSCRIPT], a + ld [wRoute11CurScript], a ret Route11ScriptPointers: diff --git a/scripts/route12.asm b/scripts/route12.asm index 5aad5bd0..e61f41c0 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -2,16 +2,16 @@ Route12Script: call EnableAutoTextBoxDrawing ld hl, Route12TrainerHeaders ld de, Route12ScriptPointers - ld a, [W_ROUTE12CURSCRIPT] + ld a, [wRoute12CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE12CURSCRIPT], a + ld [wRoute12CurScript], a ret Route12Script_59606: xor a ld [wJoyIgnore], a - ld [W_ROUTE12CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute12CurScript], a + ld [wCurMapScript], a ret Route12ScriptPointers: @@ -37,8 +37,8 @@ Route12Script0: ld [wMissableObjectIndex], a predef HideObject ld a, $3 - ld [W_ROUTE12CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute12CurScript], a + ld [wCurMapScript], a ret Route12Script3: @@ -56,8 +56,8 @@ Route12Script3: SetEvent EVENT_BEAT_ROUTE12_SNORLAX call Delay3 ld a, $0 - ld [W_ROUTE12CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute12CurScript], a + ld [wCurMapScript], a ret Route12TextPointers: diff --git a/scripts/route13.asm b/scripts/route13.asm index 9c6cff5e..61f43ee9 100755 --- a/scripts/route13.asm +++ b/scripts/route13.asm @@ -2,9 +2,9 @@ Route13Script: call EnableAutoTextBoxDrawing ld hl, Route13TrainerHeaders ld de, Route13ScriptPointers - ld a, [W_ROUTE13CURSCRIPT] + ld a, [wRoute13CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE13CURSCRIPT], a + ld [wRoute13CurScript], a ret Route13ScriptPointers: diff --git a/scripts/route14.asm b/scripts/route14.asm index e4e82e2b..70f747c5 100755 --- a/scripts/route14.asm +++ b/scripts/route14.asm @@ -2,9 +2,9 @@ Route14Script: call EnableAutoTextBoxDrawing ld hl, Route14TrainerHeaders ld de, Route14ScriptPointers - ld a, [W_ROUTE14CURSCRIPT] + ld a, [wRoute14CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE14CURSCRIPT], a + ld [wRoute14CurScript], a ret Route14ScriptPointers: diff --git a/scripts/route15.asm b/scripts/route15.asm index eb2e67d9..e3329ab4 100755 --- a/scripts/route15.asm +++ b/scripts/route15.asm @@ -2,9 +2,9 @@ Route15Script: call EnableAutoTextBoxDrawing ld hl, Route15TrainerHeaders ld de, Route15ScriptPointers - ld a, [W_ROUTE15CURSCRIPT] + ld a, [wRoute15CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE15CURSCRIPT], a + ld [wRoute15CurScript], a ret Route15ScriptPointers: diff --git a/scripts/route16.asm b/scripts/route16.asm index e2777f0a..fe38fac4 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -2,16 +2,16 @@ Route16Script: call EnableAutoTextBoxDrawing ld hl, Route16TrainerHeaders ld de, Route16ScriptPointers - ld a, [W_ROUTE16CURSCRIPT] + ld a, [wRoute16CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE16CURSCRIPT], a + ld [wRoute16CurScript], a ret Route16Script_59946: xor a ld [wJoyIgnore], a - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16ScriptPointers: @@ -38,8 +38,8 @@ Route16Script0: predef HideObject call UpdateSprites ld a, $3 - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16Script3: @@ -57,8 +57,8 @@ Route16Script3: SetEvent EVENT_BEAT_ROUTE16_SNORLAX call Delay3 ld a, $0 - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16TextPointers: diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index 5af4e0b2..df478b1f 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -2,7 +2,7 @@ Route16GateScript: ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing - ld a, [W_ROUTE16GATECURSCRIPT] + ld a, [wRoute16GateCurScript] ld hl, Route16GateScriptPointers jp JumpTable @@ -36,11 +36,11 @@ Route16GateScript0: call FillMemory call StartSimulatingJoypadStates ld a, $1 - ld [W_ROUTE16GATECURSCRIPT], a + ld [wRoute16GateCurScript], a ret .asm_4970e ld a, $2 - ld [W_ROUTE16GATECURSCRIPT], a + ld [wRoute16GateCurScript], a ret CoordsData_49714: @@ -67,7 +67,7 @@ Route16GateScript2: ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, $3 - ld [W_ROUTE16GATECURSCRIPT], a + ld [wRoute16GateCurScript], a ret Route16GateScript3: @@ -79,7 +79,7 @@ Route16GateScript3: ld hl, wd730 res 7, [hl] ld a, $0 - ld [W_ROUTE16GATECURSCRIPT], a + ld [wRoute16GateCurScript], a ret Route16GateScript_49755: diff --git a/scripts/route17.asm b/scripts/route17.asm index edb8be9f..ddf92c2d 100755 --- a/scripts/route17.asm +++ b/scripts/route17.asm @@ -2,9 +2,9 @@ Route17Script: call EnableAutoTextBoxDrawing ld hl, Route17TrainerHeaders ld de, Route17ScriptPointers - ld a, [W_ROUTE17CURSCRIPT] + ld a, [wRoute17CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE17CURSCRIPT], a + ld [wRoute17CurScript], a ret Route17ScriptPointers: diff --git a/scripts/route18.asm b/scripts/route18.asm index af2698be..7b654e7c 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -2,9 +2,9 @@ Route18Script: call EnableAutoTextBoxDrawing ld hl, Route18TrainerHeaders ld de, Route18ScriptPointers - ld a, [W_ROUTE18CURSCRIPT] + ld a, [wRoute18CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE18CURSCRIPT], a + ld [wRoute18CurScript], a ret Route18ScriptPointers: diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index a58805bb..186ea61b 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -2,7 +2,7 @@ Route18GateScript: ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing - ld a, [W_ROUTE18GATECURSCRIPT] + ld a, [wRoute18GateCurScript] ld hl, Route18GateScriptPointers jp JumpTable @@ -36,11 +36,11 @@ Route18GateScript0: call FillMemory call StartSimulatingJoypadStates ld a, $1 - ld [W_ROUTE18GATECURSCRIPT], a + ld [wRoute18GateCurScript], a ret .asm_498c6 ld a, $2 - ld [W_ROUTE18GATECURSCRIPT], a + ld [wRoute18GateCurScript], a ret CoordsData_498cc: @@ -67,7 +67,7 @@ Route18GateScript2: ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, $3 - ld [W_ROUTE18GATECURSCRIPT], a + ld [wRoute18GateCurScript], a ret Route18GateScript3: @@ -79,7 +79,7 @@ Route18GateScript3: ld hl, wd730 res 7, [hl] ld a, $0 - ld [W_ROUTE18GATECURSCRIPT], a + ld [wRoute18GateCurScript], a ret Route18GateTextPointers: diff --git a/scripts/route19.asm b/scripts/route19.asm index d3f56977..162c4548 100755 --- a/scripts/route19.asm +++ b/scripts/route19.asm @@ -2,9 +2,9 @@ Route19Script: call EnableAutoTextBoxDrawing ld hl, Route19TrainerHeaders ld de, Route19ScriptPointers - ld a, [W_ROUTE19CURSCRIPT] + ld a, [wRoute19CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE19CURSCRIPT], a + ld [wRoute19CurScript], a ret Route19ScriptPointers: diff --git a/scripts/route20.asm b/scripts/route20.asm index cea1e01c..012c9c53 100755 --- a/scripts/route20.asm +++ b/scripts/route20.asm @@ -4,9 +4,9 @@ Route20Script: call EnableAutoTextBoxDrawing ld hl, Route20TrainerHeader0 ld de, Route20ScriptPointers - ld a, [W_ROUTE20CURSCRIPT] + ld a, [wRoute20CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE20CURSCRIPT], a + ld [wRoute20CurScript], a ret Route20Script_50cc6: diff --git a/scripts/route21.asm b/scripts/route21.asm index de17ca11..89874e58 100755 --- a/scripts/route21.asm +++ b/scripts/route21.asm @@ -2,9 +2,9 @@ Route21Script: call EnableAutoTextBoxDrawing ld hl, Route21TrainerHeaders ld de, Route21ScriptPointers - ld a, [W_ROUTE21CURSCRIPT] + ld a, [wRoute21CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE21CURSCRIPT], a + ld [wRoute21CurScript], a ret Route21ScriptPointers: diff --git a/scripts/route22.asm b/scripts/route22.asm index 49c57a47..fe881366 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -1,7 +1,7 @@ Route22Script: call EnableAutoTextBoxDrawing ld hl, Route22ScriptPointers - ld a, [W_ROUTE22CURSCRIPT] + ld a, [wRoute22CurScript] jp JumpTable Route22ScriptPointers: @@ -17,7 +17,7 @@ Route22ScriptPointers: Route22Script_50ece: xor a ld [wJoyIgnore], a - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a Route22Script7: ret @@ -31,7 +31,7 @@ Route22Script_50ed6: Route22Script_50ee1: ld a, OPP_SONY2 ld [wCurOpponent], a - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] add 7 ld [wTrainerNo], a ret @@ -98,7 +98,7 @@ Route22Script0: ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $1 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script1: @@ -132,7 +132,7 @@ Route22Script1: call SaveEndBattleTextPointers call Route22Script_50ed6 ld a, $2 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22RivalDefeatedText1: @@ -147,11 +147,11 @@ Route22Script2: ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp 2 jr nz, .asm_50fc9 ld a, $1 - ld [W_RIVALSTARTER], a + ld [wRivalStarter], a .asm_50fc9 ld a, [wPlayerFacingDirection] and a ; cp SPRITE_FACING_DOWN @@ -182,7 +182,7 @@ Route22Script2: call Route22Script_5100d .asm_51002 ld a, $3 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_51008: @@ -231,7 +231,7 @@ Route22Script3: call PlayDefaultMusic ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE ld a, $0 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_5104e: @@ -251,7 +251,7 @@ Route22Script_5104e: ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $4 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script4: @@ -287,7 +287,7 @@ Route22Script4: call SaveEndBattleTextPointers call Route22Script_50ee1 ld a, $5 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22RivalDefeatedText2: @@ -335,7 +335,7 @@ Route22Script5: call Route22Script_51142 .asm_51137 ld a, $6 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_5113d: @@ -370,7 +370,7 @@ Route22Script6: call PlayDefaultMusic ResetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE ld a, $7 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22TextPointers: diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 9fd7c9cd..05fbc7e9 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -1,7 +1,7 @@ Route22GateScript: call EnableAutoTextBoxDrawing ld hl, Route22GateScriptPointers - ld a, [W_ROUTE22GATECURSCRIPT] + ld a, [wRoute22GateCurScript] call JumpTable ld a, [wYCoord] cp $4 @@ -52,7 +52,7 @@ Route22GateScript1: ld [wJoyIgnore], a call Delay3 ld a, $0 - ld [W_ROUTE22GATECURSCRIPT], a + ld [wRoute22GateCurScript], a Route22GateScript2: ret @@ -74,7 +74,7 @@ Route22GateText1: call PrintText ld a, $2 .asm_1e6fe - ld [W_ROUTE22GATECURSCRIPT], a + ld [wRoute22GateCurScript], a jp TextScriptEnd Route22GateText_1e704: diff --git a/scripts/route23.asm b/scripts/route23.asm index ca980843..b82ab505 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -2,11 +2,11 @@ Route23Script: call Route23Script_511e9 call EnableAutoTextBoxDrawing ld hl, Route23ScriptPointers - ld a, [W_ROUTE23CURSCRIPT] + ld a, [wRoute23CurScript] jp JumpTable Route23Script_511e9: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z @@ -128,7 +128,7 @@ Route23Script1: ret nz Route23Script2: ld a, $0 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret Route23TextPointers: @@ -199,7 +199,7 @@ Route23Script_51346: call PrintText call Route23Script_512d8 ld a, $1 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret .asm_5136e ld hl, VictoryRoadGuardText2 @@ -210,7 +210,7 @@ Route23Script_51346: EventFlagAddress hl, EVENT_PASSED_CASCADEBADGE_CHECK predef FlagActionPredef ld a, $2 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret Route23Script_51388: diff --git a/scripts/route24.asm b/scripts/route24.asm index b0db448d..d2872ccc 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -2,16 +2,16 @@ Route24Script: call EnableAutoTextBoxDrawing ld hl, Route24TrainerHeaders ld de, Route24ScriptPointers - ld a, [W_ROUTE24CURSCRIPT] + ld a, [wRoute24CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE24CURSCRIPT], a + ld [wRoute24CurScript], a ret Route24Script_513c0: xor a ld [wJoyIgnore], a - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24ScriptPointers: @@ -40,8 +40,8 @@ Route24Script0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $4 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret CoordsData_5140e: @@ -53,8 +53,8 @@ Route24Script4: ret nz call Delay3 ld a, $0 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24Script3: @@ -71,8 +71,8 @@ Route24Script3: xor a ld [wJoyIgnore], a ld a, $0 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24TextPointers: @@ -171,8 +171,8 @@ Route24Text1: xor a ld [hJoyHeld], a ld a, $3 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a jp TextScriptEnd .asm_514f9 ld hl, Route24Text_51530 diff --git a/scripts/route25.asm b/scripts/route25.asm index cf1599ca..cc2e1d9d 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -2,9 +2,9 @@ Route25Script: call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeaders ld de, Route25ScriptPointers - ld a, [W_ROUTE25CURSCRIPT] + ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE25CURSCRIPT], a + ld [wRoute25CurScript], a call Route25Script_515e1 ret @@ -15,8 +15,8 @@ Route25Script_515e1: res 4, [hl] res 7, [hl] xor a - ld [W_BILLSHOUSECURSCRIPT], a - ld hl, wd126 + ld [wBillsHouseCurScript], a + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z diff --git a/scripts/route3.asm b/scripts/route3.asm index 739c3b03..b2c5de3e 100755 --- a/scripts/route3.asm +++ b/scripts/route3.asm @@ -2,9 +2,9 @@ Route3Script: call EnableAutoTextBoxDrawing ld hl, Route3TrainerHeader0 ld de, Route3ScriptPointers - ld a, [W_ROUTE3CURSCRIPT] + ld a, [wRoute3CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE3CURSCRIPT], a + ld [wRoute3CurScript], a ret Route3ScriptPointers: diff --git a/scripts/route4.asm b/scripts/route4.asm index ff3be806..559f2006 100755 --- a/scripts/route4.asm +++ b/scripts/route4.asm @@ -2,9 +2,9 @@ Route4Script: call EnableAutoTextBoxDrawing ld hl, Route4TrainerHeaders ld de, Route4ScriptPointers - ld a, [W_ROUTE4CURSCRIPT] + ld a, [wRoute4CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE4CURSCRIPT], a + ld [wRoute4CurScript], a ret Route4ScriptPointers: diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 63072d55..b3ad0aa3 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -1,6 +1,6 @@ Route5GateScript: call EnableAutoTextBoxDrawing - ld a, [W_ROUTE5GATECURSCRIPT] + ld a, [wRoute5GateCurScript] ld hl, Route5GateScriptPointers jp JumpTable @@ -35,7 +35,7 @@ Route5GateScript0: call DisplayTextID call Route5GateScript_1df43 ld a, $1 - ld [W_ROUTE5GATECURSCRIPT], a + ld [wRoute5GateCurScript], a ret .asm_1df82 ld a, $3 @@ -57,7 +57,7 @@ Route5GateScript1: call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE5GATECURSCRIPT], a + ld [wRoute5GateCurScript], a ret Route5GateTextPointers: @@ -81,7 +81,7 @@ Route5GateText1: call PrintText call Route5GateScript_1df43 ld a, $1 - ld [W_ROUTE5GATECURSCRIPT], a + ld [wRoute5GateCurScript], a jp TextScriptEnd .asm_768a2 ld hl, Route5GateText3 diff --git a/scripts/route6.asm b/scripts/route6.asm index b499b2ef..7f3a5dda 100755 --- a/scripts/route6.asm +++ b/scripts/route6.asm @@ -2,9 +2,9 @@ Route6Script: call EnableAutoTextBoxDrawing ld hl, Route6TrainerHeaders ld de, Route6ScriptPointers - ld a, [W_ROUTE6CURSCRIPT] + ld a, [wRoute6CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE6CURSCRIPT], a + ld [wRoute6CurScript], a ret Route6ScriptPointers: diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm index b8876185..001a295c 100755 --- a/scripts/route6gate.asm +++ b/scripts/route6gate.asm @@ -1,7 +1,7 @@ Route6GateScript: call EnableAutoTextBoxDrawing ld hl, Route6GateScriptPointers - ld a, [W_ROUTE6GATECURSCRIPT] + ld a, [wRoute6GateCurScript] call JumpTable ret @@ -29,7 +29,7 @@ Route6GateScript0: call DisplayTextID call Route6GateScript_1e0a1 ld a, $1 - ld [W_ROUTE6GATECURSCRIPT], a + ld [wRoute6GateCurScript], a ret .asm_1e080 ld hl, wd728 @@ -49,7 +49,7 @@ Route6GateScript1: call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE6GATECURSCRIPT], a + ld [wRoute6GateCurScript], a ret Route6GateScript_1e0a1: diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm index f97cb03b..6e62c73c 100755 --- a/scripts/route7gate.asm +++ b/scripts/route7gate.asm @@ -1,6 +1,6 @@ Route7GateScript: call EnableAutoTextBoxDrawing - ld a, [W_ROUTE7GATECURSCRIPT] + ld a, [wRoute7GateCurScript] ld hl, Route7GateScriptPointers call JumpTable ret @@ -41,7 +41,7 @@ Route7GateScript0: call DisplayTextID call Route7GateScript_1e111 ld a, $1 - ld [W_ROUTE7GATECURSCRIPT], a + ld [wRoute7GateCurScript], a ret .asm_1e15a ld a, $3 @@ -63,8 +63,8 @@ Route7GateScript1: call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE7GATECURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute7GateCurScript], a + ld [wCurMapScript], a ret Route7GateTextPointers: diff --git a/scripts/route8.asm b/scripts/route8.asm index 0e437775..34e6aba4 100755 --- a/scripts/route8.asm +++ b/scripts/route8.asm @@ -2,9 +2,9 @@ Route8Script: call EnableAutoTextBoxDrawing ld hl, Route8TrainerHeaders ld de, Route8ScriptPointers - ld a, [W_ROUTE8CURSCRIPT] + ld a, [wRoute8CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE8CURSCRIPT], a + ld [wRoute8CurScript], a ret Route8ScriptPointers: diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index fe414ae1..b86458d8 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -1,7 +1,7 @@ Route8GateScript: call EnableAutoTextBoxDrawing ld hl, Route8GateScriptPointers - ld a, [W_ROUTE8GATECURSCRIPT] + ld a, [wRoute8GateCurScript] jp JumpTable Route8GateScriptPointers: @@ -40,7 +40,7 @@ Route8GateScript0: call DisplayTextID call Route8GateScript_1e1d7 ld a, $1 - ld [W_ROUTE8GATECURSCRIPT], a + ld [wRoute8GateCurScript], a ret .asm_1e220 ld hl, wd728 @@ -61,7 +61,7 @@ Route8GateScript1: call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE8GATECURSCRIPT], a + ld [wRoute8GateCurScript], a ret Route8GateTextPointers: diff --git a/scripts/route9.asm b/scripts/route9.asm index 8dbb19cb..f08e9790 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -2,9 +2,9 @@ Route9Script: call EnableAutoTextBoxDrawing ld hl, Route9TrainerHeaders ld de, Route9ScriptPointers - ld a, [W_ROUTE9CURSCRIPT] + ld a, [wRoute9CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE9CURSCRIPT], a + ld [wRoute9CurScript], a ret Route9ScriptPointers: diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index a3ab60b2..146d31f9 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -1,14 +1,14 @@ SaffronGymScript: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, .extra call EnableAutoTextBoxDrawing ld hl, SaffronGymTrainerHeader0 ld de, SaffronGymScriptPointers - ld a, [W_SAFFRONGYMCURSCRIPT] + ld a, [wSaffronGymCurScript] call ExecuteCurMapScriptInTable - ld [W_SAFFRONGYMCURSCRIPT], a + ld [wSaffronGymCurScript], a ret .extra @@ -25,8 +25,8 @@ Gym6LeaderName: SaffronGymText_5d048: xor a ld [wJoyIgnore], a - ld [W_SAFFRONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSaffronGymCurScript], a + ld [wCurMapScript], a ret SaffronGymScriptPointers: @@ -179,7 +179,7 @@ SaffronGymText1: ld a, $6 ld [wGymLeaderNo], a ld a, $3 - ld [W_SAFFRONGYMCURSCRIPT], a + ld [wSaffronGymCurScript], a .asm_5d15f jp TextScriptEnd diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index af1672a7..478946fa 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -8,7 +8,7 @@ SeafoamIslands5Script_467a5: xor a ld [wJoyIgnore], a ld [wSeafoamIslands5CurScript], a - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret SeafoamIslands5ScriptPointers: @@ -30,7 +30,7 @@ SeafoamIslands5Script4: SeafoamIslands5Script0: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld hl, CoordsData_467fe + ld hl, .Coords call ArePlayerCoordsInArray ret nc ld a, [wCoordIndex] @@ -53,7 +53,7 @@ SeafoamIslands5Script0: ld [wSeafoamIslands5CurScript], a ret -CoordsData_467fe: +.Coords db $11,$14 db $11,$15 db $10,$14 @@ -74,7 +74,7 @@ SeafoamIslands5Script2: CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ld a, $0 jr z, .asm_46849 - ld hl, CoordsData_4684d + ld hl, .Coords call ArePlayerCoordsInArray ld a, $0 jr nc, .asm_46849 @@ -96,7 +96,7 @@ SeafoamIslands5Script2: ld [wSeafoamIslands5CurScript], a ret -CoordsData_4684d: +.Coords db $0E,$04 db $0E,$05 db $FF @@ -134,32 +134,31 @@ SeaFoamIslands5Script_46872: SeafoamIslands5TextPointers: dw BoulderText dw BoulderText - dw SeafoamIslands5Text3 + dw ArticunoText dw SeafoamIslands5Text4 dw SeafoamIslands5Text5 -SeafoamIslands5TrainerHeaders: -SeafoamIslands5TrainerHeader0: - dbEventFlagBit EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0 +ArticunoTrainerHeader: + dbEventFlagBit EVENT_BEAT_ARTICUNO db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SEAFOAM_ISLANDS_5_TRAINER_0 - dw SeafoamIslands5BattleText2 ; TextBeforeBattle - dw SeafoamIslands5BattleText2 ; TextAfterBattle - dw SeafoamIslands5BattleText2 ; TextEndBattle - dw SeafoamIslands5BattleText2 ; TextEndBattle + dwEventFlagAddress EVENT_BEAT_ARTICUNO + dw ArticunoBattleText ; TextBeforeBattle + dw ArticunoBattleText ; TextAfterBattle + dw ArticunoBattleText ; TextEndBattle + dw ArticunoBattleText ; TextEndBattle db $ff -SeafoamIslands5Text3: +ArticunoText: TX_ASM - ld hl, SeafoamIslands5TrainerHeader0 + ld hl, ArticunoTrainerHeader call TalkToTrainer ld a, $4 ld [wSeafoamIslands5CurScript], a jp TextScriptEnd -SeafoamIslands5BattleText2: - TX_FAR _SeafoamIslands5BattleText2 +ArticunoBattleText: + TX_FAR _ArticunoBattleText TX_ASM ld a, ARTICUNO call PlayCry diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index ed8b9ec9..6b35a05a 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -3,13 +3,13 @@ SilphCo10Script: call EnableAutoTextBoxDrawing ld hl, SilphCo10TrainerHeaders ld de, SilphCo10ScriptPointers - ld a, [W_SILPHCO10CURSCRIPT] + ld a, [wSilphCo10CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO10CURSCRIPT], a + ld [wSilphCo10CurScript], a ret SilphCo10Script_5a14f: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 47924524..cd5a818d 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -3,13 +3,13 @@ SilphCo11Script: call EnableAutoTextBoxDrawing ld hl, SilphCo11TrainerHeaders ld de, SilphCo11ScriptPointers - ld a, [W_SILPHCO11CURSCRIPT] + ld a, [wSilphCo11CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO11CURSCRIPT], a + ld [wSilphCo11CurScript], a ret SilphCo11Script_62127: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -75,8 +75,8 @@ SilphCo11Script_62185: xor a ld [wJoyIgnore], a SilphCo11Script_62189: - ld [W_SILPHCO11CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSilphCo11CurScript], a + ld [wCurMapScript], a ret SilphCo11ScriptPointers: diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index 51bb62bc..3a5d3650 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -3,13 +3,13 @@ SilphCo2Script: call EnableAutoTextBoxDrawing ld hl, SilphCo2TrainerHeaders ld de, SilphCo2ScriptPointers - ld a, [W_SILPHCO2CURSCRIPT] + ld a, [wSilphCo2CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO2CURSCRIPT], a + ld [wSilphCo2CurScript], a ret SilphCo2Script_59d07: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index 7be07e6c..b8dfb7fb 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -3,13 +3,13 @@ SilphCo3Script: call EnableAutoTextBoxDrawing ld hl, SilphCo3TrainerHeaders ld de, SilphCo3ScriptPointers - ld a, [W_SILPHCO3CURSCRIPT] + ld a, [wSilphCo3CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO3CURSCRIPT], a + ld [wSilphCo3CurScript], a ret SilphCo3Script_59f71: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 33f2f884..a0682c8d 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -3,13 +3,13 @@ SilphCo4Script: call EnableAutoTextBoxDrawing ld hl, SilphCo4TrainerHeaders ld de, SilphCo4ScriptPointers - ld a, [W_SILPHCO4CURSCRIPT] + ld a, [wSilphCo4CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO4CURSCRIPT], a + ld [wSilphCo4CurScript], a ret SilphCo4Script_19d21: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index fa10a7a9..42577498 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -3,13 +3,13 @@ SilphCo5Script: call EnableAutoTextBoxDrawing ld hl, SilphCo5TrainerHeaders ld de, SilphCo5ScriptPointers - ld a, [W_SILPHCO5CURSCRIPT] + ld a, [wSilphCo5CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO5CURSCRIPT], a + ld [wSilphCo5CurScript], a ret SilphCo5Script_19f4d: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index 28f1eeba..c40c7d70 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -3,13 +3,13 @@ SilphCo6Script: call EnableAutoTextBoxDrawing ld hl, SilphCo6TrainerHeaders ld de, SilphCo6ScriptPointers - ld a, [W_SILPHCO6CURSCRIPT] + ld a, [wSilphCo6CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO6CURSCRIPT], a + ld [wSilphCo6CurScript], a ret SilphCo6Script_1a1bf: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 6281783a..2e93d92a 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -3,13 +3,13 @@ SilphCo7Script: call EnableAutoTextBoxDrawing ld hl, SilphCo7TrainerHeaders ld de, SilphCo7ScriptPointers - ld a, [W_SILPHCO7CURSCRIPT] + ld a, [wSilphCo7CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO7CURSCRIPT], a + ld [wSilphCo7CurScript], a ret SilphCo7Script_51b77: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -106,8 +106,8 @@ SilphCo7Text_51c0c: ld [wJoyIgnore], a SilphCo7Text_51c10: - ld [W_SILPHCO7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSilphCo7CurScript], a + ld [wCurMapScript], a ret SilphCo7ScriptPointers: @@ -183,7 +183,7 @@ SilphCo7Script3: call SaveEndBattleTextPointers ld a, OPP_SONY2 ld [wCurOpponent], a - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] add 4 ld [wTrainerNo], a ld a, $4 diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index c093c669..399f7bd5 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -3,13 +3,13 @@ SilphCo8Script: call EnableAutoTextBoxDrawing ld hl, SilphCo8TrainerHeader0 ld de, SilphCo8ScriptPointers - ld a, [W_SILPHCO8CURSCRIPT] + ld a, [wSilphCo8CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO8CURSCRIPT], a + ld [wSilphCo8CurScript], a ret SilphCo8Script_5651a: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 3dde7b13..6757eb49 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -3,13 +3,13 @@ SilphCo9Script: call EnableAutoTextBoxDrawing ld hl, SilphCo9TrainerHeaders ld de, SilphCo9ScriptPointers - ld a, [W_SILPHCO9CURSCRIPT] + ld a, [wSilphCo9CurScript] call ExecuteCurMapScriptInTable - ld [W_SILPHCO9CURSCRIPT], a + ld [wSilphCo9CurScript], a ret SilphCo9Script_5d7d1: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm index 9e8f0fe9..df4d08c7 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/silphcoelevator.asm @@ -1,5 +1,5 @@ SilphCoElevatorScript: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] push hl diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm index 363e24c5..45c8dba5 100755 --- a/scripts/ssanne10.asm +++ b/scripts/ssanne10.asm @@ -2,9 +2,9 @@ SSAnne10Script: call EnableAutoTextBoxDrawing ld hl, SSAnne10TrainerHeaders ld de, SSAnne10ScriptPointers - ld a, [W_SSANNE10CURSCRIPT] + ld a, [wSSAnne10CurScript] call ExecuteCurMapScriptInTable - ld [W_SSANNE10CURSCRIPT], a + ld [wSSAnne10CurScript], a ret SSAnne10ScriptPointers: diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 9b011075..4f0ffa2f 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -1,13 +1,13 @@ SSAnne2Script: call EnableAutoTextBoxDrawing ld hl, SSAnne2ScriptPointers - ld a, [W_SSANNE2CURSCRIPT] + ld a, [wSSAnne2CurScript] jp JumpTable SSAnne2Script_613ab: xor a ld [wJoyIgnore], a - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret SSAnne2ScriptPointers: @@ -51,7 +51,7 @@ SSAnne2Script0: .asm_61403 call MoveSprite ld a, $1 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret MovementData_6140c: @@ -101,7 +101,7 @@ SSAnne2Script1: ld [wTrainerNo], a call SSAnne2Script_61416 ld a, $2 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret SSAnne2Script2: @@ -131,7 +131,7 @@ SSAnne2Script2: call StopAllMusic callba Music_RivalAlternateStart ld a, $3 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret MovementData_614b7: @@ -156,7 +156,7 @@ SSAnne2Script3: predef HideObject call PlayDefaultMusic ld a, $4 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret SSAnne2TextPointers: diff --git a/scripts/ssanne5.asm b/scripts/ssanne5.asm index 99fb47cf..a398a381 100755 --- a/scripts/ssanne5.asm +++ b/scripts/ssanne5.asm @@ -2,9 +2,9 @@ SSAnne5Script: call EnableAutoTextBoxDrawing ld hl, SSAnne5TrainerHeader0 ld de, SSAnne5ScriptPointers - ld a, [W_SSANNE5CURSCRIPT] + ld a, [wSSAnne5CurScript] call ExecuteCurMapScriptInTable - ld [W_SSANNE5CURSCRIPT], a + ld [wSSAnne5CurScript], a ret SSAnne5ScriptPointers: diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm index 0f0e3850..e7cbef3e 100755 --- a/scripts/ssanne8.asm +++ b/scripts/ssanne8.asm @@ -2,9 +2,9 @@ SSAnne8Script: call EnableAutoTextBoxDrawing ld hl, SSAnne8TrainerHeaders ld de, SSAnne8ScriptPointers - ld a, [W_SSANNE8CURSCRIPT] + ld a, [wSSAnne8CurScript] call ExecuteCurMapScriptInTable - ld [W_SSANNE8CURSCRIPT], a + ld [wSSAnne8CurScript], a ret SSAnne8ScriptPointers: diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm index ab11ebc9..6e658e5f 100755 --- a/scripts/ssanne9.asm +++ b/scripts/ssanne9.asm @@ -2,9 +2,9 @@ SSAnne9Script: call DisableAutoTextBoxDrawing ld hl, SSAnne9TrainerHeaders ld de, SSAnne9ScriptPointers - ld a, [W_SSANNE9CURSCRIPT] + ld a, [wSSAnne9CurScript] call ExecuteCurMapScriptInTable - ld [W_SSANNE9CURSCRIPT], a + ld [wSSAnne9CurScript], a ret SSAnne9ScriptPointers: diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index d239c52f..46a1cafd 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -1,44 +1,44 @@ UnknownDungeon3Script: call EnableAutoTextBoxDrawing ld hl, UnknownDungeon3TrainerHeaders - ld de, UnknownDungeon3ScriptPointers - ld a, [W_UNKNOWNDUNGEON3CURSCRIPT] + ld de, .ScriptPointers + ld a, [wUnknownDungeon3CurScript] call ExecuteCurMapScriptInTable - ld [W_UNKNOWNDUNGEON3CURSCRIPT], a + ld [wUnknownDungeon3CurScript], a ret -UnknownDungeon3ScriptPointers: +.ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle UnknownDungeon3TextPointers: - dw UnknownDungeon3Text1 + dw MewtwoText dw PickUpItemText dw PickUpItemText dw PickUpItemText dw PickUpItemText UnknownDungeon3TrainerHeaders: -UnknownDungeon3TrainerHeader0: - dbEventFlagBit EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 +MewtwoTrainerHeader: + dbEventFlagBit EVENT_BEAT_MEWTWO db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_UNKNOWN_DUNGEON_3_TRAINER_0 - dw UnknownDungeon3MewtwoText ; TextBeforeBattle - dw UnknownDungeon3MewtwoText ; TextAfterBattle - dw UnknownDungeon3MewtwoText ; TextEndBattle - dw UnknownDungeon3MewtwoText ; TextEndBattle + dwEventFlagAddress EVENT_BEAT_MEWTWO + dw MewtwoBattleText ; TextBeforeBattle + dw MewtwoBattleText ; TextAfterBattle + dw MewtwoBattleText ; TextEndBattle + dw MewtwoBattleText ; TextEndBattle db $ff -UnknownDungeon3Text1: +MewtwoText: TX_ASM - ld hl, UnknownDungeon3TrainerHeader0 + ld hl, MewtwoTrainerHeader call TalkToTrainer jp TextScriptEnd -UnknownDungeon3MewtwoText: - TX_FAR _UnknownDungeon3MewtwoText +MewtwoBattleText: + TX_FAR _MewtwoBattleText TX_ASM ld a, MEWTWO call PlayCry diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 5121cfd9..b73797bb 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -2,7 +2,7 @@ VermilionCityScript: call EnableAutoTextBoxDrawing ld hl, wd492 res 7, [hl] - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] push hl @@ -12,7 +12,7 @@ VermilionCityScript: res 5, [hl] call nz, VermilionCityScript_197c0 ld hl, VermilionCityScriptPointers - ld a, [W_VERMILIONCITYCURSCRIPT] + ld a, [wVermilionCityCurScript] call JumpTable call VermilionCityScript_19869 ret @@ -42,7 +42,7 @@ VermilionCityScript_197cb: SetEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT ret nz ld a, $2 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScriptPointers: @@ -79,7 +79,7 @@ VermilionCityScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret .asm_198de @@ -94,7 +94,7 @@ VermilionCityScript4: call ArePlayerCoordsInArray ret c ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript2: @@ -107,7 +107,7 @@ VermilionCityScript2: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript3: @@ -118,7 +118,7 @@ VermilionCityScript3: ld [wJoyIgnore], a ld [hJoyHeld], a ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript1: @@ -128,7 +128,7 @@ VermilionCityScript1: ld c, 10 call DelayFrames ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityTextPointers: @@ -201,7 +201,7 @@ VermilionCityText3: ld hl, SSAnneFlashedTicketText call PrintText ld a, $4 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a jr .asm_198fc .asm_198f6 ld hl, SSAnneNotHereText diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm index 6933890f..41ca1e53 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -1,5 +1,5 @@ -VermilionGymScript: - ld hl, wd126 +VermilionGymScript: ; 5ca26 (17:4a26) + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] push hl @@ -11,9 +11,9 @@ VermilionGymScript: call EnableAutoTextBoxDrawing ld hl, VermilionGymTrainerHeader0 ld de, VermilionGymScriptPointers - ld a, [W_VERMILIONGYMCURSCRIPT] + ld a, [wVermilionGymCurScript] call ExecuteCurMapScriptInTable - ld [W_VERMILIONGYMCURSCRIPT], a + ld [wVermilionGymCurScript], a ret VermilionGymScript_5ca4c: @@ -44,8 +44,8 @@ VermilionGymScript_5ca6d: VermilionGymScript_5ca8a: xor a ld [wJoyIgnore], a - ld [W_VERMILIONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wVermilionGymCurScript], a + ld [wCurMapScript], a ret VermilionGymScriptPointers: @@ -160,8 +160,8 @@ VermilionGymText1: xor a ld [hJoyHeld], a ld a, $3 - ld [W_VERMILIONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wVermilionGymCurScript], a + ld [wCurMapScript], a .asm_5cb6a jp TextScriptEnd diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm index 71c3823d..0f4de43e 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -1,14 +1,14 @@ VictoryRoad1Script: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] call nz, .next call EnableAutoTextBoxDrawing ld hl, VictoryRoad1TrainerHeaders ld de, VictoryRoad1ScriptPointers - ld a, [W_VICTORYROAD1CURSCRIPT] + ld a, [wVictoryRoad1CurScript] call ExecuteCurMapScriptInTable - ld [W_VICTORYROAD1CURSCRIPT], a + ld [wVictoryRoad1CurScript], a ret .next CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH @@ -32,7 +32,7 @@ VictoryRoad1Script0: ld a, [H_SPRITEINDEX] cp $f jp z, CheckFightingMapTrainers - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH ret diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index a638018f..20a80461 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -1,18 +1,18 @@ VictoryRoad2Script: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, VictoryRoad2Script_517c4 - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] call nz, VictoryRoad2Script_517c9 call EnableAutoTextBoxDrawing ld hl, VictoryRoad2TrainerHeaders ld de, VictoryRoad2ScriptPointers - ld a, [W_VICTORYROAD2CURSCRIPT] + ld a, [wVictoryRoad2CurScript] call ExecuteCurMapScriptInTable - ld [W_VICTORYROAD2CURSCRIPT], a + ld [wVictoryRoad2CurScript], a ret VictoryRoad2Script_517c4: @@ -60,7 +60,7 @@ VictoryRoad2Script0: SetEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ret nz .asm_51810 - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] ret @@ -75,7 +75,7 @@ VictoryRoad2TextPointers: dw VictoryRoad2Text3 dw VictoryRoad2Text4 dw VictoryRoad2Text5 - dw VictoryRoad2Text6 + dw MoltresText dw PickUpItemText dw PickUpItemText dw PickUpItemText @@ -130,14 +130,14 @@ VictoryRoad2TrainerHeader5: dw VictoryRoad2EndBattleText5 ; TextEndBattle dw VictoryRoad2EndBattleText5 ; TextEndBattle -VictoryRoad2TrainerHeader6: - dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6 +MoltresTrainerHeader: + dbEventFlagBit EVENT_BEAT_MOLTRES db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_6 - dw VictoryRoad2BattleText6 ; TextBeforeBattle - dw VictoryRoad2BattleText6 ; TextAfterBattle - dw VictoryRoad2BattleText6 ; TextEndBattle - dw VictoryRoad2BattleText6 ; TextEndBattle + dwEventFlagAddress EVENT_BEAT_MOLTRES + dw MoltresBattleText ; TextBeforeBattle + dw MoltresBattleText ; TextAfterBattle + dw MoltresBattleText ; TextEndBattle + dw MoltresBattleText ; TextEndBattle db $ff @@ -171,14 +171,14 @@ VictoryRoad2Text5: call TalkToTrainer jp TextScriptEnd -VictoryRoad2Text6: +MoltresText: TX_ASM - ld hl, VictoryRoad2TrainerHeader6 + ld hl, MoltresTrainerHeader call TalkToTrainer jp TextScriptEnd -VictoryRoad2BattleText6: - TX_FAR _VictoryRoad2BattleText6 +MoltresBattleText: + TX_FAR _MoltresBattleText TX_ASM ld a, MOLTRES call PlayCry diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 33ed97de..31e06053 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -3,13 +3,13 @@ VictoryRoad3Script: call EnableAutoTextBoxDrawing ld hl, VictoryRoad3TrainerHeaders ld de, VictoryRoad3ScriptPointers - ld a, [W_VICTORYROAD3CURSCRIPT] + ld a, [wVictoryRoad3CurScript] call ExecuteCurMapScriptInTable - ld [W_VICTORYROAD3CURSCRIPT], a + ld [wVictoryRoad3CurScript], a ret VictoryRoad3Script_44996: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -39,7 +39,7 @@ VictoryRoad3Script0: ld a, [hSpriteIndexOrTextID] cp $f ; Pikachu jp z, .asm_449fe - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] SetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1 ret diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index 9ba0c714..5aa1dbbc 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -1,7 +1,7 @@ ViridianCityScript: call EnableAutoTextBoxDrawing ld hl, ViridianCityScriptPointers - ld a, [W_VIRIDIANCITYCURSCRIPT] + ld a, [wViridianCityCurScript] call JumpTable ret @@ -58,7 +58,7 @@ ViridianCityScript_1905b: ld [wJoyIgnore], a ld [hJoyHeld], a ld a, $6 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript6: @@ -67,7 +67,7 @@ ViridianCityScript6: ret nz call Delay3 ld a, $2 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript_190ab: @@ -84,7 +84,7 @@ ViridianCityScript_190ab: ld [hJoyHeld], a call ViridianCityScript_1914d ld a, $5 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript3: @@ -92,13 +92,13 @@ ViridianCityScript3: call ViridianCityScript_190db ResetEvent EVENT_02F ld a, $4 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript_190db: xor a ld [wListScrollOffset], a - ld a, OLD_MAN_BATTLE + ld a, BATTLE_TYPE_OLD_MAN ld [wBattleType], a ld a, 5 ld [wCurEnemyLVL], a @@ -131,7 +131,7 @@ ViridianCityScript4: ld [wBattleType], a ld [wJoyIgnore], a ld a, $2 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript_1912a: @@ -151,7 +151,7 @@ ViridianCityScript5: ret nz call Delay3 ld a, $0 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript_1914d: @@ -195,7 +195,7 @@ ViridianCityScript7: ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT ld [wJoyIgnore], a ld a, $8 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript8: @@ -213,7 +213,7 @@ ViridianCityScript8: dec a ld [wJoyIgnore], a ld a, $9 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript9: @@ -228,7 +228,7 @@ ViridianCityScript9: ld [hSpriteIndexOrTextID], a call MoveSprite ld a, $a - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityOldManMovementData1: @@ -252,7 +252,7 @@ ViridianCityScript10: xor a ld [wJoyIgnore], a ld a, $2 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityTextPointers: @@ -321,7 +321,7 @@ ViridianCityText_7: ld c, 2 call DelayFrames ld a, $7 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a jr .asm_192ac .asm_192a6 diff --git a/scripts/viridiancity2.asm b/scripts/viridiancity2.asm index 2b6a4001..532d57d7 100755 --- a/scripts/viridiancity2.asm +++ b/scripts/viridiancity2.asm @@ -78,7 +78,7 @@ Func_f192c: ld a, D_DOWN ld [wSimulatedJoypadStatesEnd], a ld a, $5 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityText_f1945: @@ -137,7 +137,7 @@ Func_f198e: ld hl, ViridianCityText_f19bb call PrintText ld a, $3 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a jr .asm_f19b5 .asm_f19af diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm index ce27d81c..b1b2f951 100755 --- a/scripts/viridianforest.asm +++ b/scripts/viridianforest.asm @@ -2,9 +2,9 @@ ViridianForestScript: call EnableAutoTextBoxDrawing ld hl, ViridianForestTrainerHeaders ld de, ViridianForestScriptPointers - ld a, [W_VIRIDIANFORESTCURSCRIPT] + ld a, [wViridianForestCurScript] call ExecuteCurMapScriptInTable - ld [W_VIRIDIANFORESTCURSCRIPT], a + ld [wViridianForestCurScript], a ret ViridianForestScriptPointers: diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 6cc7e2a7..1557f68a 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -5,9 +5,9 @@ ViridianGymScript: call EnableAutoTextBoxDrawing ld hl, ViridianGymTrainerHeaders ld de, ViridianGymScriptPointers - ld a, [W_VIRIDIANGYMCURSCRIPT] + ld a, [wViridianGymCurScript] call ExecuteCurMapScriptInTable - ld [W_VIRIDIANGYMCURSCRIPT], a + ld [wViridianGymCurScript], a ret Gym8CityName: @@ -18,8 +18,8 @@ Gym8LeaderName: ViridianGymScript_748d6: xor a ld [wJoyIgnore], a - ld [W_VIRIDIANGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wViridianGymCurScript], a + ld [wCurMapScript], a ret ViridianGymScriptPointers: @@ -46,7 +46,7 @@ ViridianGymScript0: ld a, $ff ld [wJoyIgnore], a ld a, $4 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -125,7 +125,7 @@ ViridianGymScript4: ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret .asm_74980 jpba LoadSpinnerArrowTiles @@ -297,7 +297,7 @@ ViridianGymText1: ld a, $8 ld [wGymLeaderNo], a ld a, $3 - ld [W_VIRIDIANGYMCURSCRIPT], a + ld [wViridianGymCurScript], a .asm_6dff7 jp TextScriptEnd diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index e03694d1..64c0eda0 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -2,7 +2,7 @@ ViridianMartScript: call ViridianMartScript_1d47d call EnableAutoTextBoxDrawing ld hl, ViridianMartScriptPointers - ld a, [W_VIRIDIANMARKETCURSCRIPT] + ld a, [wViridianMarketCurScript] call JumpTable ret @@ -37,7 +37,7 @@ ViridianMartScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_VIRIDIANMARKETCURSCRIPT], a + ld [wViridianMarketCurScript], a ret RLEMovement1d4bb: @@ -57,7 +57,7 @@ ViridianMartScript1: call GiveItem SetEvent EVENT_GOT_OAKS_PARCEL ld a, $2 - ld [W_VIRIDIANMARKETCURSCRIPT], a + ld [wViridianMarketCurScript], a ret ViridianMartScript2: |