diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 15:06:23 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 23:33:10 -0500 |
| commit | c7796024590fec48ac79756793c1a6e3b54daf8f (patch) | |
| tree | 0d61caa7ebe429995a61e800d1d78c3a82aec886 /scripts/gary.asm | |
| parent | Merge pull request #193 from luckytyphlosion/master (diff) | |
| download | pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip | |
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | scripts/ChampionsRoom.asm (renamed from scripts/gary.asm) | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/gary.asm b/scripts/ChampionsRoom.asm index 1fe65fb0..e3cdc6d2 100755 --- a/scripts/gary.asm +++ b/scripts/ChampionsRoom.asm @@ -1,16 +1,16 @@ -GaryScript: +ChampionsRoom_Script: call EnableAutoTextBoxDrawing - ld hl, GaryScriptPointers - ld a, [wGaryCurScript] + ld hl, ChampionsRoom_ScriptPointers + ld a, [wChampionsRoomCurScript] jp CallFunctionInTable ResetGaryScript: xor a ld [wJoyIgnore], a - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret -GaryScriptPointers: +ChampionsRoom_ScriptPointers: dw GaryScript0 dw GaryScript1 dw GaryScript2 @@ -36,7 +36,7 @@ GaryScript1: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $2 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryEntrance_RLEMovement: @@ -86,7 +86,7 @@ GaryScript2: xor a ld [hJoyHeld], a ld a, $3 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript3: @@ -104,7 +104,7 @@ GaryScript3: ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, $4 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript4: @@ -123,7 +123,7 @@ GaryScript4: ld [wMissableObjectIndex], a predef ShowObject ld a, $5 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret OakEntranceAfterVictoryMovement: @@ -154,7 +154,7 @@ GaryScript5: ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript6: @@ -167,7 +167,7 @@ GaryScript6: ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript7: @@ -184,7 +184,7 @@ GaryScript7: ld [H_SPRITEINDEX], a call MoveSprite ld a, $8 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret OakExitGaryRoomMovement: @@ -200,7 +200,7 @@ GaryScript8: ld [wMissableObjectIndex], a predef HideObject ld a, $9 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript9: @@ -213,7 +213,7 @@ GaryScript9: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $a - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret WalkToHallOfFame_RLEMovment: @@ -228,7 +228,7 @@ GaryScript10: xor a ld [wJoyIgnore], a ld a, $0 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript_760c8: @@ -239,7 +239,7 @@ GaryScript_760c8: ld [wJoyIgnore], a ret -GaryTextPointers: +ChampionsRoom_TextPointers: dw GaryText1 dw GaryText2 dw GaryText3 |