diff options
Diffstat (limited to 'scripts/halloffameroom.asm')
| -rwxr-xr-x | scripts/halloffameroom.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index 8e5d1907..1bba347b 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -1,13 +1,13 @@ HallofFameRoomScript: call EnableAutoTextBoxDrawing ld hl, HallofFameRoomScriptPointers - ld a, [W_HALLOFFAMEROOMCURSCRIPT] + ld a, [wHallOfFameRoomCurScript] jp JumpTable HallofFameRoomScript_5a4aa: xor a ld [wJoyIgnore], a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret HallofFameRoomScriptPointers: @@ -33,25 +33,25 @@ HallofFameRoomScript2: inc hl set 0, [hl] xor a - ld hl, W_LORELEICURSCRIPT + ld hl, wLoreleiCurScript ld [hli], a ld [hli], a ld [hl], a - ld [W_LANCECURSCRIPT], a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wLanceCurScript], a + ld [wHallOfFameRoomCurScript], a ; Elite 4 events ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1 xor a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ld a, PALLET_TOWN ld [wLastBlackoutMap], a callba SaveSAVtoSRAM ld b, 5 -.asm_5a4ff +.delayLoop ld c, 600 / 5 call DelayFrames dec b - jr nz, .asm_5a4ff + jr nz, .delayLoop call WaitForTextScrollButtonPress jp Init @@ -65,7 +65,7 @@ HallofFameRoomScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret RLEMovement5a528: @@ -98,7 +98,7 @@ HallofFameRoomScript1: ld [wMissableObjectIndex], a predef HideObject ld a, $2 - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret HallofFameRoomTextPointers: |