diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/HallOfFame.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/HallOfFame.asm (renamed from scripts/halloffameroom.asm) | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/scripts/halloffameroom.asm b/scripts/HallOfFame.asm index 1bba347b..af424089 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/HallOfFame.asm @@ -1,16 +1,16 @@ -HallofFameRoomScript: +HallOfFame_Script: call EnableAutoTextBoxDrawing - ld hl, HallofFameRoomScriptPointers - ld a, [wHallOfFameRoomCurScript] - jp JumpTable + 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: @@ -94,14 +94,14 @@ HallofFameRoomScript1: call DisplayTextID ld a, $ff ld [wJoyIgnore], a - ld a, HS_UNKNOWN_DUNGEON_GUY + ld a, HS_CERULEAN_CAVE_GUY ld [wMissableObjectIndex], a predef HideObject ld a, $2 - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ret -HallofFameRoomTextPointers: +HallOfFame_TextPointers: dw HallofFameRoomText1 HallofFameRoomText1: |