diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/oakslab.asm | 2 | ||||
| -rwxr-xr-x | scripts/route11gateupstairs.asm | 6 | ||||
| -rwxr-xr-x | scripts/route15gateupstairs.asm | 6 | ||||
| -rwxr-xr-x | scripts/route2gate.asm | 6 | ||||
| -rwxr-xr-x | scripts/ssanne8.asm | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 83815f2d..4f2ca054 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -847,7 +847,7 @@ OaksLabScript_1d157: ; 1d157 (7:5157) ld hl, $d730 set 6, [hl] ld a, $46 - call Predef + call Predef ; DisplayStarterMonDex ld hl, $d730 res 6, [hl] call ReloadMapData diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm index 0ee428c4..e03331ca 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/route11gateupstairs.asm @@ -21,9 +21,9 @@ Route11GateUpstairsText2: ; 4946c (12:546c) ld a, [$d7d6] add a jr c, .asm_4949b ; 0x49471 $28 - ld a, $1e + ld a, 30 ; pokemon needed ld [$ffdb], a - ld a, $47 + ld a, ITEMFINDER ; oak's aide reward ld [$ffdc], a ld [$d11e], a call GetItemName @@ -33,7 +33,7 @@ Route11GateUpstairsText2: ; 4946c (12:546c) ld bc, $000d call CopyData ld a, $62 - call Predef + call Predef ; call oak's aide script ld a, [$ffdb] dec a jr nz, .asm_494a1 ; 0x49494 $b diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm index 3c2afcd4..fde968bb 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/route15gateupstairs.asm @@ -10,9 +10,9 @@ Route15GateUpstairsText1: ; 49651 (12:5651) ld a, [$d7dd] bit 0, a jr nz, .asm_49683 ; 0x49657 $2a - ld a, $32 + ld a, 50 ; pokemon needed ld [$ffdb], a - ld a, EXP__ALL + ld a, EXP__ALL ; oak's aide reward ld [$ffdc], a ld [$d11e], a call GetItemName @@ -21,7 +21,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651) ld bc, $000d call CopyData ld a, $62 - call Predef + call Predef ; call oak's aide script ld a, [$ffdb] cp $1 jr nz, .asm_49689 ; 0x4967c $b diff --git a/scripts/route2gate.asm b/scripts/route2gate.asm index 9fd8e4bd..0885812e 100755 --- a/scripts/route2gate.asm +++ b/scripts/route2gate.asm @@ -10,9 +10,9 @@ Route2GateText1: ; 5d5db (17:55db) ld a, [$d7c2] bit 0, a jr nz, .asm_6592c ; 0x5d5e1 - ld a, $a + ld a, 10 ; pokemon needed ldh [$db], a - ld a, $c8 + ld a, HM_05 ; oak's aide reward ldh [$dc], a ld [$d11e], a call GetItemName ; $2fcf @@ -21,7 +21,7 @@ Route2GateText1: ; 5d5db (17:55db) ld bc, $000d call CopyData ld a, $62 - call Predef + call Predef ; call oak's aide script ldh a, [$db] cp $1 jr nz, .asm_ad646 ; 0x5d606 diff --git a/scripts/ssanne8.asm b/scripts/ssanne8.asm index 31feb058..0f1b8c7e 100755 --- a/scripts/ssanne8.asm +++ b/scripts/ssanne8.asm @@ -115,8 +115,8 @@ SSAnne8EndBattleText2: ; 61a1f (18:5a1f) TX_FAR _SSAnne8EndBattleText2 db "@" -SSAnne8Text_61a24: ; 61a24 (18:5a24) - TX_FAR _SSAnne8Text_61a24 +SSAnne8AfterBattleText2: ; 61a24 (18:5a24) + TX_FAR _SSAnne8AfterBattleText2 db "@" SSAnne8BattleText3: ; 61a29 (18:5a29) |