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/gary.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/ChampionsRoom.asm (renamed from scripts/gary.asm) | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/scripts/gary.asm b/scripts/ChampionsRoom.asm index ef1a7328..b8ce710b 100755 --- a/scripts/gary.asm +++ b/scripts/ChampionsRoom.asm @@ -1,17 +1,17 @@ -GaryScript: +ChampionsRoom_Script: call EnableAutoTextBoxDrawing - ld hl, GaryScriptPointers - ld a, [wGaryCurScript] - call JumpTable + ld hl, ChampionsRoom_ScriptPointers + ld a, [wChampionsRoomCurScript] + call CallFunctionInTable ret ResetGaryScript: xor a ld [wJoyIgnore], a - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret -GaryScriptPointers: +ChampionsRoom_ScriptPointers: dw GaryScript0 dw GaryScript1 dw GaryScript2 @@ -37,7 +37,7 @@ GaryScript1: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $2 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryEntrance_RLEMovement: @@ -76,7 +76,7 @@ GaryScript2: xor a ld [hJoyHeld], a ld a, $3 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript3: @@ -94,7 +94,7 @@ GaryScript3: ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, $4 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript4: @@ -113,7 +113,7 @@ GaryScript4: ld [wMissableObjectIndex], a predef ShowObject ld a, $5 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret OakEntranceAfterVictoryMovement: @@ -144,7 +144,7 @@ GaryScript5: ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript6: @@ -157,7 +157,7 @@ GaryScript6: ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript7: @@ -174,7 +174,7 @@ GaryScript7: ld [H_SPRITEINDEX], a call MoveSprite ld a, $8 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret OakExitGaryRoomMovement: @@ -190,7 +190,7 @@ GaryScript8: ld [wMissableObjectIndex], a predef HideObject ld a, $9 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript9: @@ -203,7 +203,7 @@ GaryScript9: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $a - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret WalkToHallOfFame_RLEMovment: @@ -218,7 +218,7 @@ GaryScript10: xor a ld [wJoyIgnore], a ld a, $0 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript_760c8: @@ -229,7 +229,7 @@ GaryScript_760c8: ld [wJoyIgnore], a ret -GaryTextPointers: +ChampionsRoom_TextPointers: dw GaryText1 dw GaryText2 dw GaryText3 |