diff options
Diffstat (limited to 'scripts')
101 files changed, 620 insertions, 620 deletions
diff --git a/scripts/agatha.asm b/scripts/agatha.asm index 1e34c99c..424a9af4 100755 --- a/scripts/agatha.asm +++ b/scripts/agatha.asm @@ -3,9 +3,9 @@ AgathaScript: ; 7642d (1d:642d) 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: ; 76443 (1d:6443) @@ -27,7 +27,7 @@ AgathaScript_76459: ; 76459 (1d:6459) AgathaScript_76464: ; 76464 (1d:6464) xor a - ld [W_AGATHACURSCRIPT], a + ld [wAgathaCurScript], a ret AgathaScriptPointers: ; 76469 (1d:6469) @@ -53,8 +53,8 @@ AgathaScript_76474: ; 76474 (1d:6474) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret AgathaScript0: ; 76490 (1d:6490) @@ -81,8 +81,8 @@ AgathaScript0: ; 76490 (1d:6490) 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: ; 764d1 (1d:64d1) @@ -99,20 +99,20 @@ AgathaScript3: ; 764da (1d:64da) call Delay3 xor a ld [wJoyIgnore], a - ld [W_AGATHACURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wAgathaCurScript], a + ld [wCurMapScript], a ret AgathaScript2: ; 764ed (1d:64ed) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, AgathaScript_76464 ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret AgathaTextPointers: ; 76505 (1d:6505) diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 08ac98d6..d594f907 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -1,6 +1,6 @@ BillsHouseScript: ; 1e76a (7:676a) call EnableAutoTextBoxDrawing - ld a, [W_BILLSHOUSECURSCRIPT] + ld a, [wBillsHouseCurScript] ld hl, BillsHouseScriptPointers jp CallFunctionInTable @@ -26,7 +26,7 @@ BillsHouseScript1: ; 1e783 (7:6783) ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret MovementData_1e79c: ; 1e79c (7:679c) @@ -55,7 +55,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6) xor a ld [wJoyIgnore], a ld a, $3 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript3: ; 1e7c5 (7:67c5) @@ -84,7 +84,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5) ld de, MovementData_1e807 call MoveSprite ld a, $4 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret MovementData_1e807: ; 1e807 (7:6807) @@ -104,7 +104,7 @@ BillsHouseScript4: ; 1e80d (7:680d) SetEvent EVENT_MET_BILL_2 ; this event seems redundant SetEvent EVENT_MET_BILL ld a, $0 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseScript5: ; 1e827 (7:6827) @@ -112,7 +112,7 @@ BillsHouseScript5: ; 1e827 (7:6827) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $0 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a ret BillsHouseTextPointers: ; 1e834 (7:6834) @@ -136,7 +136,7 @@ BillsHouseText1: ; 1e83d (7:683d) ld hl, BillsHouseText_1e86a call PrintText ld a, $1 - ld [W_BILLSHOUSECURSCRIPT], a + ld [wBillsHouseCurScript], a jr .asm_1e862 .asm_1e85a ld hl, BillsHouseText_1e86f diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 6aa2eaec..eadcd388 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -1,7 +1,7 @@ BluesHouseScript: ; 19b3b (6:5b3b) call EnableAutoTextBoxDrawing ld hl,BluesHouseScriptPointers - ld a,[W_BLUESHOUSECURSCRIPT] + ld a,[wBluesHouseCurScript] jp CallFunctionInTable BluesHouseScriptPointers: ; 19b47 (6:5b47) @@ -13,7 +13,7 @@ BluesHouseScript0: ; 19b4b (6:5b4b) ; trigger the next script ld a,1 - ld [W_BLUESHOUSECURSCRIPT],a + ld [wBluesHouseCurScript],a ret BluesHouseScript1: ; 19b56 (6:5b56) diff --git a/scripts/bruno.asm b/scripts/bruno.asm index bdfd7e24..28671db5 100755 --- a/scripts/bruno.asm +++ b/scripts/bruno.asm @@ -3,9 +3,9 @@ BrunoScript: ; 762d6 (1d:62d6) 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: ; 762ec (1d:62ec) @@ -27,7 +27,7 @@ BrunoScript_76302: ; 76302 (1d:6302) BrunoScript_7630d: ; 7630d (1d:630d) xor a - ld [W_BRUNOCURSCRIPT], a + ld [wBrunoCurScript], a ret BrunoScriptPointers: ; 76312 (1d:6312) @@ -53,8 +53,8 @@ BrunoScript_7631d: ; 7631d (1d:631d) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_BRUNOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wBrunoCurScript], a + ld [wCurMapScript], a ret BrunoScript0: ; 76339 (1d:6339) @@ -81,8 +81,8 @@ BrunoScript0: ; 76339 (1d:6339) 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: ; 7637a (1d:637a) @@ -99,13 +99,13 @@ BrunoScript3: ; 76383 (1d:6383) call Delay3 xor a ld [wJoyIgnore], a - ld [W_BRUNOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wBrunoCurScript], a + ld [wCurMapScript], a ret BrunoScript2: ; 76396 (1d:6396) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, BrunoScript_7630d ld a, $1 diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 787a2f3d..dd534dba 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -3,7 +3,7 @@ CeladonGameCornerScript: ; 48bbd (12:4bbd) call CeladonGameCornerScript_48bec call EnableAutoTextBoxDrawing ld hl, CeladonGameCornerScriptPointers - ld a, [W_CELADONGAMECORNERCURSCRIPT] + ld a, [wCeladonGameCornerCurScript] jp CallFunctionInTable CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) @@ -38,8 +38,8 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec) CeladonGameCornerScript_48c07: ; 48c07 (12:4c07) xor a ld [wJoyIgnore], a - ld [W_CELADONGAMECORNERCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGameCornerCurScript], a + ld [wCurMapScript], a ret CeladonGameCornerScriptPointers: ; 48c12 (12:4c12) @@ -51,7 +51,7 @@ CeladonGameCornerScript0: ; 48c18 (12:4c18) ret CeladonGameCornerScript1: ; 48c19 (12:4c19) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeladonGameCornerScript_48c07 ld a, $f0 @@ -63,13 +63,13 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld de, MovementData_48c5a - ld a, [W_YCOORD] + ld a, [wYCoord] cp $6 jr nz, .asm_48c43 ld de, MovementData_48c63 jr .asm_48c4d .asm_48c43 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $8 jr nz, .asm_48c4d ld de, MovementData_48c63 @@ -78,7 +78,7 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a ret MovementData_48c5a: ; 48c5a (12:4c5a) @@ -113,7 +113,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69) set 5, [hl] set 6, [hl] ld a, $0 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a ret CeladonGameCornerTextPointers: ; 48c8a (12:4c8a) @@ -424,7 +424,7 @@ CeladonGameCornerText11: ; 48e9d (12:4e9d) ld [hJoyPressed], a ld [hJoyReleased], a ld a, $1 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a jp TextScriptEnd CeladonGameCornerText_48ece: ; 48ece (12:4ece) diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm index 64e85ff7..d774ea95 100755 --- a/scripts/celadongym.asm +++ b/scripts/celadongym.asm @@ -6,9 +6,9 @@ CeladonGymScript: ; 4890a (12:490a) 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: ; 48927 (12:4927) @@ -25,8 +25,8 @@ Gym4LeaderName: ; 4893d (12:493d) CeladonGymText_48943: ; 48943 (12:4943) xor a ld [wJoyIgnore], a - ld [W_CELADONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGymCurScript], a + ld [wCurMapScript], a ret CeladonGymScriptPointers: ; 4894e (12:494e) @@ -36,7 +36,7 @@ CeladonGymScriptPointers: ; 4894e (12:494e) dw CeladonGymScript3 CeladonGymScript3: ; 48956 (12:4956) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeladonGymText_48943 ld a, $f0 @@ -60,7 +60,7 @@ CeladonGymText_48963: ; 48963 (12:4963) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_4898c - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 3, [hl] ld hl, wBeatGymFlags set 3, [hl] @@ -176,10 +176,10 @@ CeladonGymText1: ; 48a11 (12:4a11) call EngageMapTrainer call InitBattleEnemyParameters ld a, $4 - ld [W_GYMLEADERNO], a + 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/ceruleancity.asm b/scripts/ceruleancity.asm index e0444a1c..1e8349bc 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -1,13 +1,13 @@ CeruleanCityScript: ; 19480 (6:5480) call EnableAutoTextBoxDrawing ld hl, CeruleanCityScriptPointers - ld a, [W_CERULEANCITYCURSCRIPT] + ld a, [wCeruleanCityCurScript] jp CallFunctionInTable CeruleanCityScript_1948c: ; 1948c (6:548c) xor a ld [wJoyIgnore], a - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ld a, HS_CERULEAN_RIVAL ld [wMissableObjectIndex], a predef_jump HideObject @@ -20,7 +20,7 @@ CeruleanCityScriptPointers: ; 1949d (6:549d) dw CeruleanCityScript4 CeruleanCityScript4: ; 194a7 (6:54a7) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c ld a, $f0 @@ -31,7 +31,7 @@ CeruleanCityScript4: ; 194a7 (6:54a7) call DisplayTextID xor a ld [wJoyIgnore], a - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityScript0: ; 194c8 (6:54c8) @@ -75,7 +75,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [hJoyHeld], a ld a, $f0 ld [wJoyIgnore], a - ld a, [W_XCOORD] + ld a, [wXCoord] cp $14 jr z, .asm_19535 ld a, $1 @@ -93,7 +93,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [H_SPRITEINDEX], a call MoveSprite ld a, $1 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityCoords1: ; 1954f (6:554f) @@ -135,10 +135,10 @@ CeruleanCityScript1: ; 19567 (6:5567) ld de, CeruleanCityText_19672 call SaveEndBattleTextPointers ld a, OPP_SONY1 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $7 @@ -151,17 +151,17 @@ CeruleanCityScript1: ; 19567 (6:5567) .Charmander ld a, $9 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a xor a ld [hJoyHeld], a call CeruleanCityScript_1955d ld a, $2 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityScript2: ; 195b1 (6:55b1) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeruleanCityScript_1948c call CeruleanCityScript_1955d @@ -178,7 +178,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld a, $1 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld a, [W_XCOORD] + ld a, [wXCoord] cp $14 jr nz, .asm_195f0 ld de, CeruleanCityMovement4 @@ -190,7 +190,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld [H_SPRITEINDEX], a call MoveSprite ld a, $3 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityMovement3: ; 19600 (6:5600) @@ -224,7 +224,7 @@ CeruleanCityScript3: ; 19610 (6:5610) ld [wJoyIgnore], a call PlayDefaultMusic ld a, $0 - ld [W_CERULEANCITYCURSCRIPT], a + ld [wCeruleanCityCurScript], a ret CeruleanCityTextPointers: ; 1962d (6:562d) @@ -294,7 +294,7 @@ CeruleanCityText2: ; 1967c (6:567c) 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 ca1c2c7d..6bdbc298 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -6,9 +6,9 @@ CeruleanGymScript: ; 5c6b3 (17:46b3) 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: ; 5c6d0 (17:46d0) @@ -25,8 +25,8 @@ Gym2LeaderName: ; 5c6e7 (17:46e7) CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed) xor a ld [wJoyIgnore], a - ld [W_CERULEANGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeruleanGymCurScript], a + ld [wCurMapScript], a ret CeruleanGymScriptPointers: ; 5c6f8 (17:46f8) @@ -36,7 +36,7 @@ CeruleanGymScriptPointers: ; 5c6f8 (17:46f8) dw CeruleanGymScript3 CeruleanGymScript3: ; 5c700 (17:4700) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CeruleanGymScript_5c6ed ld a, $f0 @@ -60,7 +60,7 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c736 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 1, [hl] ld hl, wBeatGymFlags set 1, [hl] @@ -127,11 +127,11 @@ CeruleanGymText1: ; 5c771 (17:4771) call EngageMapTrainer call InitBattleEnemyParameters ld a, $2 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a 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 5bbb94a9..6b347652 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -2,7 +2,7 @@ CinnabarGymScript: ; 7574a (1d:574a) call CinnabarGymScript_75759 call EnableAutoTextBoxDrawing ld hl, CinnabarGymScriptPointers - ld a, [W_CINNABARGYMCURSCRIPT] + ld a, [wCinnabarGymCurScript] jp CallFunctionInTable CinnabarGymScript_75759: ; 75759 (1d:5759) @@ -30,8 +30,8 @@ Gym7LeaderName: ; 7578b (1d:578b) CinnabarGymScript_75792: ; 75792 (1d:5792) xor a ld [wJoyIgnore], a - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a ld [wOpponentAfterWrongAnswer], a ret @@ -64,8 +64,8 @@ CinnabarGymScript0: ; 757ae (1d:57ae) .asm_757cb call MoveSprite ld a, $1 - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a ret MovementData_757d7: ; 757d7 (1d:57d7) @@ -92,7 +92,7 @@ CinnabarGymFlagAction: ; 757f1 (1d:57f1) predef_jump FlagActionPredef CinnabarGymScript2: ; 757f6 (1d:57f6) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CinnabarGymScript_75792 ld a, [wTrainerHeaderFlagBit] @@ -129,12 +129,12 @@ CinnabarGymScript2: ; 757f6 (1d:57f6) ld [wJoyIgnore], a ld [wOpponentAfterWrongAnswer], a ld a, $0 - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a ret CinnabarGymScript3: ; 7584a (1d:584a) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, CinnabarGymScript_75792 ld a, $f0 @@ -157,7 +157,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_75880 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 6, [hl] ld hl, wBeatGymFlags set 6, [hl] @@ -200,8 +200,8 @@ CinnabarGymScript_758b7: ; 758b7 (1d:58b7) .asm_758d4 ld a, $3 .asm_758d6 - ld [W_CINNABARGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCinnabarGymCurScript], a + ld [wCurMapScript], a jp TextScriptEnd CinnabarGymText1: ; 758df (1d:58df) @@ -224,7 +224,7 @@ CinnabarGymText1: ; 758df (1d:58df) ld de, BlaineEndBattleText call SaveEndBattleTextPointers ld a, $7 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a jp CinnabarGymScript_758b7 BlaineBattleText: ; 75914 (1d:5914) diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index c06c784c..7f8616b1 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -5,7 +5,7 @@ CinnabarIslandScript: ; 1ca19 (7:4a19) ResetEvent EVENT_MANSION_SWITCH_ON ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL ld hl, CinnabarIslandScriptPointers - ld a, [W_CINNABARISLANDCURSCRIPT] + ld a, [wCinnabarIslandCurScript] jp CallFunctionInTable CinnabarIslandScriptPointers: ; 1ca34 (7:4a34) @@ -16,10 +16,10 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld b, SECRET_KEY call IsItemInBag ret nz - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $12 ret nz ld a, PLAYER_DIR_UP @@ -38,7 +38,7 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38) ld [wSpriteStateData1 + 9], a ld [wJoyIgnore], a ld a, $1 - ld [W_CINNABARISLANDCURSCRIPT], a + ld [wCinnabarIslandCurScript], a ret CinnabarIslandScript1: ; 1ca73 (7:4a73) @@ -47,7 +47,7 @@ CinnabarIslandScript1: ; 1ca73 (7:4a73) ret nz call Delay3 ld a, $0 - ld [W_CINNABARISLANDCURSCRIPT], a + ld [wCinnabarIslandCurScript], a ret CinnabarIslandTextPointers: ; 1ca81 (7:4a81) diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 3eabb0bc..4a46e648 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -7,7 +7,7 @@ DayCareMTextPointers: ; 56252 (15:6252) DayCareMText1: ; 56254 (15:6254) TX_ASM call SaveScreenTilesToBuffer2 - ld a, [W_DAYCARE_IN_USE] + ld a, [wDayCareInUse] and a jp nz, .daycareInUse ld hl, DayCareIntroText @@ -46,7 +46,7 @@ DayCareMText1: ; 56254 (15:6254) ld hl, DayCareWillLookAfterMonText call PrintText ld a, 1 - ld [W_DAYCARE_IN_USE], a + ld [wDayCareInUse], a ld a, PARTY_TO_DAYCARE ld [wMoveMonType], a call MoveMon @@ -60,7 +60,7 @@ DayCareMText1: ; 56254 (15:6254) .daycareInUse xor a - ld hl, W_DAYCAREMONNAME + ld hl, wDayCareMonName call GetPartyMonName ld a, DAYCARE_DATA ld [wMonDataLocation], a @@ -150,7 +150,7 @@ DayCareMText1: ; 56254 (15:6254) .enoughMoney xor a - ld [W_DAYCARE_IN_USE], a + ld [wDayCareInUse], a ld hl, wDayCareNumLevelsGrown ld [hli], a inc hl diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm index fa05d486..fb3ea5b4 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/fightingdojo.asm @@ -2,16 +2,16 @@ FightingDojoScript: ; 5cd5d (17:4d5d) 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: ; 5cd70 (17:4d70) xor a ld [wJoyIgnore], a - ld [W_FIGHTINGDOJOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a ret FightingDojoScriptPointers: ; 5cd7b (17:4d7b) @@ -32,10 +32,10 @@ FightingDojoScript1: ; 5cd83 (17:4d83) xor a ld [hJoyHeld], a ld [wcf0d], a - ld a, [W_YCOORD] + ld a, [wYCoord] cp $3 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $4 ret nz ld a, $1 @@ -53,7 +53,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83) ret FightingDojoScript3: ; 5cdc6 (17:4dc6) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, FightingDojoScript_5cd70 ld a, [wcf0d] @@ -76,8 +76,8 @@ FightingDojoScript3: ; 5cdc6 (17:4dc6) call DisplayTextID xor a ld [wJoyIgnore], a - ld [W_FIGHTINGDOJOCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFightingDojoCurScript], a + ld [wCurMapScript], a ret FightingDojoTextPointers: ; 5ce03 (17:4e03) @@ -148,8 +148,8 @@ FightingDojoText1: ; 5ce44 (17:4e44) 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 3ec89256..2788a70a 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/fuchsiagym.asm @@ -3,9 +3,9 @@ FuchsiaGymScript: ; 7543d (1d:543d) 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: ; 75453 (1d:5453) @@ -26,8 +26,8 @@ Gym5LeaderName: ; 75472 (1d:5472) FuchsiaGymScript_75477: ; 75477 (1d:5477) xor a ld [wJoyIgnore], a - ld [W_FUCHSIAGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wFuchsiaGymCurScript], a + ld [wCurMapScript], a ret FuchsiaGymScriptPointers: ; 75482 (1d:5482) @@ -37,7 +37,7 @@ FuchsiaGymScriptPointers: ; 75482 (1d:5482) dw FuchsiaGymScript3 FuchsiaGymScript3: ; 7548a (1d:548a) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, FuchsiaGymScript_75477 ld a, $f0 @@ -60,7 +60,7 @@ FuchsiaGymScript3_75497: ; 75497 (1d:5497) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_754c0 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 4, [hl] ld hl, wBeatGymFlags set 4, [hl] @@ -167,11 +167,11 @@ FuchsiaGymText1: ; 75534 (1d:5534) call EngageMapTrainer call InitBattleEnemyParameters ld a, $5 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a 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 3215a04f..8db7544f 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -1,13 +1,13 @@ GaryScript: ; 75f1d (1d:5f1d) call EnableAutoTextBoxDrawing ld hl, GaryScriptPointers - ld a, [W_GARYCURSCRIPT] + ld a, [wGaryCurScript] jp CallFunctionInTable GaryScript_75f29: ; 75f29 (1d:5f29) xor a ld [wJoyIgnore], a - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScriptPointers: ; 75f31 (1d:5f31) @@ -36,7 +36,7 @@ GaryScript1: ; 75f48 (1d:5f48) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $2 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret RLEMovement75f63: ; 75f63 (1d:5f63) @@ -52,7 +52,7 @@ GaryScript2: ; 75f6a (1d:5f6a) call Delay3 xor a ld [wJoyIgnore], a - ld hl, W_OPTIONS + ld hl, wOptions res 7, [hl] ld a, $1 ld [hSpriteIndexOrTextID], a @@ -65,10 +65,10 @@ GaryScript2: ; 75f6a (1d:5f6a) ld de, GaryText_760fe call SaveEndBattleTextPointers ld a, OPP_SONY3 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $1 @@ -81,16 +81,16 @@ GaryScript2: ; 75f6a (1d:5f6a) .Charmander ld a, $3 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a xor a ld [hJoyHeld], a ld a, $3 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript3: ; 75fbb (1d:5fbb) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, GaryScript_75f29 call UpdateSprites @@ -104,7 +104,7 @@ GaryScript3: ; 75fbb (1d:5fbb) ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, $4 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript4: ; 75fe4 (1d:5fe4) @@ -123,7 +123,7 @@ GaryScript4: ; 75fe4 (1d:5fe4) ld [wMissableObjectIndex], a predef ShowObject ld a, $5 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret MovementData_76014: ; 76014 (1d:6014) @@ -154,7 +154,7 @@ GaryScript5: ; 7601a (1d:601a) ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript6: ; 76047 (1d:6047) @@ -167,7 +167,7 @@ GaryScript6: ; 76047 (1d:6047) ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript7: ; 7605f (1d:605f) @@ -184,7 +184,7 @@ GaryScript7: ; 7605f (1d:605f) ld [H_SPRITEINDEX], a call MoveSprite ld a, $8 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret MovementData_76080: ; 76080 (1d:6080) @@ -200,7 +200,7 @@ GaryScript8: ; 76083 (1d:6083) ld [wMissableObjectIndex], a predef HideObject ld a, $9 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript9: ; 76099 (1d:6099) @@ -213,7 +213,7 @@ GaryScript9: ; 76099 (1d:6099) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $a - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret RLEMovement760b4: ; 760b4 (1d:60b4) @@ -228,7 +228,7 @@ GaryScript10: ; 760b9 (1d:60b9) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_GARYCURSCRIPT], a + ld [wGaryCurScript], a ret GaryScript_760c8: ; 760c8 (1d:60c8) @@ -278,7 +278,7 @@ GaryText2: ; 76108 (1d:6108) GaryText3: ; 7610d (1d:610d) 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 de3cd779..89b1123e 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -1,13 +1,13 @@ HallofFameRoomScript: ; 5a49e (16:649e) call EnableAutoTextBoxDrawing ld hl, HallofFameRoomScriptPointers - ld a, [W_HALLOFFAMEROOMCURSCRIPT] + ld a, [wHallOfFameRoomCurScript] jp CallFunctionInTable HallofFameRoomScript_5a4aa: ; 5a4aa (16:64aa) xor a ld [wJoyIgnore], a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret HallofFameRoomScriptPointers: ; 5a4b2 (16:64b2) @@ -28,21 +28,21 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) predef HallOfFamePC pop af ld [wLetterPrintingDelayFlags], a - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 res 1, [hl] 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 @@ -65,7 +65,7 @@ HallofFameRoomScript0: ; 5a50d (16:650d) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret RLEMovement5a528: ; 5a528 (16:6528) @@ -98,7 +98,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b) ld [wMissableObjectIndex], a predef HideObject ld a, $2 - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret HallofFameRoomTextPointers: ; 5a56a (16:656a) diff --git a/scripts/lab4.asm b/scripts/lab4.asm index dab07824..7eb6bae8 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -74,7 +74,7 @@ Lab4Text1: ; 75d6c (1d:5d6c) 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 e2c43614..97323c88 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -3,9 +3,9 @@ LanceScript: ; 5a2ae (16:62ae) 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: ; 5a2c4 (16:62c4) @@ -37,7 +37,7 @@ LanceScript_5a2f0: ; 5a2f0 (16:62f0) LanceScript_5a2f5: ; 5a2f5 (16:62f5) xor a - ld [W_LANCECURSCRIPT], a + ld [wLanceCurScript], a ret LanceScriptPointers: ; 5a2fa (16:62fa) @@ -85,7 +85,7 @@ CoordsData_5a33e: ; 5a33e (16:633e) LanceScript2: ; 5a349 (16:6349) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, LanceScript_5a2f5 ld a, $1 @@ -102,8 +102,8 @@ LanceScript_5a35b: ; 5a35b (16:635b) 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: ; 5a379 (16:6379) @@ -120,8 +120,8 @@ LanceScript3: ; 5a382 (16:6382) call Delay3 xor a ld [wJoyIgnore], a - ld [W_LANCECURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLanceCurScript], a + ld [wCurMapScript], a ret LanceTextPointers: ; 5a395 (16:6395) diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm index 43eee966..6d67d489 100755 --- a/scripts/lorelei.asm +++ b/scripts/lorelei.asm @@ -3,9 +3,9 @@ LoreleiScript: ; 7617b (1d:617b) 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: ; 76191 (1d:6191) @@ -28,7 +28,7 @@ LoreleiScript_76191: ; 76191 (1d:6191) LoreleiScript_761b6: ; 761b6 (1d:61b6) xor a - ld [W_LORELEICURSCRIPT], a + ld [wLoreleiCurScript], a ret LoreleiScriptPointers: ; 761bb (1d:61bb) @@ -54,8 +54,8 @@ LoreleiScript_761c6: ; 761c6 (1d:61c6) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_LORELEICURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLoreleiCurScript], a + ld [wCurMapScript], a ret LoreleiScript0: ; 761e2 (1d:61e2) @@ -82,8 +82,8 @@ LoreleiScript0: ; 761e2 (1d:61e2) 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: ; 76223 (1d:6223) @@ -100,12 +100,12 @@ LoreleiScript3: ; 7622c (1d:622c) call Delay3 xor a ld [wJoyIgnore], a - ld [W_LORELEICURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wLoreleiCurScript], a + ld [wCurMapScript], a ret LoreleiScript2: ; 7623f (1d:623f) call EndTrainerBattle - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, LoreleiScript_761b6 ld a, $1 diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm index bbfb0a0b..2b14176d 100755 --- a/scripts/mansion1.asm +++ b/scripts/mansion1.asm @@ -3,9 +3,9 @@ Mansion1Script: ; 442af (11:42af) 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: ; 442c5 (11:42c5) diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm index 22bc2b12..5e94fdfc 100755 --- a/scripts/mansion2.asm +++ b/scripts/mansion2.asm @@ -3,9 +3,9 @@ Mansion2Script: ; 51fd8 (14:5fd8) 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: ; 51fee (14:5fee) diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index e49667ef..e3b9993d 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -3,9 +3,9 @@ Mansion3Script: ; 521ee (14:61ee) 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: ; 52204 (14:6204) diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm index 59ee3704..5d1498bd 100755 --- a/scripts/mansion4.asm +++ b/scripts/mansion4.asm @@ -3,9 +3,9 @@ Mansion4Script: ; 523b9 (14:63b9) 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: ; 523cf (14:63cf) diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm index 4a5eeae3..98ed2784 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/mtmoon1.asm @@ -2,9 +2,9 @@ MtMoon1Script: ; 499c8 (12:59c8) 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: ; 499db (12:59db) diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 84c00981..af2ec1e5 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -2,9 +2,9 @@ MtMoon3Script: ; 49d0b (12:5d0b) call EnableAutoTextBoxDrawing ld hl, MtMoon3TrainerHeader0 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 @@ -40,8 +40,8 @@ CoordsData_49d37: ; 49d37 (12:5d37) MtMoon3Script_49d58: ; 49d58 (12:5d58) xor a ld [wJoyIgnore], a - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a ret MtMoon3ScriptPointers: ; 49d63 (12:5d63) @@ -55,10 +55,10 @@ MtMoon3ScriptPointers: ; 49d63 (12:5d63) MtMoon3Script0: ; 49d6f (12:5d6f) CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD jp nz, MtMoon3Script_49d91 - ld a, [W_YCOORD] + ld a, [wYCoord] cp $8 jp nz, MtMoon3Script_49d91 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $d jp nz, MtMoon3Script_49d91 xor a @@ -73,7 +73,7 @@ MtMoon3Script_49d91: ; 49d91 (12:5d91) ret MtMoon3Script3: ; 49d9a (12:5d9a) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, MtMoon3Script_49d58 call UpdateSprites @@ -82,8 +82,8 @@ MtMoon3Script3: ; 49d9a (12:5d9a) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a ret MtMoon3Script4: ; 49dba (12:5dba) @@ -105,8 +105,8 @@ MtMoon3Script4: ; 49dba (12:5dba) ld [H_SPRITEINDEX], a call MoveSprite ld a, $5 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a ret CoordsData_49dea: ; 49dea (12:5dea) @@ -150,8 +150,8 @@ MtMoon3Script5: ; 49dfb (12:5dfb) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a ret MtMoon3TextPointers: ; 49e34 (12:5e34) @@ -228,8 +228,8 @@ MtMoon3Text1: ; 49e79 (12:5e79) call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a jr .asm_49ebe .asm_49eb8 ld hl, MtMoon3Text_49f94 @@ -280,8 +280,8 @@ MtMoon3Text6: ; 49ee9 (12:5ee9) predef HideObject SetEvent EVENT_GOT_DOME_FOSSIL ld a, $4 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a .asm_49f21 jp TextScriptEnd @@ -308,8 +308,8 @@ MtMoon3Text7: ; 49f29 (12:5f29) predef HideObject SetEvent EVENT_GOT_HELIX_FOSSIL ld a, $4 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wMtMoon3CurScript], a + ld [wCurMapScript], a .asm_49f61 jp TextScriptEnd diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index ac552c6d..780c3905 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -4,7 +4,7 @@ Museum1FScript: ; 5c0f7 (17:40f7) xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, Museum1FScriptPointers - ld a, [W_MUSEUM1FCURSCRIPT] + ld a, [wMuseum1fCurScript] jp CallFunctionInTable Museum1FScriptPointers: ; 5c109 (17:4109) @@ -12,13 +12,13 @@ Museum1FScriptPointers: ; 5c109 (17:4109) dw Museum1FScript1 Museum1FScript0: ; 5c10d (17:410d) - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $9 jr z, .asm_5c120 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $a ret nz .asm_5c120 @@ -40,17 +40,17 @@ Museum1FTextPointers: ; 5c12b (17:412b) Museum1FText1: ; 5c135 (17:4135) TX_ASM - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 jr nz, .asm_8774b - ld a, [W_XCOORD] + ld a, [wXCoord] cp $d jp z, Museum1FScript_5c1f9 jr .asm_b8709 .asm_8774b cp $3 jr nz, .asm_d49e7 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $c jp z, Museum1FScript_5c1f9 .asm_d49e7 @@ -120,7 +120,7 @@ Museum1FText1: ; 5c135 (17:4135) jr Museum1FScriptEnd .asm_0b094 ld a, $1 - ld [W_MUSEUM1FCURSCRIPT], a + ld [wMuseum1fCurScript], a jr Museum1FScriptEnd Museum1FScript_5c1f9: ; 5c1f9 (17:41f9) diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index c5ca2e6e..e308b7b5 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -6,7 +6,7 @@ OaksLabScript: ; 1cb0e (7:4b0e) xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, OaksLabScriptPointers - ld a, [W_OAKSLABCURSCRIPT] + ld a, [wOaksLabCurScript] jp CallFunctionInTable OaksLabScriptPointers: ; 1cb28 (7:4b28) @@ -43,7 +43,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e) res 4, [hl] ld a, $1 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript1: ; 1cb6e (7:4b6e) @@ -53,7 +53,7 @@ OaksLabScript1: ; 1cb6e (7:4b6e) call MoveSprite ld a, $2 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OakEntryMovement: ; 1cb7e (7:4b7e) @@ -74,7 +74,7 @@ OaksLabScript2: ; 1cb82 (7:4b82) predef ShowObject ld a, $3 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript3: ; 1cba2 (7:4ba2) @@ -97,7 +97,7 @@ OaksLabScript3: ; 1cba2 (7:4ba2) call SetSpriteFacingDirectionAndDelay ld a, $4 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret PlayerEntryMovementRLE: ; 1cbcf (7:4bcf) @@ -116,12 +116,12 @@ OaksLabScript4: ; 1cbd2 (7:4bd2) ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay call UpdateSprites - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 res 1, [hl] call PlayDefaultMusic ld a, $5 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript5: ; 1cbfd (7:4bfd) @@ -147,11 +147,11 @@ OaksLabScript5: ; 1cbfd (7:4bfd) ld [wJoyIgnore], a ld a, $6 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript6: ; 1cc36 (7:4c36) - ld a, [W_YCOORD] + ld a, [wYCoord] cp $6 ret nz ld a, $5 @@ -177,7 +177,7 @@ OaksLabScript6: ; 1cc36 (7:4c36) ld [wPlayerMovingDirection], a ld a, $7 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript7: ; 1cc72 (7:4c72) @@ -187,11 +187,11 @@ OaksLabScript7: ; 1cc72 (7:4c72) call Delay3 ld a, $6 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript8: ; 1cc80 (7:4c80) - ld a, [W_PLAYERSTARTER] + ld a, [wPlayerStarter] cp STARTER1 jr z, .Charmander cp STARTER2 @@ -199,7 +199,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) jr .Bulbasaur .Charmander ld de, .MiddleBallMovement1 - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ; is the player standing below the table? jr z, .asm_1ccf3 ld de, .MiddleBallMovement2 @@ -223,7 +223,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) .Squirtle ld de, .RightBallMovement1 - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ; is the player standing below the table? jr z, .asm_1ccf3 ld de, .RightBallMovement2 @@ -249,7 +249,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) .Bulbasaur ld de, .LeftBallMovement1 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $9 ; is the player standing to the right of the table? jr nz, .asm_1ccf3 push hl @@ -285,7 +285,7 @@ OaksLabScript8: ; 1cc80 (7:4c80) call MoveSprite ld a, $9 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript9: ; 1cd00 (7:4d00) @@ -319,7 +319,7 @@ OaksLabScript9: ; 1cd00 (7:4d00) predef HideObject call Delay3 ld a, [wRivalStarterTemp] - ld [W_RIVALSTARTER], a + ld [wRivalStarter], a ld [wcf91], a ld [wd11e], a call GetMonName @@ -336,11 +336,11 @@ OaksLabScript9: ; 1cd00 (7:4d00) ld [wJoyIgnore], a ld a, $a - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript10: ; 1cd6d (7:4d6d) - ld a, [W_YCOORD] + ld a, [wYCoord] cp $6 ret nz ld a, $1 @@ -372,7 +372,7 @@ OaksLabScript10: ; 1cd6d (7:4d6d) call MoveSprite ld a, $b - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript11: ; 1cdb9 (7:4db9) @@ -382,8 +382,8 @@ OaksLabScript11: ; 1cdb9 (7:4db9) ; define which team rival uses, and fight it ld a, OPP_SONY1 - ld [W_CUROPPONENT], a - ld a, [W_RIVALSTARTER] + ld [wCurOpponent], a + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $1 @@ -396,7 +396,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9) .Charmander ld a, $3 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a ld a, $1 ld [wSpriteIndex], a call GetSpritePosition1 @@ -411,7 +411,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9) ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a ld a, $c - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript12: ; 1ce03 (7:4e03) @@ -432,7 +432,7 @@ OaksLabScript12: ; 1ce03 (7:4e03) SetEvent EVENT_BATTLED_RIVAL_IN_OAKS_LAB ld a, $d - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript13: ; 1ce32 (7:4e32) @@ -446,7 +446,7 @@ OaksLabScript13: ; 1ce32 (7:4e32) ld [H_SPRITEINDEX], a ld de, .RivalExitMovement call MoveSprite - ld a, [W_XCOORD] + ld a, [wXCoord] cp $4 ; move left or right depending on where the player is standing jr nz, .moveLeft @@ -458,7 +458,7 @@ OaksLabScript13: ; 1ce32 (7:4e32) ld [wNPCMovementDirections], a ld a, $e - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret .RivalExitMovement @@ -481,14 +481,14 @@ OaksLabScript14: ; 1ce6d (7:4e6d) ld [wJoyIgnore], a call PlayDefaultMusic ; reset to map music ld a, $12 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a jr .done ; make the player keep facing the rival as he walks away .asm_1ce8c ld a, [wNPCNumScriptedSteps] cp $5 jr nz, .asm_1cea8 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $4 jr nz, .asm_1cea1 ld a, SPRITE_FACING_RIGHT @@ -535,7 +535,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) call MoveSprite ld a, $10 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript_1cefd: ; 1cefd (7:4efd) @@ -621,7 +621,7 @@ OaksLabScript16: ; 1cf12 (7:4f12) call MoveSprite ld a, $11 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript17: ; 1cfd4 (7:4fd4) @@ -639,12 +639,12 @@ OaksLabScript17: ; 1cfd4 (7:4fd4) ld [wMissableObjectIndex], a predef ShowObject ld a, $5 - ld [W_PALLETTOWNCURSCRIPT], a + ld [wPalletTownCurScript], a xor a ld [wJoyIgnore], a ld a, $12 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a ret OaksLabScript18: ; 1d009 (7:5009) @@ -675,7 +675,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b) ld [$ffeb], a ld a, $8 ld [$ffee], a - ld a, [W_YCOORD] + ld a, [wYCoord] cp $3 jr nz, .asm_1d045 ld a, $4 @@ -695,7 +695,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b) ld a, $3 ld [wNPCMovementDirections2Index], a ld b, $a - ld a, [W_XCOORD] + ld a, [wXCoord] cp $4 jr nz, .asm_1d066 ld a, $40 @@ -714,9 +714,9 @@ OaksLabScript_1d02b: ; 1d02b (7:502b) OaksLabScript_1d076: ; 1d076 (7:5076) ld hl, OaksLabTextPointers + $36 ; starts at OaksLabText28 ld a, l - ld [W_MAPTEXTPTR], a + ld [wMapTextPtr], a ld a, h - ld [W_MAPTEXTPTR+1], a + ld [wMapTextPtr+1], a ret OaksLabTextPointers: ; 1d082 (7:5082) @@ -898,7 +898,7 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3) and a jr nz, OaksLabMonChoiceEnd ld a, [wcf91] - ld [W_PLAYERSTARTER], a + ld [wPlayerStarter], a ld [wd11e], a call GetMonName ld a, [wSpriteIndex] @@ -925,7 +925,7 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3) xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation], a ld a, 5 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, [wcf91] ld [wd11e], a call AddPartyMon @@ -934,7 +934,7 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3) ld a, $fc ld [wJoyIgnore], a ld a, $8 - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a OaksLabMonChoiceEnd: ; 1d21f (7:521f) jp TextScriptEnd @@ -1013,7 +1013,7 @@ OaksLabText5: ; 1d248 (7:5248) call PrintText call OaksLabScript_RemoveParcel ld a, $f - ld [W_OAKSLABCURSCRIPT], a + ld [wOaksLabCurScript], a jr .asm_1d2ed .asm_1d2c8 ld hl, OaksLabAroundWorldText diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index e4c3f135..60238845 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -5,7 +5,7 @@ PalletTownScript: ; 18e5b (6:4e5b) .next call EnableAutoTextBoxDrawing ld hl,PalletTownScriptPointers - ld a,[W_PALLETTOWNCURSCRIPT] + ld a,[wPalletTownCurScript] jp CallFunctionInTable PalletTownScriptPointers: ; 18e73 (6:4e73) @@ -20,7 +20,7 @@ PalletTownScriptPointers: ; 18e73 (6:4e73) PalletTownScript0: ; 18e81 (6:4e81) CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB ret nz - ld a,[W_YCOORD] + ld a,[wYCoord] cp 1 ; is player near north exit? ret nz xor a @@ -39,7 +39,7 @@ PalletTownScript0: ; 18e81 (6:4e81) ; trigger the next script ld a,1 - ld [W_PALLETTOWNCURSCRIPT],a + ld [wPalletTownCurScript],a ret PalletTownScript1: ; 18eb2 (6:4eb2) @@ -56,7 +56,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2) ; trigger the next script ld a,2 - ld [W_PALLETTOWNCURSCRIPT],a + ld [wPalletTownCurScript],a ret PalletTownScript2: ; 18ed2 (6:4ed2) @@ -67,7 +67,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) call SetSpriteFacingDirectionAndDelay call Delay3 ld a,1 - ld [W_YCOORD],a + ld [wYCoord],a ld a,1 ld [hNPCPlayerRelativePosPerspective],a ld a,1 @@ -86,7 +86,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2) ; trigger the next script ld a,3 - ld [W_PALLETTOWNCURSCRIPT],a + ld [wPalletTownCurScript],a ret PalletTownScript3: ; 18f12 (6:4f12) @@ -116,7 +116,7 @@ PalletTownScript3: ; 18f12 (6:4f12) ; trigger the next script ld a,4 - ld [W_PALLETTOWNCURSCRIPT],a + ld [wPalletTownCurScript],a ret PalletTownScript4: ; 18f4b (6:4f4b) @@ -126,7 +126,7 @@ PalletTownScript4: ; 18f4b (6:4f4b) ; trigger the next script ld a,5 - ld [W_PALLETTOWNCURSCRIPT],a + ld [wPalletTownCurScript],a ret PalletTownScript5: ; 18f56 (6:4f56) diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 66589d52..28fa1cc3 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -1,7 +1,7 @@ PewterCityScript: ; 19237 (6:5237) call EnableAutoTextBoxDrawing ld hl, PewterCityScriptPointers - ld a, [W_PEWTERCITYCURSCRIPT] + ld a, [wPewterCityCurScript] jp CallFunctionInTable PewterCityScriptPointers: ; 19243 (6:5243) @@ -15,7 +15,7 @@ PewterCityScriptPointers: ; 19243 (6:5243) PewterCityScript0: ; 19251 (6:5251) xor a - ld [W_MUSEUM1FCURSCRIPT], a + ld [wMuseum1fCurScript], a ResetEvent EVENT_BOUGHT_MUSEUM_TICKET call PewterCityScript_1925e ret @@ -73,7 +73,7 @@ PewterCityScript1: ; 19280 (6:5280) ld de, MovementData_PewterMuseumGuyExit call MoveSprite ld a, $2 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret MovementData_PewterMuseumGuyExit: ; 192ce (6:52ce) @@ -91,7 +91,7 @@ PewterCityScript2: ; 192d3 (6:52d3) ld [wMissableObjectIndex], a predef HideObject ld a, $3 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript3: ; 192e9 (6:52e9) @@ -104,7 +104,7 @@ PewterCityScript3: ; 192e9 (6:52e9) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript4: ; 19305 (6:5305) @@ -141,7 +141,7 @@ PewterCityScript4: ; 19305 (6:5305) ld de, MovementData_PewterGymGuyExit call MoveSprite ld a, $5 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret MovementData_PewterGymGuyExit: ; 19353 (6:5353) @@ -160,7 +160,7 @@ PewterCityScript5: ; 19359 (6:5359) ld [wMissableObjectIndex], a predef HideObject ld a, $6 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript6: ; 1936f (6:536f) @@ -173,7 +173,7 @@ PewterCityScript6: ; 1936f (6:536f) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityTextPointers: ; 1938b (6:538b) @@ -226,7 +226,7 @@ PewterCityText3: ; 193b1 (6:53b1) ld [wSpriteIndex], a call GetSpritePosition2 ld a, $1 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a .asm_193ee jp TextScriptEnd @@ -290,7 +290,7 @@ PewterCityText5: ; 19436 (6:5436) ld [wSpriteIndex], a call GetSpritePosition2 ld a, $4 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a jp TextScriptEnd PewterCityText_1945d: ; 1945d (6:545d) diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 831403bb..58a74cd2 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -6,9 +6,9 @@ PewterGymScript: ; 5c387 (17:4387) 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: ; 5c3a4 (17:43a4) @@ -25,8 +25,8 @@ Gym1LeaderName: ; 5c3b9 (17:43b9) PewterGymScript_5c3bf: ; 5c3bf (17:43bf) xor a ld [wJoyIgnore], a - ld [W_PEWTERGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPewterGymCurScript], a + ld [wCurMapScript], a ret PewterGymScriptPointers: ; 5c3ca (17:43ca) @@ -36,7 +36,7 @@ PewterGymScriptPointers: ; 5c3ca (17:43ca) dw PewterGymScript3 PewterGymScript3: ; 5c3d2 (17:43d2) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, PewterGymScript_5c3bf ld a, $f0 @@ -60,7 +60,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5c408 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 0, [hl] ld hl, wBeatGymFlags set 0, [hl] @@ -126,12 +126,12 @@ PewterGymText1: ; 5c44e (17:444e) call EngageMapTrainer call InitBattleEnemyParameters ld a, $1 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a 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 bee2b3b2..b33be016 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -1,14 +1,14 @@ PokemonTower2Script: ; 604f2 (18:44f2) call EnableAutoTextBoxDrawing ld hl, PokemonTower2ScriptPointers - ld a, [W_POKEMONTOWER2CURSCRIPT] + ld a, [wPokemonTower2CurScript] jp CallFunctionInTable PokemonTower2Script_604fe: ; 604fe (18:44fe) xor a ld [wJoyIgnore], a - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a ret PokemonTower2ScriptPointers: ; 60509 (18:4509) @@ -59,7 +59,7 @@ CoordsData_6055e: ; 6055e (18:455e) db $0F ; isn't this supposed to end in $ff? PokemonTower2Script1: ; 60563 (18:4563) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, PokemonTower2Script_604fe ld a, $f0 @@ -81,8 +81,8 @@ PokemonTower2Script1: ; 60563 (18:4563) call PlaySound callba Music_RivalAlternateStart ld a, $2 - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a ret MovementData_605a9: ; 605a9 (18:45a9) @@ -118,8 +118,8 @@ PokemonTower2Script2: ; 605bb (18:45bb) ld [wJoyIgnore], a call PlayDefaultMusic ld a, $0 - ld [W_POKEMONTOWER2CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower2CurScript], a + ld [wCurMapScript], a ret PokemonTower2TextPointers: ; 605db (18:45db) @@ -143,10 +143,10 @@ PokemonTower2Text1: ; 605df (18:45df) ld de, PokemonTower2Text_60637 call SaveEndBattleTextPointers ld a, OPP_SONY2 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $4 @@ -159,11 +159,11 @@ PokemonTower2Text1: ; 605df (18:45df) .Charmander ld a, $6 .done - ld [W_TRAINERNO], a + 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 a4fbbf18..0c3c6639 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/pokemontower3.asm @@ -2,9 +2,9 @@ PokemonTower3Script: ; 606cc (18:46cc) 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: ; 606df (18:46df) diff --git a/scripts/pokemontower4.asm b/scripts/pokemontower4.asm index 2638bdc2..bd4cda11 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/pokemontower4.asm @@ -2,9 +2,9 @@ PokemonTower4Script: ; 607f6 (18:47f6) 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: ; 60809 (18:4809) diff --git a/scripts/pokemontower5.asm b/scripts/pokemontower5.asm index c4e9eed9..6a2f5758 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/pokemontower5.asm @@ -2,9 +2,9 @@ PokemonTower5Script: ; 60932 (18:4932) 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: ; 60945 (18:4945) diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm index 37ca1b33..7bae81ea 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/pokemontower6.asm @@ -2,16 +2,16 @@ PokemonTower6Script: ; 60aef (18:4aef) 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: ; 60b02 (18:4b02) xor a ld [wJoyIgnore], a - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6ScriptPointers: ; 60b0d (18:4b0d) @@ -33,19 +33,19 @@ PokemonTower6Script0: ; 60b17 (18:4b17) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, MAROWAK - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, 30 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, $4 - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret CoordsData_60b45: ; 60b45 (18:4b45) db $10,$0A,$FF PokemonTower6Script4: ; 60b48 (18:4b48) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, PokemonTower6Script_60b02 ld a, $ff @@ -66,8 +66,8 @@ PokemonTower6Script4: ; 60b48 (18:4b48) 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: ; 60b48 (18:4b48) 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: ; 60ba1 (18:4ba1) @@ -90,8 +90,8 @@ PokemonTower6Script3: ; 60ba1 (18:4ba1) ret nz call Delay3 xor a - ld [W_POKEMONTOWER6CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower6CurScript], a + ld [wCurMapScript], a ret PokemonTower6TextPointers: ; 60bb1 (18:4bb1) diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm index a4635aa3..0aebfec2 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/pokemontower7.asm @@ -2,16 +2,16 @@ PokemonTower7Script: ; 60d05 (18:4d05) call EnableAutoTextBoxDrawing ld hl, PokemonTower7TrainerHeaders ld de, PokemonTower7ScriptPointers - ld a, [W_POKEMONTOWER7CURSCRIPT] + ld a, [wPokemonTower7CurScript] call ExecuteCurMapScriptInTable - ld [W_POKEMONTOWER7CURSCRIPT], a + ld [wPokemonTower7CurScript], a ret PokemonTower7Script_60d18: ; 60d18 (18:4d18) xor a ld [wJoyIgnore], a - ld [W_POKEMONTOWER7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower7CurScript], a + ld [wCurMapScript], a ret PokemonTower7ScriptPointers: @@ -24,7 +24,7 @@ PokemonTower7ScriptPointers: PokemonTower7Script2: ; 60d23 (18:4d23) ld hl, wFlags_0xcd60 res 0, [hl] - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, PokemonTower7Script_60d18 call EndTrainerBattle @@ -35,15 +35,15 @@ PokemonTower7Script2: ; 60d23 (18:4d23) call DisplayTextID call PokemonTower7Script_60db6 ld a, $3 - ld [W_POKEMONTOWER7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower7CurScript], a + ld [wCurMapScript], a ret PokemonTower7Script3: ; 60d56 (18:4d56) ld a, [wd730] bit 0, a ret nz - ld hl, W_MISSABLEOBJECTLIST + ld hl, wMissableObjectList ld a, [wSpriteIndex] ld b, a .missableObjectsListLoop @@ -59,8 +59,8 @@ PokemonTower7Script3: ; 60d56 (18:4d56) ld [wTrainerHeaderFlagBit], a ld [wUnusedDA38], a ld a, $0 - ld [W_POKEMONTOWER7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower7CurScript], a + ld [wCurMapScript], a ret PokemonTower7Script4: ; 60d86 (18:4d86) @@ -80,8 +80,8 @@ PokemonTower7Script4: ; 60d86 (18:4d86) ld hl, wd72d set 3, [hl] ld a, $0 - ld [W_POKEMONTOWER7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower7CurScript], a + ld [wCurMapScript], a ret PokemonTower7Script_60db6: ; 60db6 (18:4db6) @@ -92,9 +92,9 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6) ld d, $0 ld e, a add hl, de - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a .asm_60dcb ld a, [hli] @@ -268,8 +268,8 @@ PokemonTower7FujiText: ld [wMissableObjectIndex], a predef ShowObject ld a, $4 - ld [W_POKEMONTOWER7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wPokemonTower7CurScript], a + ld [wCurMapScript], a jp TextScriptEnd TowerRescueFujiText: diff --git a/scripts/powerplant.asm b/scripts/powerplant.asm index 48f291e1..1470a091 100755 --- a/scripts/powerplant.asm +++ b/scripts/powerplant.asm @@ -2,9 +2,9 @@ PowerPlantScript: ; 1e2c6 (7:62c6) call EnableAutoTextBoxDrawing ld hl, PowerPlantTrainerHeaders ld de, PowerPlantScriptPointers - ld a, [W_POWERPLANTCURSCRIPT] + ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable - ld [W_POWERPLANTCURSCRIPT], a + ld [wPowerPlantCurScript], a ret PowerPlantScriptPointers: ; 1e2d9 (7:62d9) @@ -114,8 +114,8 @@ PowerPlantTrainerHeader8: ; 1e35b (7:635b) InitVoltorbBattle: ; 1e368 (7:6368) call TalkToTrainer - ld a, [W_CURMAPSCRIPT] - ld [W_POWERPLANTCURSCRIPT], a + ld a, [wCurMapScript] + ld [wPowerPlantCurScript], a jp TextScriptEnd PowerPlantText1: ; 1e374 (7:6374) diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm index 2335e6d1..352b7dea 100755 --- a/scripts/redshouse2f.asm +++ b/scripts/redshouse2f.asm @@ -1,7 +1,7 @@ RedsHouse2FScript: ; 5c0b0 (17:40b0) call EnableAutoTextBoxDrawing ld hl,RedsHouse2FScriptPointers - ld a,[W_REDSHOUSE2CURSCRIPT] + ld a,[wRedsHouse2CurScript] jp CallFunctionInTable RedsHouse2FScriptPointers: ; 5c0bc (17:40bc) @@ -14,7 +14,7 @@ RedsHouse2FScript0: ; 5c0c0 (17:40c0) ld a,PLAYER_DIR_UP ld [wPlayerMovingDirection],a ld a,1 - ld [W_REDSHOUSE2CURSCRIPT],a + ld [wRedsHouse2CurScript],a ret RedsHouse2FScript1: ; 5c0ce (17:40ce) diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 82561577..7802c89f 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -3,9 +3,9 @@ RocketHideout1Script: ; 44bca (11:4bca) 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: ; 44be0 (11:4be0) diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index f269faef..db266be3 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -2,9 +2,9 @@ RocketHideout2Script: ; 44e27 (11:4e27) 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: ; 44e3a (11:4e3a) @@ -14,9 +14,9 @@ RocketHideout2ScriptPointers: ; 44e3a (11:4e3a) dw RocketHideout2Script3 RocketHideout2Script0: ; 44e42 (11:4e42) - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a ld hl, RocketHideout2ArrowTilePlayerMovement call DecodeArrowMovementRLE @@ -30,7 +30,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42) ld a, $ff ld [wJoyIgnore], a ld a, $3 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -310,7 +310,7 @@ RocketHideout2Script3: ; 44fc2 (11:4fc2) ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) @@ -323,7 +323,7 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) add hl, bc ld a, [hl] ld [wSpriteStateData1 + 2], a - ld a, [W_CURMAPTILESET] + ld a, [wCurMapTileset] cp FACILITY ld hl, FacilitySpinnerArrows jr z, .asm_44ff6 diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index 1f6d5b41..82bdd394 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -2,9 +2,9 @@ RocketHideout3Script: ; 45225 (11:5225) 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: ; 45238 (11:5238) @@ -14,9 +14,9 @@ RocketHideout3ScriptPointers: ; 45238 (11:5238) dw RocketHideout3Script3 RocketHideout3Script0: ; 45240 (11:5240) - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a ld hl, RocketHideout3ArrowTilePlayerMovement call DecodeArrowMovementRLE @@ -30,7 +30,7 @@ RocketHideout3Script0: ; 45240 (11:5240) ld a, $ff ld [wJoyIgnore], a ld a, $3 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -140,7 +140,7 @@ RocketHideout3Script3: ; 452e4 (11:452e4) ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret RocketHideout3TextPointers: ; 452fa (11:52fa) diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index a71e444c..23b8c791 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -3,9 +3,9 @@ RocketHideout4Script: ; 4545d (11:545d) 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_45473: ; 45473 (11:5473) @@ -33,8 +33,8 @@ RocketHideout4Script_45473: ; 45473 (11:5473) RocketHideout4Script_454a3: ; 454a3 (11:54a3) xor a ld [wJoyIgnore], a - ld [W_ROCKETHIDEOUT4CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRocketHideout4CurScript], a + ld [wCurMapScript], a ret RocketHideout4ScriptPointers: ; 454ae (11:54ae)c @@ -44,7 +44,7 @@ RocketHideout4ScriptPointers: ; 454ae (11:54ae)c dw RocketHideout4Script3 RocketHideout4Script3: ; 454b6 (11:54b6) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, RocketHideout4Script_454a3 call UpdateSprites @@ -68,8 +68,8 @@ RocketHideout4Script3: ; 454b6 (11:54b6) ld hl, wd126 set 5, [hl] ld a, $0 - ld [W_ROCKETHIDEOUT4CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRocketHideout4CurScript], a + ld [wCurMapScript], a ret RocketHideout4TextPointers: ; 45501 (11:5501) @@ -133,8 +133,8 @@ RocketHideout4Text1: ; 4553a (11:553a) xor a ld [hJoyHeld], a ld a, $3 - ld [W_ROCKETHIDEOUT4CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRocketHideout4CurScript], a + ld [wCurMapScript], a jr .asm_209f0 .asm_545571 ld hl, RocketHideout4Text10 diff --git a/scripts/rocktunnel1.asm b/scripts/rocktunnel1.asm index d03a5ba1..2b917f91 100755 --- a/scripts/rocktunnel1.asm +++ b/scripts/rocktunnel1.asm @@ -2,9 +2,9 @@ RockTunnel1Script: ; 444dc (11:44dc) 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: ; 444ef (11:44ef) diff --git a/scripts/rocktunnel2.asm b/scripts/rocktunnel2.asm index 2082394a..5cc04a2d 100755 --- a/scripts/rocktunnel2.asm +++ b/scripts/rocktunnel2.asm @@ -2,9 +2,9 @@ RockTunnel2Script: ; 45feb (11:5feb) 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: ; 45ffe (11:5ffe) diff --git a/scripts/route10.asm b/scripts/route10.asm index 2d5d2ae4..5a501557 100755 --- a/scripts/route10.asm +++ b/scripts/route10.asm @@ -2,9 +2,9 @@ Route10Script: ; 59336 (16:5336) 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: ; 59349 (16:5349) diff --git a/scripts/route11.asm b/scripts/route11.asm index 3a9f1e0d..d56b7730 100755 --- a/scripts/route11.asm +++ b/scripts/route11.asm @@ -2,9 +2,9 @@ Route11Script: ; 5944c (16:544c) 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: ; 5945f (16:545f) diff --git a/scripts/route12.asm b/scripts/route12.asm index 4057ce03..882e687a 100755 --- a/scripts/route12.asm +++ b/scripts/route12.asm @@ -2,16 +2,16 @@ Route12Script: ; 595f3 (16:55f3) 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: ; 59606 (16:5606) xor a ld [wJoyIgnore], a - ld [W_ROUTE12CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute12CurScript], a + ld [wCurMapScript], a ret Route12ScriptPointers: ; 59611 (16:5611) @@ -30,19 +30,19 @@ Route12Script0: ; 59619 (16:5619) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, 30 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, HS_ROUTE_12_SNORLAX ld [wMissableObjectIndex], a predef HideObject ld a, $3 - ld [W_ROUTE12CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute12CurScript], a + ld [wCurMapScript], a ret Route12Script3: ; 5964c (16:564c) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jr z, Route12Script_59606 call UpdateSprites @@ -56,8 +56,8 @@ Route12Script3: ; 5964c (16:564c) 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: ; 59675 (16:5675) diff --git a/scripts/route13.asm b/scripts/route13.asm index ab061071..911c15af 100755 --- a/scripts/route13.asm +++ b/scripts/route13.asm @@ -2,9 +2,9 @@ Route13Script: ; 5581e (15:581e) 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: ; 55831 (15:5831) diff --git a/scripts/route14.asm b/scripts/route14.asm index d65e257f..9970b817 100755 --- a/scripts/route14.asm +++ b/scripts/route14.asm @@ -2,9 +2,9 @@ Route14Script: ; 559d3 (15:59d3) 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: ; 559e6 (15:59e6) diff --git a/scripts/route15.asm b/scripts/route15.asm index 023f859c..5f58b996 100755 --- a/scripts/route15.asm +++ b/scripts/route15.asm @@ -2,9 +2,9 @@ Route15Script: ; 597ae (16:57ae) 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: ; 597c1 (16:57c1) diff --git a/scripts/route16.asm b/scripts/route16.asm index c762c999..1f6ba9a3 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -2,16 +2,16 @@ Route16Script: ; 59933 (16:5933) 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: ; 59946 (16:5946) xor a ld [wJoyIgnore], a - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16ScriptPointers: ; 59951 (16:5951) @@ -30,20 +30,20 @@ Route16Script0: ; 59959 (16:5959) ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, 30 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, HS_ROUTE_16_SNORLAX ld [wMissableObjectIndex], a predef HideObject call UpdateSprites ld a, $3 - ld [W_ROUTE16CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute16CurScript], a + ld [wCurMapScript], a ret Route16Script3: ; 5998f (16:598f) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route16Script_59946 call UpdateSprites @@ -57,8 +57,8 @@ Route16Script3: ; 5998f (16:598f) 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: ; 599b9 (16:59b9) diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index 801e577e..4bfef638 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -2,7 +2,7 @@ Route16GateScript: ; 496be (12:56be) ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing - ld a, [W_ROUTE16GATECURSCRIPT] + ld a, [wRoute16GateCurScript] ld hl, Route16GateScriptPointers jp CallFunctionInTable @@ -36,11 +36,11 @@ Route16GateScript0: ; 496d7 (12:56d7) 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: ; 49714 (12:5714) @@ -67,7 +67,7 @@ Route16GateScript2: ; 49727 (12:5727) ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, $3 - ld [W_ROUTE16GATECURSCRIPT], a + ld [wRoute16GateCurScript], a ret Route16GateScript3: ; 49741 (12:5741) @@ -79,7 +79,7 @@ Route16GateScript3: ; 49741 (12:5741) ld hl, wd730 res 7, [hl] ld a, $0 - ld [W_ROUTE16GATECURSCRIPT], a + ld [wRoute16GateCurScript], a ret Route16GateScript_49755: ; 49755 (12:5755) diff --git a/scripts/route17.asm b/scripts/route17.asm index 28c43627..f2a021a7 100755 --- a/scripts/route17.asm +++ b/scripts/route17.asm @@ -2,9 +2,9 @@ Route17Script: ; 55b7a (15:5b7a) 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: ; 55b8d (15:5b8d) diff --git a/scripts/route18.asm b/scripts/route18.asm index 9a077faf..dcd4b5ee 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -2,9 +2,9 @@ Route18Script: ; 59ac7 (16:5ac7) 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: ; 59ada (16:5ada) diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index 060a6bbf..c5462686 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -2,7 +2,7 @@ Route18GateScript: ; 49876 (12:5876) ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing - ld a, [W_ROUTE18GATECURSCRIPT] + ld a, [wRoute18GateCurScript] ld hl, Route18GateScriptPointers jp CallFunctionInTable @@ -36,11 +36,11 @@ Route18GateScript0: ; 4988f (12:588f) 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: ; 498cc (12:58cc) @@ -67,7 +67,7 @@ Route18GateScript2: ; 498df (12:58df) ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, $3 - ld [W_ROUTE18GATECURSCRIPT], a + ld [wRoute18GateCurScript], a ret Route18GateScript3: ; 498f9 (12:58f9) @@ -79,7 +79,7 @@ Route18GateScript3: ; 498f9 (12:58f9) ld hl, wd730 res 7, [hl] ld a, $0 - ld [W_ROUTE18GATECURSCRIPT], a + ld [wRoute18GateCurScript], a ret Route18GateTextPointers: ; 4990d (12:590d) diff --git a/scripts/route19.asm b/scripts/route19.asm index 4a60e40f..c6aa214e 100755 --- a/scripts/route19.asm +++ b/scripts/route19.asm @@ -2,9 +2,9 @@ Route19Script: ; 55d44 (15:5d44) 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: ; 55d57 (15:5d57) diff --git a/scripts/route20.asm b/scripts/route20.asm index ce9e6f23..9c5fc387 100755 --- a/scripts/route20.asm +++ b/scripts/route20.asm @@ -4,9 +4,9 @@ Route20Script: ; 50ca9 (14:4ca9) 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: ; 50cc6 (14:4cc6) diff --git a/scripts/route21.asm b/scripts/route21.asm index 4c8087fd..821cea39 100755 --- a/scripts/route21.asm +++ b/scripts/route21.asm @@ -2,9 +2,9 @@ Route21Script: ; 55eeb (15:5eeb) 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: ; 55efe (15:5efe) diff --git a/scripts/route22.asm b/scripts/route22.asm index 1244f0ff..81da41a1 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -1,7 +1,7 @@ Route22Script: ; 50eb2 (14:4eb2) call EnableAutoTextBoxDrawing ld hl, Route22ScriptPointers - ld a, [W_ROUTE22CURSCRIPT] + ld a, [wRoute22CurScript] jp CallFunctionInTable Route22ScriptPointers: ; 50ebe (14:4ebe) @@ -17,12 +17,12 @@ Route22ScriptPointers: ; 50ebe (14:4ebe) Route22Script_50ece: ; 50ece (14:4ece) xor a ld [wJoyIgnore], a - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a Route22Script7: ; 50ed5 (14:4ed5) ret Route22Script_50ed6: ; 50ed6 (14:4ed6) - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] ld b, a .asm_50eda ld a, [hli] @@ -32,7 +32,7 @@ Route22Script_50ed6: ; 50ed6 (14:4ed6) jr .asm_50eda .asm_50ee1 ld a, [hl] - ld [W_TRAINERNO], a + ld [wTrainerNo], a ret Route22MoveRivalSprite: ; 50ee6 (14:4ee6) @@ -99,7 +99,7 @@ Route22Script0: ; 50f00 (14:4f00) ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $1 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script1: ; 50f62 (14:4f62) @@ -132,11 +132,11 @@ Route22Script1: ; 50f62 (14:4f62) ld de, Route22Text_511bc call SaveEndBattleTextPointers ld a, OPP_SONY1 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld hl, StarterMons_50faf call Route22Script_50ed6 ld a, $2 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret StarterMons_50faf: ; 50faf (14:4faf) @@ -146,7 +146,7 @@ StarterMons_50faf: ; 50faf (14:4faf) db STARTER1,$06 Route22Script2: ; 50fb5 (14:4fb5) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece ld a, [wSpriteStateData1 + 9] @@ -180,7 +180,7 @@ Route22Script2: ; 50fb5 (14:4fb5) call Route22Script_5100d .asm_51002 ld a, $3 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_51008: ; 51008 (14:5008) @@ -229,7 +229,7 @@ Route22Script3: ; 5102a (14:502a) 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: ; 5104e (14:504e) @@ -253,7 +253,7 @@ Route22Script_5104e: ; 5104e (14:504e) ld [H_SPRITEINDEX], a call Route22MoveRivalSprite ld a, $4 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script4: ; 51087 (14:5087) @@ -288,11 +288,11 @@ Route22Script4: ; 51087 (14:5087) ld de, Route22Text_511d0 call SaveEndBattleTextPointers ld a, OPP_SONY2 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld hl, StarterMons_510d9 call Route22Script_50ed6 ld a, $5 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret StarterMons_510d9: ; 510d9 (14:50d9) @@ -301,7 +301,7 @@ StarterMons_510d9: ; 510d9 (14:50d9) db STARTER1,$0c Route22Script5: ; 510df (14:50df) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece ld a, $2 @@ -339,7 +339,7 @@ Route22Script5: ; 510df (14:50df) call Route22Script_51142 .asm_51137 ld a, $6 - ld [W_ROUTE22CURSCRIPT], a + ld [wRoute22CurScript], a ret Route22Script_5113d: ; 5113d (14:513d) @@ -374,7 +374,7 @@ Route22Script6: ; 51151 (14:5151) 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: ; 51175 (14:5175) diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 95546a99..53ae8378 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -1,9 +1,9 @@ Route22GateScript: ; 1e683 (7:6683) call EnableAutoTextBoxDrawing ld hl, Route22GateScriptPointers - ld a, [W_ROUTE22GATECURSCRIPT] + ld a, [wRoute22GateCurScript] call CallFunctionInTable - ld a, [W_YCOORD] + ld a, [wYCoord] cp $4 ld a, ROUTE_23 jr c, .asm_1e69a @@ -49,7 +49,7 @@ Route22GateScript1: ; 1e6cd (7:66cd) ld [wJoyIgnore], a call Delay3 ld a, $0 - ld [W_ROUTE22GATECURSCRIPT], a + ld [wRoute22GateCurScript], a Route22GateScript2: ; 1e6de (7:66de) ret @@ -58,7 +58,7 @@ Route22GateTextPointers: ; 1e6df (7:66df) Route22GateText1: ; 1e6e1 (7:66e1) TX_ASM - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] bit 0, a jr nz, .asm_1e6f6 ld hl, Route22GateText_1e704 @@ -71,7 +71,7 @@ Route22GateText1: ; 1e6e1 (7:66e1) call PrintText ld a, $2 .asm_1e6fe - ld [W_ROUTE22GATECURSCRIPT], a + ld [wRoute22GateCurScript], a jp TextScriptEnd Route22GateText_1e704: ; 1e704 (7:6704) diff --git a/scripts/route23.asm b/scripts/route23.asm index 35f1b9cb..10bae669 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -2,7 +2,7 @@ Route23Script: ; 511da (14:51da) call Route23Script_511e9 call EnableAutoTextBoxDrawing ld hl, Route23ScriptPointers - ld a, [W_ROUTE23CURSCRIPT] + ld a, [wRoute23CurScript] jp CallFunctionInTable Route23Script_511e9: ; 511e9 (14:51e9) @@ -26,7 +26,7 @@ Route23ScriptPointers: ; 51213 (14:5213) Route23Script0: ; 51219 (14:5219) ld hl, YCoordsData_51255 - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a ld e, $0 EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK @@ -40,7 +40,7 @@ Route23Script0: ; 51219 (14:5219) jr nz, .asm_51224 cp $23 jr nz, .asm_51237 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $e ret nc .asm_51237 @@ -128,7 +128,7 @@ Route23Script1: ; 512ec (14:52ec) ret nz Route23Script2: ; 512f1 (14:52f1) ld a, $0 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret Route23TextPointers: ; 512f7 (14:52f7) @@ -190,7 +190,7 @@ Route23Script_51346: ; 51346 (14:5346) inc a ld c, a ld b, FLAG_TEST - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges predef FlagActionPredef ld a, c and a @@ -199,7 +199,7 @@ Route23Script_51346: ; 51346 (14:5346) 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: ; 51346 (14:5346) EventFlagAddress hl, EVENT_PASSED_CASCADEBADGE_CHECK predef FlagActionPredef ld a, $2 - ld [W_ROUTE23CURSCRIPT], a + ld [wRoute23CurScript], a ret Route23Script_51388: ; 51388 (14:5388) diff --git a/scripts/route24.asm b/scripts/route24.asm index 6eba1d35..02b439e1 100755 --- a/scripts/route24.asm +++ b/scripts/route24.asm @@ -2,16 +2,16 @@ Route24Script: ; 513ad (14:53ad) 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: ; 513c0 (14:53c0) xor a ld [wJoyIgnore], a - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24ScriptPointers: ; 513cb (14:53cb) @@ -40,8 +40,8 @@ Route24Script0: ; 513d5 (14:53d5) 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: ; 5140e (14:540e) @@ -53,12 +53,12 @@ Route24Script4: ; 51411 (14:5411) ret nz call Delay3 ld a, $0 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24Script3: ; 51422 (14:5422) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, Route24Script_513c0 call UpdateSprites @@ -71,8 +71,8 @@ Route24Script3: ; 51422 (14:5422) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_ROUTE24CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute24CurScript], a + ld [wCurMapScript], a ret Route24TextPointers: ; 5144b (14:544b) @@ -170,8 +170,8 @@ Route24Text1: ; 514a4 (14:54a4) 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 49580ba6..4df7fd40 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -3,9 +3,9 @@ Route25Script: ; 515cb (14:55cb) call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeaders ld de, Route25ScriptPointers - ld a, [W_ROUTE25CURSCRIPT] + ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable - ld [W_ROUTE25CURSCRIPT], a + ld [wRoute25CurScript], a ret Route25Script_515e1: ; 515e1 (14:55e1) diff --git a/scripts/route3.asm b/scripts/route3.asm index 50c4e00d..4640d767 100755 --- a/scripts/route3.asm +++ b/scripts/route3.asm @@ -2,9 +2,9 @@ Route3Script: ; 554f8 (15:54f8) 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: ; 5550b (15:550b) diff --git a/scripts/route4.asm b/scripts/route4.asm index f5bdd9e8..019d5582 100755 --- a/scripts/route4.asm +++ b/scripts/route4.asm @@ -2,9 +2,9 @@ Route4Script: ; 55658 (15:5658) 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: ; 5566b (15:566b) diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 35f3a020..d1b85dff 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -1,6 +1,6 @@ Route5GateScript: ; 1df33 (7:5f33) call EnableAutoTextBoxDrawing - ld a, [W_ROUTE5GATECURSCRIPT] + ld a, [wRoute5GateCurScript] ld hl, Route5GateScriptPointers jp CallFunctionInTable @@ -35,7 +35,7 @@ Route5GateScript0: ; 1df50 (7:5f50) 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: ; 1df94 (7:5f94) call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE5GATECURSCRIPT], a + ld [wRoute5GateCurScript], a ret Route5GateTextPointers: ; 1dfa4 (7:5fa4) @@ -81,7 +81,7 @@ Route5GateText1: ; 1dfaa (7:5faa) 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 e748fed1..cb2b5e65 100755 --- a/scripts/route6.asm +++ b/scripts/route6.asm @@ -2,9 +2,9 @@ Route6Script: ; 590b0 (16:50b0) 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: ; 590c3 (16:50c3) diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm index a4b6149c..4d3d94d3 100755 --- a/scripts/route6gate.asm +++ b/scripts/route6gate.asm @@ -1,7 +1,7 @@ Route6GateScript: ; 1e03d (7:603d) call EnableAutoTextBoxDrawing ld hl, Route6GateScriptPointers - ld a, [W_ROUTE6GATECURSCRIPT] + ld a, [wRoute6GateCurScript] call CallFunctionInTable ret @@ -29,7 +29,7 @@ Route6GateScript0: ; 1e04e (7:604e) 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: ; 1e091 (7:6091) call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE6GATECURSCRIPT], a + ld [wRoute6GateCurScript], a ret Route6GateScript_1e0a1: ; 1e0a1 (7:60a1) diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm index b55f813c..af10ccb5 100755 --- a/scripts/route7gate.asm +++ b/scripts/route7gate.asm @@ -1,6 +1,6 @@ Route7GateScript: ; 1e100 (7:6100) call EnableAutoTextBoxDrawing - ld a, [W_ROUTE7GATECURSCRIPT] + ld a, [wRoute7GateCurScript] ld hl, Route7GateScriptPointers call CallFunctionInTable ret @@ -41,7 +41,7 @@ Route7GateScript0: ; 1e128 (7:6128) 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: ; 1e16c (7:616c) call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE7GATECURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wRoute7GateCurScript], a + ld [wCurMapScript], a ret Route7GateTextPointers: ; 1e17f (7:617f) diff --git a/scripts/route8.asm b/scripts/route8.asm index c734c62d..cfb4f433 100755 --- a/scripts/route8.asm +++ b/scripts/route8.asm @@ -2,9 +2,9 @@ Route8Script: ; 591b6 (16:51b6) 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: ; 591c9 (16:51c9) diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index 96bfa875..141c5f4d 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -1,7 +1,7 @@ Route8GateScript: ; 1e1c7 (7:61c7) call EnableAutoTextBoxDrawing ld hl, Route8GateScriptPointers - ld a, [W_ROUTE8GATECURSCRIPT] + ld a, [wRoute8GateCurScript] jp CallFunctionInTable Route8GateScriptPointers: ; 1e1d3 (7:61d3) @@ -40,7 +40,7 @@ Route8GateScript0: ; 1e1ee (7:61ee) 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: ; 1e231 (7:6231) call Delay3 xor a ld [wJoyIgnore], a - ld [W_ROUTE8GATECURSCRIPT], a + ld [wRoute8GateCurScript], a ret Route8GateTextPointers: ; 1e241 (7:6241) diff --git a/scripts/route9.asm b/scripts/route9.asm index 9d26ee96..6656cc8a 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -2,9 +2,9 @@ Route9Script: ; 556bc (15:56bc) 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: ; 556cf (15:56cf) diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm index 4a37f0e6..da9a068e 100644 --- a/scripts/safarizoneentrance-yellow.asm +++ b/scripts/safarizoneentrance-yellow.asm @@ -56,7 +56,7 @@ ld a,30 lb hl, (502 / $100), (502 % $100) .xf1ff2 - ld [W_NUMSAFARIBALLS],a + ld [wNumSafariBalls],a ld a,h ld [wSafariSteps],a ld a,l @@ -67,7 +67,7 @@ SetEvent EVENT_IN_SAFARI_ZONE ResetEventReuseHL EVENT_SAFARI_GAME_OVER ld a,3 - ld [W_SAFARIZONEENTRANCECURSCRIPT],a + ld [wSafariZoneEntranceCurScript],a jr .done .PleaseComeAgain @@ -78,7 +78,7 @@ ld c,1 call SafariZoneEntranceAutoWalk ld a,4 - ld [W_SAFARIZONEENTRANCECURSCRIPT],a + ld [wSafariZoneEntranceCurScript],a .done ret diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index e4e2e2a8..2f8ff34b 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -1,7 +1,7 @@ SafariZoneEntranceScript: ; 751cd (1d:51cd) call EnableAutoTextBoxDrawing ld hl, SafariZoneEntranceScriptPointers - ld a, [W_SAFARIZONEENTRANCECURSCRIPT] + ld a, [wSafariZoneEntranceCurScript] jp CallFunctionInTable SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) @@ -30,7 +30,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) cp $1 jr z, .asm_7520f ld a, $2 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a ret .asm_7520f ld a, D_RIGHT @@ -39,7 +39,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld a, $f0 ld [wJoyIgnore], a ld a, $1 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a ret .CoordsData_75221: ; 75221 (1d:5221) @@ -68,7 +68,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) xor a ld [wJoyIgnore], a ld a, $5 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a ret .SafariZoneEntranceScript5 @@ -84,12 +84,12 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ld [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [W_NUMSAFARIBALLS], a + ld [wNumSafariBalls], a ld a, D_DOWN ld c, $3 call SafariZoneEntranceAutoWalk ld a, $4 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a jr .asm_75286 .asm_7527f ld a, $5 @@ -104,7 +104,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a ret .SafariZoneEntranceScript6 @@ -112,7 +112,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) ret nz call Delay3 ld a, [wcf0d] - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a ret SafariZoneEntranceAutoWalk: @@ -181,7 +181,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) ld hl,.MakePaymentText call PrintText ld a,30 - ld [W_NUMSAFARIBALLS],a + ld [wNumSafariBalls],a ld a,502 / $100 ld [wSafariSteps],a ld a, 502 % $100 @@ -192,7 +192,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) SetEvent EVENT_IN_SAFARI_ZONE ResetEventReuseHL EVENT_SAFARI_GAME_OVER ld a,3 - ld [W_SAFARIZONEENTRANCECURSCRIPT],a + ld [wSafariZoneEntranceCurScript],a jr .done .PleaseComeAgain @@ -203,7 +203,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) ld c,1 call SafariZoneEntranceAutoWalk ld a,4 - ld [W_SAFARIZONEENTRANCECURSCRIPT],a + ld [wSafariZoneEntranceCurScript],a .done jp TextScriptEnd @@ -251,7 +251,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9) ld [wcf0d], a .asm_753b3 ld a, $6 - ld [W_SAFARIZONEENTRANCECURSCRIPT], a + ld [wSafariZoneEntranceCurScript], a jp TextScriptEnd .SafariZoneEntranceText_753bb diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm index 140b1130..54aea876 100755 --- a/scripts/saffrongym.asm +++ b/scripts/saffrongym.asm @@ -6,9 +6,9 @@ SaffronGymScript: ; 5d00d (17:500d) 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: ; 5d040 (17:5040) SaffronGymText_5d048: ; 5d048 (17:5048) xor a ld [wJoyIgnore], a - ld [W_SAFFRONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSaffronGymCurScript], a + ld [wCurMapScript], a ret SaffronGymScriptPointers: ; 5d053 (17:5053) @@ -36,7 +36,7 @@ SaffronGymScriptPointers: ; 5d053 (17:5053) dw SaffronGymScript3 SaffronGymScript3: ; 5d05b (17:505b) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SaffronGymText_5d048 ld a, $f0 @@ -60,7 +60,7 @@ SaffronGymText_5d068: ; 5d068 (17:5068) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5d091 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 5, [hl] ld hl, wBeatGymFlags set 5, [hl] @@ -177,9 +177,9 @@ SaffronGymText1: ; 5d118 (17:5118) call EngageMapTrainer call InitBattleEnemyParameters ld a, $6 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a ld a, $3 - ld [W_SAFFRONGYMCURSCRIPT], a + ld [wSaffronGymCurScript], a .asm_5d15f jp TextScriptEnd diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index f7407e48..e3234b0a 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -41,7 +41,7 @@ SeafoamIslands4Script: ; 4658d (11:658d) ret nz .asm_465ed ld hl, SeafoamIslands4ScriptPointers - ld a, [W_SEAFOAMISLANDS4CURSCRIPT] + ld a, [wSeafoamIslands4CurScript] jp CallFunctionInTable Seafoam4HolesCoords: ; 465f6 (11:65f6) @@ -58,10 +58,10 @@ SeafoamIslands4ScriptPointers: ; 465fb (11:65fb) SeafoamIslands4Script0: ; 46603 (11:6603) CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld a, [W_YCOORD] + ld a, [wYCoord] cp $8 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $f ret nz ld hl, wSimulatedJoypadStatesEnd @@ -70,10 +70,10 @@ SeafoamIslands4Script0: ; 46603 (11:6603) dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 2, [hl] ld a, $1 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret RLEMovement46632: ; 46632 (11:6632) @@ -87,13 +87,13 @@ SeafoamIslands4Script1: ; 46639 (11:6639) and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret SeafoamIslands4Script2: ; 46644 (11:6644) CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE ret z - ld a, [W_XCOORD] + ld a, [wXCoord] cp $12 jr z, .asm_4665e cp $13 @@ -112,11 +112,11 @@ SeafoamIslands4Script2: ; 46644 (11:6644) ld [wSpriteStateData2 + $06], a ld hl, wd730 set 7, [hl] - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 set 2, [hl] ld a, $3 .asm_4667b - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret RLEData_4667f: ; 4667f (11:667f) @@ -137,7 +137,7 @@ SeafoamIslands4Script3: ; 4668f (11:668f) and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS4CURSCRIPT], a + ld [wSeafoamIslands4CurScript], a ret SeafoamIslands4TextPointers: ; 4669a (11:669a) diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index 87942ca0..98c27666 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -1,12 +1,12 @@ SeafoamIslands5Script: ; 46799 (11:6799) call EnableAutoTextBoxDrawing - ld a, [W_SEAFOAMISLANDS5CURSCRIPT] + ld a, [wSeafoamIslands5CurScript] ld hl, SeafoamIslands5ScriptPointers jp CallFunctionInTable SeafoamIslands5Script_467a5: ; 467a5 (11:67a5) xor a - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ld [wJoyIgnore], a ret @@ -18,12 +18,12 @@ SeafoamIslands5ScriptPointers: ; 467ad (11:67ad) dw SeafoamIslands5Script4 SeafoamIslands5Script4: ; 467b7 (11:67b7) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jr z, SeafoamIslands5Script_467a5 call EndTrainerBattle ld a, $0 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret SeafoamIslands5Script0: ; 467c7 (11:67c7) @@ -46,10 +46,10 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7) ld a, D_UP ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates - ld hl, W_FLAGS_D733 + ld hl, wFlags_D733 res 2, [hl] ld a, $1 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret CoordsData_467fe: ; 467fe (11:67fe) @@ -66,7 +66,7 @@ SeafoamIslands5Script1: ; 46807 (11:6807) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret SeafoamIslands5Script2: ; 46816 (11:6816) @@ -92,7 +92,7 @@ SeafoamIslands5Script2: ; 46816 (11:6816) call StartSimulatingJoypadStates ld a, $3 .asm_46849 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret CoordsData_4684d: ; 4684d (11:684d) @@ -121,7 +121,7 @@ SeafoamIslands5Script3: ; 46860 (11:6860) and a ret nz ld a, $0 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a ret SeaFoamIslands5Script_46872: ; 46872 (11:6872) @@ -154,7 +154,7 @@ SeafoamIslands5Text3: ; 46893 (11:6893) ld hl, SeafoamIslands5TrainerHeader0 call TalkToTrainer ld a, $4 - ld [W_SEAFOAMISLANDS5CURSCRIPT], a + ld [wSeafoamIslands5CurScript], a jp TextScriptEnd SeafoamIslands5BattleText2: ; 468a2 (11:68a2) diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm index a6f2f860..5ca16e04 100755 --- a/scripts/silphco10.asm +++ b/scripts/silphco10.asm @@ -3,9 +3,9 @@ SilphCo10Script: ; 5a139 (16:6139) 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: ; 5a14f (16:614f) diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 4c83c20d..79a2c328 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -3,9 +3,9 @@ SilphCo11Script: ; 620fa (18:60fa) 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_62110: ; 62110 (18:6110) @@ -150,8 +150,8 @@ SilphCo11Script_621c4: ; 621c4 (18:61c4) ld [wJoyIgnore], a SilphCo11Script_621c8: ; 621c8 (18:61c8) - ld [W_SILPHCO11CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSilphCo11CurScript], a + ld [wCurMapScript], a ret SilphCo11ScriptPointers: ; 621cf (18:61cf) @@ -205,7 +205,7 @@ SilphCo11Script_6221a: ; 6221a (18:621a) jp SetSpriteFacingDirectionAndDelay SilphCo11Script5: ; 62227 (18:6227) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SilphCo11Script_621c4 ld a, [wcf0d] diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm index ecb3b5a5..7fbd81c8 100755 --- a/scripts/silphco2.asm +++ b/scripts/silphco2.asm @@ -3,9 +3,9 @@ SilphCo2Script: ; 59cf1 (16:5cf1) 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: ; 59d07 (16:5d07) diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm index bdaac452..119d7c66 100755 --- a/scripts/silphco3.asm +++ b/scripts/silphco3.asm @@ -3,9 +3,9 @@ SilphCo3Script: ; 59f5b (16:5f5b) 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: ; 59f71 (16:5f71) diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm index 0dad6f6b..38de73a7 100755 --- a/scripts/silphco4.asm +++ b/scripts/silphco4.asm @@ -3,9 +3,9 @@ SilphCo4Script: ; 19d0b (6:5d0b) 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: ; 19d21 (6:5d21) diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index 7380f98f..080ed963 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -3,9 +3,9 @@ SilphCo5Script: ; 19f37 (6:5f37) 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: ; 19f4d (6:5f4d) diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm index fa199069..6d7978b2 100755 --- a/scripts/silphco6.asm +++ b/scripts/silphco6.asm @@ -3,9 +3,9 @@ SilphCo6Script: ; 1a1a9 (6:61a9) 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: ; 1a1bf (6:61bf) diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 5333e07f..f771f865 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -3,9 +3,9 @@ SilphCo7Script: ; 51b61 (14:5b61) 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: ; 51b77 (14:5b77) @@ -106,8 +106,8 @@ SilphCo7Text_51c0c: ; 51c0c (14:5c0c) ld [wJoyIgnore], a SilphCo7Text_51c10: ; 51c10 (14:5c10) - ld [W_SILPHCO7CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wSilphCo7CurScript], a + ld [wCurMapScript], a ret SilphCo7ScriptPointers: ; 51c17 (14:5c17) @@ -184,8 +184,8 @@ SilphCo7Script3: ; 51c82 (14:5c82) ld de, SilphCo7Text_51ecd call SaveEndBattleTextPointers ld a, OPP_SONY2 - ld [W_CUROPPONENT], a - ld a, [W_RIVALSTARTER] + ld [wCurOpponent], a + ld a, [wRivalStarter] cp STARTER2 jr nz, .asm_51cb6 ld a, $7 @@ -198,12 +198,12 @@ SilphCo7Script3: ; 51c82 (14:5c82) .asm_51cbe ld a, $9 .asm_51cc0 - ld [W_TRAINERNO], a + ld [wTrainerNo], a ld a, $4 jp SilphCo7Text_51c10 SilphCo7Script4: ; 51cc8 (14:5cc8) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SilphCo7Text_51c0c ld a, $f0 diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm index 9ea985a8..bb3217ec 100755 --- a/scripts/silphco8.asm +++ b/scripts/silphco8.asm @@ -3,9 +3,9 @@ SilphCo8Script: ; 56504 (15:6504) 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: ; 5651a (15:651a) diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm index 02638459..2ab7423b 100755 --- a/scripts/silphco9.asm +++ b/scripts/silphco9.asm @@ -3,9 +3,9 @@ SilphCo9Script: ; 5d7bb (17:57bb) 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: ; 5d7d1 (17:57d1) diff --git a/scripts/ssanne10.asm b/scripts/ssanne10.asm index 3b53b961..d39b902f 100755 --- a/scripts/ssanne10.asm +++ b/scripts/ssanne10.asm @@ -2,9 +2,9 @@ SSAnne10Script: ; 61d55 (18:5d55) 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: ; 61d68 (18:5d68) diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 8bcc2b17..fb3d0536 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -1,13 +1,13 @@ SSAnne2Script: ; 6139f (18:539f) call EnableAutoTextBoxDrawing ld hl, SSAnne2ScriptPointers - ld a, [W_SSANNE2CURSCRIPT] + ld a, [wSSAnne2CurScript] jp CallFunctionInTable SSAnne2Script_613ab: ; 613ab (18:53ab) xor a ld [wJoyIgnore], a - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret SSAnne2ScriptPointers: ; 613b3 (18:53b3) @@ -53,7 +53,7 @@ SSAnne2Script0: ; 613be (18:53be) .asm_61403 call MoveSprite ld a, $1 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret MovementData_6140c: ; 6140c (18:540c) @@ -71,7 +71,7 @@ CoordsData_61411: ; 61411 (18:5411) db $FF SSAnne2Script_61416: ; 61416 (18:5416) - ld a, [W_XCOORD] + ld a, [wXCoord] cp $25 jr nz, .asm_61426 ld a, PLAYER_DIR_LEFT @@ -98,10 +98,10 @@ SSAnne2Script1: ; 61430 (18:5430) call DisplayTextID call Delay3 ld a, OPP_SONY2 - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] + ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle ld a, $1 @@ -114,15 +114,15 @@ SSAnne2Script1: ; 61430 (18:5430) .Charmander ld a, $3 .done - ld [W_TRAINERNO], a + ld [wTrainerNo], a call SSAnne2Script_61416 ld a, $2 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret SSAnne2Script2: ; 6146d (18:546d) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, SSAnne2Script_613ab call SSAnne2Script_61416 @@ -134,7 +134,7 @@ SSAnne2Script2: ; 6146d (18:546d) ld a, $2 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld a, [W_XCOORD] + ld a, [wXCoord] cp $25 jr nz, .asm_61497 ld de, MovementData_614b9 @@ -150,7 +150,7 @@ SSAnne2Script2: ; 6146d (18:546d) call PlaySound callba Music_RivalAlternateStart ld a, $3 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret MovementData_614b7: ; 614b7 (18:54b7) @@ -175,7 +175,7 @@ SSAnne2Script3: ; 614be (18:54be) predef HideObject call PlayDefaultMusic ld a, $4 - ld [W_SSANNE2CURSCRIPT], a + ld [wSSAnne2CurScript], a ret SSAnne2TextPointers: ; 614db (18:54db) diff --git a/scripts/ssanne5.asm b/scripts/ssanne5.asm index 76553563..698e9f14 100755 --- a/scripts/ssanne5.asm +++ b/scripts/ssanne5.asm @@ -2,9 +2,9 @@ SSAnne5Script: ; 616ae (18:56ae) 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: ; 616c1 (18:56c1) diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm index 195c9a81..2e7dcf67 100755 --- a/scripts/ssanne8.asm +++ b/scripts/ssanne8.asm @@ -2,9 +2,9 @@ SSAnne8Script: ; 61976 (18:5976) 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: ; 61989 (18:5989) diff --git a/scripts/ssanne9.asm b/scripts/ssanne9.asm index 525a2964..bec4b838 100755 --- a/scripts/ssanne9.asm +++ b/scripts/ssanne9.asm @@ -5,9 +5,9 @@ SSAnne9Script: ; 61b4b (18:5b4b) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, SSAnne9TrainerHeaders ld de, SSAnne9ScriptPointers - ld a, [W_SSANNE9CURSCRIPT] + ld a, [wSSAnne9CurScript] call ExecuteCurMapScriptInTable - ld [W_SSANNE9CURSCRIPT], a + ld [wSSAnne9CurScript], a ret SSAnne9ScriptPointers: ; 61b64 (18:5b64) diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index 42459766..c5818032 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -2,9 +2,9 @@ UnknownDungeon3Script: ; 45ef0 (11:5ef0) call EnableAutoTextBoxDrawing ld hl, UnknownDungeon3TrainerHeaders ld de, UnknownDungeon3ScriptPointers - ld a, [W_UNKNOWNDUNGEON3CURSCRIPT] + ld a, [wUnknownDungeon3CurScript] call ExecuteCurMapScriptInTable - ld [W_UNKNOWNDUNGEON3CURSCRIPT], a + ld [wUnknownDungeon3CurScript], a ret UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03) diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index a203323f..b60d4111 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -10,7 +10,7 @@ VermilionCityScript: ; 197a1 (6:57a1) res 5, [hl] call nz, VermilionCityScript_197c0 ld hl, VermilionCityScriptPointers - ld a, [W_VERMILIONCITYCURSCRIPT] + ld a, [wVermilionCityCurScript] jp CallFunctionInTable VermilionCityScript_197c0: ; 197c0 (6:57c0) @@ -27,7 +27,7 @@ VermilionCityScript_197cb: ; 197cb (6:57cb) SetEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT ret nz ld a, $2 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScriptPointers: ; 197dc (6:57dc) @@ -64,7 +64,7 @@ VermilionCityScript0: ; 197e6 (6:57e6) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret CoordsData_19823: ; 19823 (6:5823) @@ -76,7 +76,7 @@ VermilionCityScript4: ; 19826 (6:5826) call ArePlayerCoordsInArray ret c ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript2: ; 19833 (6:5833) @@ -89,7 +89,7 @@ VermilionCityScript2: ; 19833 (6:5833) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript3: ; 1984e (6:584e) @@ -100,7 +100,7 @@ VermilionCityScript3: ; 1984e (6:584e) ld [wJoyIgnore], a ld [hJoyHeld], a ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript1: ; 1985f (6:585f) @@ -110,7 +110,7 @@ VermilionCityScript1: ; 1985f (6:585f) ld c, 10 call DelayFrames ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityTextPointers: ; 1986f (6:586f) @@ -182,7 +182,7 @@ VermilionCityText3: ; 198b1 (6:58b1) 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 78a38aec..15791f0e 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/vermiliongym.asm @@ -11,9 +11,9 @@ VermilionGymScript: ; 5ca26 (17:4a26) 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: ; 5ca4c (17:4a4c) @@ -44,8 +44,8 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d) VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a) xor a ld [wJoyIgnore], a - ld [W_VERMILIONGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wVermilionGymCurScript], a + ld [wCurMapScript], a ret VermilionGymScriptPointers: ; 5ca95 (17:4a95) @@ -55,7 +55,7 @@ VermilionGymScriptPointers: ; 5ca95 (17:4a95) dw VermilionGymScript3 VermilionGymScript3: ; 5ca9d (17:4a9d) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, VermilionGymScript_5ca8a ld a, $f0 @@ -79,7 +79,7 @@ VermilionGymScript_5caaa: ; 5caaa (17:4aaa) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_5cad3 - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 2, [hl] ld hl, wBeatGymFlags set 2, [hl] @@ -156,12 +156,12 @@ VermilionGymText1: ; 5cb1d (17:4b1d) call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [W_GYMLEADERNO], a + ld [wGymLeaderNo], a 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 11f5d5db..e66cc375 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/victoryroad1.asm @@ -6,9 +6,9 @@ VictoryRoad1Script: ; 5da0a (17:5a0a) 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 diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm index cb956b1c..6fc4747c 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/victoryroad2.asm @@ -10,9 +10,9 @@ VictoryRoad2Script: ; 5179d (14:579d) 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: ; 517c4 (14:57c4) diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm index 22e6813a..40117398 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/victoryroad3.asm @@ -3,9 +3,9 @@ VictoryRoad3Script: ; 44980 (11:4980) 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: ; 44996 (11:4996) diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm index ae0b6212..0bbaec0d 100755 --- a/scripts/viridiancity.asm +++ b/scripts/viridiancity.asm @@ -1,7 +1,7 @@ ViridianCityScript: ; 18ff1 (6:4ff1) call EnableAutoTextBoxDrawing ld hl, ViridianCityScriptPointers - ld a, [W_VIRIDIANCITYCURSCRIPT] + ld a, [wViridianCityCurScript] jp CallFunctionInTable ViridianCityScriptPointers: ; 18ffd (6:4ffd) @@ -17,16 +17,16 @@ ViridianCityScript0: ; 19005 (6:5005) ViridianCityScript_1900b: ; 1900b (6:500b) CheckEvent EVENT_VIRIDIAN_GYM_OPEN ret nz - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] cp %01111111 jr nz, .asm_1901e SetEvent EVENT_VIRIDIAN_GYM_OPEN ret .asm_1901e - ld a, [W_YCOORD] + ld a, [wYCoord] cp $8 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $20 ret nz ld a, $e @@ -36,16 +36,16 @@ ViridianCityScript_1900b: ; 1900b (6:500b) ld [hJoyHeld], a call ViridianCityScript_190cf ld a, $3 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript_1903d: ; 1903d (6:503d) CheckEvent EVENT_GOT_POKEDEX ret nz - ld a, [W_YCOORD] + ld a, [wYCoord] cp $9 ret nz - ld a, [W_XCOORD] + ld a, [wXCoord] cp $13 ret nz ld a, $5 @@ -55,7 +55,7 @@ ViridianCityScript_1903d: ; 1903d (6:503d) ld [hJoyHeld], a call ViridianCityScript_190cf ld a, $3 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript1: ; 19062 (6:5062) @@ -72,13 +72,13 @@ ViridianCityScript1: ; 19062 (6:5062) ; set up battle for Old Man ld a, BATTLE_TYPE_OLD_MAN - ld [W_BATTLETYPE], a + ld [wBattleType], a ld a, 5 - ld [W_CURENEMYLVL], a + ld [wCurEnemyLVL], a ld a, WEEDLE - ld [W_CUROPPONENT], a + ld [wCurOpponent], a ld a, $2 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript2: ; 1908f (6:508f) @@ -98,10 +98,10 @@ ViridianCityScript2: ; 1908f (6:508f) ld [hSpriteIndexOrTextID], a call DisplayTextID xor a - ld [W_BATTLETYPE], a + ld [wBattleType], a ld [wJoyIgnore], a ld a, $0 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript3: ; 190c1 (6:50c1) @@ -110,7 +110,7 @@ ViridianCityScript3: ; 190c1 (6:50c1) ret nz call Delay3 ld a, 0 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a ret ViridianCityScript_190cf: ; 190cf (6:50cf) @@ -147,7 +147,7 @@ ViridianCityText1: ; 19102 (6:5102) ViridianCityText2: ; 19107 (6:5107) TX_ASM - ld a, [W_OBTAINEDBADGES] + ld a, [wObtainedBadges] cp %01111111 ld hl, ViridianCityText_19127 jr z, .asm_ae9fe @@ -222,7 +222,7 @@ ViridianCityText5: ; 1917f (6:517f) call PrintText call ViridianCityScript_190cf ld a, $3 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a jp TextScriptEnd ViridianCityText_19191: ; 19191 (6:5191) @@ -281,7 +281,7 @@ ViridianCityText7: ; 191df (6:51df) ld hl, ViridianCityText_1920f call PrintText ld a, $1 - ld [W_VIRIDIANCITYCURSCRIPT], a + ld [wViridianCityCurScript], a jr .asm_2413a .asm_42f68 ld hl, ViridianCityText_19214 diff --git a/scripts/viridianforest.asm b/scripts/viridianforest.asm index 892eeef2..3c164046 100755 --- a/scripts/viridianforest.asm +++ b/scripts/viridianforest.asm @@ -2,9 +2,9 @@ ViridianForestScript: ; 6110d (18:510d) 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: ; 61120 (18:5120) diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm index 6cded55d..cdbe939b 100755 --- a/scripts/viridiangym.asm +++ b/scripts/viridiangym.asm @@ -5,9 +5,9 @@ ViridianGymScript: ; 748a3 (1d:48a3) 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: ; 748bf (1d:48bf) @@ -18,8 +18,8 @@ Gym8LeaderName: ; 748cd (1d:48cd) ViridianGymScript_748d6: ; 748d6 (1d:48d6) xor a ld [wJoyIgnore], a - ld [W_VIRIDIANGYMCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wViridianGymCurScript], a + ld [wCurMapScript], a ret ViridianGymScriptPointers: ; 748e1 (1d:48e1) @@ -30,9 +30,9 @@ ViridianGymScriptPointers: ; 748e1 (1d:48e1) dw ViridianGymScript4 ViridianGymScript0: ; 748eb (1d:48eb) - ld a, [W_YCOORD] + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a ld hl, ViridianGymArrowTilePlayerMovement call DecodeArrowMovementRLE @@ -46,7 +46,7 @@ ViridianGymScript0: ; 748eb (1d:48eb) ld a, $ff ld [wJoyIgnore], a ld a, $4 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: @@ -125,13 +125,13 @@ ViridianGymScript4: ; 7496b (1d:496b) ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret .asm_74980 jpba LoadSpinnerArrowTiles ViridianGymScript3: ; 74988 (1d:4988) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, ViridianGymScript_748d6 ld a, $f0 @@ -154,7 +154,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995) ld [hSpriteIndexOrTextID], a call DisplayTextID .asm_749be - ld hl, W_OBTAINEDBADGES + ld hl, wObtainedBadges set 7, [hl] ld hl, wBeatGymFlags set 7, [hl] @@ -295,9 +295,9 @@ ViridianGymText1: ; 74a69 (1d:4a69) call EngageMapTrainer call InitBattleEnemyParameters ld a, $8 - ld [W_GYMLEADERNO], a + 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 5cb6eaea..65d97519 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -2,7 +2,7 @@ ViridianMartScript: ; 1d46e (7:546e) call ViridianMartScript_1d47d call EnableAutoTextBoxDrawing ld hl, ViridianMartScriptPointers - ld a, [W_VIRIDIANMARKETCURSCRIPT] + ld a, [wViridianMarketCurScript] jp CallFunctionInTable ViridianMartScript_1d47d: ; 1d47d (7:547d) @@ -14,9 +14,9 @@ ViridianMartScript_1d47d: ; 1d47d (7:547d) ld hl, ViridianMartTextPointers + $a ; starts at ViridianMartText6 .asm_1d48c ld a, l - ld [W_MAPTEXTPTR], a + ld [wMapTextPtr], a ld a, h - ld [W_MAPTEXTPTR+1], a + ld [wMapTextPtr+1], a ret ViridianMartScriptPointers: ; 1d495 (7:5495) @@ -36,7 +36,7 @@ ViridianMartScript0: ; 1d49b (7:549b) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_VIRIDIANMARKETCURSCRIPT], a + ld [wViridianMarketCurScript], a ret RLEMovement1d4bb: ; 1d4bb (7:54bb) @@ -56,7 +56,7 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) call GiveItem SetEvent EVENT_GOT_OAKS_PARCEL ld a, $2 - ld [W_VIRIDIANMARKETCURSCRIPT], a + ld [wViridianMarketCurScript], a ; fallthrough ViridianMartScript2: ; 1d4df (7:54df) ret |