diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /scripts/SSAnne2F.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | scripts/SSAnne2F.asm (renamed from scripts/ssanne2.asm) | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/ssanne2.asm b/scripts/SSAnne2F.asm index 654b881a..ba900748 100755 --- a/scripts/ssanne2.asm +++ b/scripts/SSAnne2F.asm @@ -1,16 +1,16 @@ -SSAnne2Script: +SSAnne2F_Script: call EnableAutoTextBoxDrawing - ld hl, SSAnne2ScriptPointers - ld a, [wSSAnne2CurScript] + 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 @@ -32,7 +32,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 @@ -53,7 +53,7 @@ SSAnne2Script0: .asm_61403 call MoveSprite ld a, $1 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret MovementData_6140c: @@ -118,7 +118,7 @@ SSAnne2Script1: call SSAnne2Script_61416 ld a, $2 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret SSAnne2Script2: @@ -150,7 +150,7 @@ SSAnne2Script2: call PlaySound callba Music_RivalAlternateStart ld a, $3 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret MovementData_614b7: @@ -170,15 +170,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 |