diff options
Diffstat (limited to '')
| -rwxr-xr-x | scripts/SSAnne2F.asm (renamed from scripts/ssanne2.asm) | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/ssanne2.asm b/scripts/SSAnne2F.asm index 4f0ffa2f..77b283d2 100755 --- a/scripts/ssanne2.asm +++ b/scripts/SSAnne2F.asm @@ -1,16 +1,16 @@ -SSAnne2Script: +SSAnne2F_Script: call EnableAutoTextBoxDrawing - ld hl, SSAnne2ScriptPointers - ld a, [wSSAnne2CurScript] - jp JumpTable + ld hl, SSAnne2F_ScriptPointers + ld a, [wSSAnne2FCurScript] + jp CallFunctionInTable SSAnne2Script_613ab: xor a ld [wJoyIgnore], a - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret -SSAnne2ScriptPointers: +SSAnne2F_ScriptPointers: dw SSAnne2Script0 dw SSAnne2Script1 dw SSAnne2Script2 @@ -30,7 +30,7 @@ SSAnne2Script0: call PlayMusic ld a, [wCoordIndex] ld [$ffdb], a - ld a, HS_SS_ANNE_2_RIVAL + ld a, HS_SS_ANNE_2F_RIVAL ld [wMissableObjectIndex], a predef ShowObject call Delay3 @@ -51,7 +51,7 @@ SSAnne2Script0: .asm_61403 call MoveSprite ld a, $1 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret MovementData_6140c: @@ -101,7 +101,7 @@ SSAnne2Script1: ld [wTrainerNo], a call SSAnne2Script_61416 ld a, $2 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret SSAnne2Script2: @@ -131,7 +131,7 @@ SSAnne2Script2: call StopAllMusic callba Music_RivalAlternateStart ld a, $3 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret MovementData_614b7: @@ -151,15 +151,15 @@ SSAnne2Script3: ret nz xor a ld [wJoyIgnore], a - ld a, HS_SS_ANNE_2_RIVAL + ld a, HS_SS_ANNE_2F_RIVAL ld [wMissableObjectIndex], a predef HideObject call PlayDefaultMusic ld a, $4 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret -SSAnne2TextPointers: +SSAnne2F_TextPointers: dw SSAnne2Text1 dw SSAnne2Text2 dw SSAnne2Text3 |