diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/celadongamecorner.asm | 42 | ||||
| -rwxr-xr-x | scripts/ceruleangym.asm | 4 | ||||
| -rwxr-xr-x | scripts/copycatshouse2f.asm | 2 | ||||
| -rwxr-xr-x | scripts/fuchsiahouse2.asm | 4 | ||||
| -rwxr-xr-x | scripts/mtmoonpokecenter.asm | 6 | ||||
| -rwxr-xr-x | scripts/pewtercity.asm | 10 | ||||
| -rwxr-xr-x | scripts/pewtergym.asm | 4 | ||||
| -rwxr-xr-x | scripts/rockethideout4.asm | 4 | ||||
| -rwxr-xr-x | scripts/route2gate.asm | 6 | ||||
| -rwxr-xr-x | scripts/ssanne6.asm | 2 |
10 files changed, 42 insertions, 42 deletions
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 91d6742d..5dbbd06a 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -138,29 +138,29 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) call Has9990Coins jr nc, .asm_31338 ; 0x48cc6 xor a - ldh [$9f], a - ldh [$a1], a + ld [$ff9f], a + ld [$ffa1], a ld a, $10 - ldh [$a0], a + ld [$ffa0], a call HasEnoughMoney jr nc, .asm_b6ef0 ; 0x48cd4 ld hl, CeladonGameCornerText_48d31 ; $4d31 jr .asm_e2afd ; 0x48cd9 .asm_b6ef0 ; 0x48cdb xor a - ldh [$9f], a - ldh [$a1], a + ld [$ff9f], a + ld [$ffa1], a ld a, $10 - ldh [$a0], a + ld [$fa0], a ld hl, $ffa1 ld de, wPlayerMoney + 2 ld c, $3 predef SubBCDPredef xor a - ldh [$9f], a - ldh [$a0], a + ld [$ff9f], a + ld [$ffa0], a ld a, $50 - ldh [$a1], a + ld [$ffa1], a ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 @@ -225,10 +225,10 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a) call Has9990Coins jr nc, .asm_98546 ; 0x48d62 xor a - ldh [$9f], a - ldh [$a0], a + ld [$ff9f], a + ld [$ffa0], a ld a, $10 - ldh [$a1], a + ld [$ffa1], a ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 @@ -307,10 +307,10 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9) call Has9990Coins jr nc, .asm_f17c3 ; 0x48df1 xor a - ldh [$9f], a - ldh [$a0], a + ld [$ff9f], a + ld [$ffa0], a ld a, $20 - ldh [$a1], a + ld [$ffa1], a ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 @@ -360,10 +360,10 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b) call Has9990Coins jr z, .asm_9505a ; 0x48e53 xor a - ldh [$9f], a - ldh [$a0], a + ld [$ff9f], a + ld [$ffa0], a ld a, $20 - ldh [$a1], a + ld [$ffa1], a ld de, wPlayerCoins + 1 ld hl, $ffa1 ld c, $2 @@ -415,9 +415,9 @@ CeladonGameCornerText11: ; 48e9d (12:4e9d) call EngageMapTrainer call InitBattleEnemyParameters xor a - ldh [$b4], a - ldh [$b3], a - ldh [$b2], a + ld [hJoyHeld], a + ldh [hJoyPressed], a + ldh [hJoyReleased], a ld a, $1 ld [W_CELADONGAMECORNERCURSCRIPT], a jp TextScriptEnd diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index 079844f3..f643e264 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -127,14 +127,14 @@ CeruleanGymText1: ; 5c771 (17:4771) ld hl, CeruleanGymText_5c7d8 ld de, CeruleanGymText_5c7d8 call SaveEndBattleTextPointers - ldh a, [$8c] + ld a, [H_SPRITEINDEX] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $2 ld [W_GYMLEADERNO], a xor a - ldh [$b4], a + ld [hJoyHeld], a ld a, $3 ld [W_CERULEANGYMCURSCRIPT], a .asm_95b04 ; 0x5c7bb diff --git a/scripts/copycatshouse2f.asm b/scripts/copycatshouse2f.asm index b7a1255c..ed4e9a4f 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/copycatshouse2f.asm @@ -30,7 +30,7 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82) ld hl, ReceivedTM31Text call PrintText ld a, POKE_DOLL - ldh [$db], a + ld [$ffdb], a callba RemoveItemByID ld hl, wd7af set 0, [hl] diff --git a/scripts/fuchsiahouse2.asm b/scripts/fuchsiahouse2.asm index 33bae7e4..c8c250ab 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/fuchsiahouse2.asm @@ -34,7 +34,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2) ld hl, WardenTeethText1 call PrintText ld a, GOLD_TEETH - ldh [$db], a + ld [$ffdb], a callba RemoveItemByID ld hl, wd78e set 1, [hl] @@ -98,7 +98,7 @@ HM04NoRoomText: ; 7515e (1d:515e) FuchsiaHouse2Text5: ; 75163 (1d:5163) FuchsiaHouse2Text4: ; 75163 (1d:5163) db $08 ; asm - ldh a, [$8c] + ld a, [hSpriteIndexOrTextID] cp $4 ld hl, FuchsiaHouse2Text_7517b jr nz, .asm_4c9a2 ; 0x7516b diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index bfe9add8..080a64fe 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -35,10 +35,10 @@ MtMoonPokecenterText4: ; 492ec (12:52ec) ld a, [wCurrentMenuItem] and a jp nz, .asm_4934e - ldh [$9f], a - ldh [$a1], a + ld [$ff9f], a + ld [$ffa1], a ld a, $5 - ldh [$a0], a + ld [$ffa0], a call HasEnoughMoney jr nc, .asm_faa09 ; 0x49317 ld hl, MtMoonPokecenterText_49366 diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 55369df9..bd6872a1 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -208,12 +208,12 @@ PewterCityText3: ; 193b1 (6:53b1) ld hl, PewterCityText_193fb call PrintText xor a - ldh [$b3], a - ldh [$b4], a + ld [hJoyPressed], a + ld [hJoyHeld], a ld [wNPCMovementScriptFunctionNum], a ld a, $2 ld [wNPCMovementScriptPointerTableNum], a - ldh a, [$b8] + ld a, [H_LOADEDROMBANK] ld [wNPCMovementScriptBank], a ld a, $3 ld [wSpriteIndex], a @@ -273,11 +273,11 @@ PewterCityText5: ; 19436 (6:5436) ld hl, PewterCityText_1945d call PrintText xor a - ldh [$b4], a + ld [hJoyHeld], a ld [wNPCMovementScriptFunctionNum], a ld a, $3 ld [wNPCMovementScriptPointerTableNum], a - ldh a, [$b8] + ld a, [H_LOADEDROMBANK] ld [wNPCMovementScriptBank], a ld a, $5 ld [wSpriteIndex], a diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 9f9c7c3b..8cb6696c 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -127,14 +127,14 @@ PewterGymText1: ; 5c44e (17:444e) ld hl, PewterGymText_5c4bc ld de, PewterGymText_5c4bc call SaveEndBattleTextPointers - ldh a, [$8c] + ld a, [H_SPRITEINDEX] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $1 ld [W_GYMLEADERNO], a xor a - ldh [$b4], a + ld [hJoyHeld], a ld a, $3 ld [W_PEWTERGYMCURSCRIPT], a ld [W_CURMAPSCRIPT], a diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index f1b46653..845b7730 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -131,12 +131,12 @@ RocketHideout4Text1: ; 4553a (11:553a) ld hl, RocketHideout4Text_4557f ld de, RocketHideout4Text_4557f call SaveEndBattleTextPointers - ldh a, [$8c] + ld a, [H_SPRITEINDEX] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters xor a - ldh [$b4], a + ld [hJoyHeld], a ld a, $3 ld [W_ROCKETHIDEOUT4CURSCRIPT], a ld [W_CURMAPSCRIPT], a diff --git a/scripts/route2gate.asm b/scripts/route2gate.asm index 8ee087c8..97067e70 100755 --- a/scripts/route2gate.asm +++ b/scripts/route2gate.asm @@ -11,9 +11,9 @@ Route2GateText1: ; 5d5db (17:55db) bit 0, a jr nz, .asm_6592c ; 0x5d5e1 ld a, 10 ; pokemon needed - ldh [$db], a + ld [$ffdb], a ld a, HM_05 ; oak's aide reward - ldh [$dc], a + ld [$ffdc], a ld [wd11e], a call GetItemName ; $2fcf ld hl, wcd6d @@ -21,7 +21,7 @@ Route2GateText1: ; 5d5db (17:55db) ld bc, $000d call CopyData predef OaksAideScript ; call oak's aide script - ldh a, [$db] + ld a, [$ffdb] cp $1 jr nz, .asm_ad646 ; 0x5d606 ld hl, wd7c2 diff --git a/scripts/ssanne6.asm b/scripts/ssanne6.asm index d3ec191f..ded8e719 100755 --- a/scripts/ssanne6.asm +++ b/scripts/ssanne6.asm @@ -39,7 +39,7 @@ SSAnne6Text7: ; 617e3 (18:57e3) db $08 ; asm ld hl, SSAnne6Text_61807 call PrintText - ldh a, [$d3] + ld a, [hRandomAdd] bit 7, a jr z, .asm_93eb1 ; 0x617ee ld hl, SSAnne6Text_6180c |