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/HallOfFame.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/HallOfFame.asm (renamed from scripts/halloffameroom.asm) | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/scripts/halloffameroom.asm b/scripts/HallOfFame.asm index 94e64431..511c9754 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/HallOfFame.asm @@ -1,16 +1,16 @@ -HallofFameRoomScript: +HallOfFame_Script: call EnableAutoTextBoxDrawing - ld hl, HallofFameRoomScriptPointers - ld a, [wHallOfFameRoomCurScript] + ld hl, HallOfFame_ScriptPointers + ld a, [wHallOfFameCurScript] jp CallFunctionInTable HallofFameRoomScript_5a4aa: xor a ld [wJoyIgnore], a - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ret -HallofFameRoomScriptPointers: +HallOfFame_ScriptPointers: dw HallofFameRoomScript0 dw HallofFameRoomScript1 dw HallofFameRoomScript2 @@ -33,16 +33,16 @@ HallofFameRoomScript2: inc hl set 0, [hl] xor a - ld hl, wLoreleiCurScript - ld [hli], a - ld [hli], a - ld [hl], a - ld [wLanceCurScript], a - ld [wHallOfFameRoomCurScript], a + ld hl, wLoreleisRoomCurScript + ld [hli], a ; wLoreleisRoomCurScript + ld [hli], a ; wBrunosRoomCurScript + ld [hl], a ; wAgathasRoomCurScript + ld [wLancesRoomCurScript], a + ld [wHallOfFameCurScript], a ; Elite 4 events ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1 xor a - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ld a, PALLET_TOWN ld [wLastBlackoutMap], a callba SaveSAVtoSRAM @@ -65,7 +65,7 @@ HallofFameRoomScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ret RLEMovement5a528: @@ -98,10 +98,10 @@ HallofFameRoomScript1: ld [wMissableObjectIndex], a predef HideObject ld a, $2 - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ret -HallofFameRoomTextPointers: +HallOfFame_TextPointers: dw HallofFameRoomText1 HallofFameRoomText1: |