diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
| commit | f5983c0f813d3d908b6016db3ed866e4ca9437dc (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /scripts/halloffameroom.asm | |
| parent | 041c4f28a3c35e31329222769534942439b70f29 (diff) | |
| parent | 401d6e7f36e86aa246a2c0591195e1f0f01e879f (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/halloffameroom.asm')
| -rwxr-xr-x | scripts/halloffameroom.asm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index 0f975673..1bba347b 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -1,25 +1,25 @@ -HallofFameRoomScript: ; 5a49e (16:649e) +HallofFameRoomScript: call EnableAutoTextBoxDrawing ld hl, HallofFameRoomScriptPointers - ld a, [W_HALLOFFAMEROOMCURSCRIPT] + ld a, [wHallOfFameRoomCurScript] jp JumpTable -HallofFameRoomScript_5a4aa: ; 5a4aa (16:64aa) +HallofFameRoomScript_5a4aa: xor a ld [wJoyIgnore], a - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret -HallofFameRoomScriptPointers: ; 5a4b2 (16:64b2) +HallofFameRoomScriptPointers: dw HallofFameRoomScript0 dw HallofFameRoomScript1 dw HallofFameRoomScript2 dw HallofFameRoomScript3 -HallofFameRoomScript3: ; 5a4ba (16:64ba) +HallofFameRoomScript3: ret -HallofFameRoomScript2: ; 5a4bb (16:64bb) +HallofFameRoomScript2: call Delay3 ld a, [wLetterPrintingDelayFlags] push af @@ -33,29 +33,29 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb) 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 -HallofFameRoomScript0: ; 5a50d (16:650d) +HallofFameRoomScript0: ld a, $ff ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd @@ -65,14 +65,14 @@ HallofFameRoomScript0: ; 5a50d (16:650d) ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret -RLEMovement5a528: ; 5a528 (16:6528) +RLEMovement5a528: db D_UP,$5 db $ff -HallofFameRoomScript1: ; 5a52b (16:652b) +HallofFameRoomScript1: ld a, [wSimulatedJoypadStatesIndex] and a ret nz @@ -98,12 +98,12 @@ HallofFameRoomScript1: ; 5a52b (16:652b) ld [wMissableObjectIndex], a predef HideObject ld a, $2 - ld [W_HALLOFFAMEROOMCURSCRIPT], a + ld [wHallOfFameRoomCurScript], a ret -HallofFameRoomTextPointers: ; 5a56a (16:656a) +HallofFameRoomTextPointers: dw HallofFameRoomText1 -HallofFameRoomText1: ; 5a56c (16:656c) +HallofFameRoomText1: TX_FAR _HallofFameRoomText1 db "@" |