diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/SafariZoneGate.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/SafariZoneGate.asm (renamed from scripts/safarizoneentrance.asm) | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/safarizoneentrance.asm b/scripts/SafariZoneGate.asm index 063a6d0b..217001dd 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/SafariZoneGate.asm @@ -1,11 +1,11 @@ -SafariZoneEntranceScript: +SafariZoneGate_Script: call EnableAutoTextBoxDrawing - ld hl, SafariZoneEntranceScriptPointers - ld a, [wSafariZoneEntranceCurScript] - call JumpTable + ld hl, SafariZoneGate_ScriptPointers + ld a, [wSafariZoneGateCurScript] + call CallFunctionInTable ret -SafariZoneEntranceScriptPointers: +SafariZoneGate_ScriptPointers: dw .SafariZoneEntranceScript0 dw .SafariZoneEntranceScript1 dw .SafariZoneEntranceScript2 @@ -31,7 +31,7 @@ SafariZoneEntranceScriptPointers: cp $1 jr z, .asm_7520f ld a, $2 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .asm_7520f ld a, D_RIGHT @@ -40,7 +40,7 @@ SafariZoneEntranceScriptPointers: ld a, $f0 ld [wJoyIgnore], a ld a, $1 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .CoordsData_75221: @@ -69,7 +69,7 @@ SafariZoneEntranceScriptPointers: xor a ld [wJoyIgnore], a ld a, $5 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .SafariZoneEntranceScript5 @@ -92,7 +92,7 @@ SafariZoneEntranceScriptPointers: ld c, $3 call SafariZoneEntranceAutoWalk ld a, $4 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a jr .asm_75286 .asm_7527f ld a, $5 @@ -107,7 +107,7 @@ SafariZoneEntranceScriptPointers: xor a ld [wJoyIgnore], a ld a, $0 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .SafariZoneEntranceScript6 @@ -115,7 +115,7 @@ SafariZoneEntranceScriptPointers: ret nz call Delay3 ld a, [wcf0d] - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret SafariZoneEntranceAutoWalk: @@ -133,7 +133,7 @@ SafariZoneEntranceScript_752b4: and a ret -SafariZoneEntranceTextPointers: +SafariZoneGate_TextPointers: dw .SafariZoneEntranceText1 dw .SafariZoneEntranceText2 dw .SafariZoneEntranceText1 @@ -180,7 +180,7 @@ SafariZoneEntranceTextPointers: ld [wcf0d], a .asm_753b3 ld a, $6 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a jp TextScriptEnd .SafariZoneEntranceText_753bb |