diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/HallOfFame.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/HallOfFame.asm')
| -rw-r--r-- | scripts/HallOfFame.asm | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 45cef29c..d5102830 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -4,22 +4,23 @@ HallOfFame_Script: ld a, [wHallOfFameCurScript] jp CallFunctionInTable -HallofFameRoomScript_5a4aa: +HallofFameRoomClearScripts: ; unreferenced xor a ld [wJoyIgnore], a ld [wHallOfFameCurScript], a ret HallOfFame_ScriptPointers: - dw HallofFameRoomScript0 - dw HallofFameRoomScript1 - dw HallofFameRoomScript2 - dw HallofFameRoomScript3 + def_script_pointers + dw_const HallOfFameDefaultScript, SCRIPT_HALLOFFAME_DEFAULT + dw_const HallOfFameOakCongratulationsScript, SCRIPT_HALLOFFAME_OAK_CONGRATULATIONS + dw_const HallOfFameResetEventsAndSaveScript, SCRIPT_HALLOFFAME_RESET_EVENTS_AND_SAVE + dw_const HallOfFameNoopScript, SCRIPT_HALLOFFAME_NOOP -HallofFameRoomScript3: +HallOfFameNoopScript: ret -HallofFameRoomScript2: +HallOfFameResetEventsAndSaveScript: call Delay3 ld a, [wLetterPrintingDelayFlags] push af @@ -31,8 +32,8 @@ HallofFameRoomScript2: ld hl, wFlags_D733 res 1, [hl] inc hl - set 0, [hl] - xor a + set BIT_TEST_BATTLE, [hl] ; debug, unused? + xor a ; SCRIPT_*_DEFAULT ld hl, wLoreleisRoomCurScript ld [hli], a ; wLoreleisRoomCurScript ld [hli], a ; wBrunosRoomCurScript @@ -55,30 +56,30 @@ HallofFameRoomScript2: call WaitForTextScrollButtonPress jp Init -HallofFameRoomScript0: - ld a, $ff +HallOfFameDefaultScript: + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld hl, wSimulatedJoypadStatesEnd - ld de, RLEMovement5a528 + ld de, HallOfFameEntryMovement call DecodeRLEList dec a ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates - ld a, $1 + ld a, SCRIPT_HALLOFFAME_OAK_CONGRATULATIONS ld [wHallOfFameCurScript], a ret -RLEMovement5a528: +HallOfFameEntryMovement: db D_UP, 5 db -1 ; end -HallofFameRoomScript1: +HallOfFameOakCongratulationsScript: ld a, [wSimulatedJoypadStatesIndex] and a ret nz ld a, PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a - ld a, $1 + ld a, HALLOFFAME_OAK ldh [hSpriteIndex], a call SetSpriteMovementBytesToFF ld a, SPRITE_FACING_LEFT @@ -89,21 +90,22 @@ HallofFameRoomScript1: ld [wJoyIgnore], a inc a ; PLAYER_DIR_RIGHT ld [wPlayerMovingDirection], a - ld a, $1 + ld a, TEXT_HALLOFFAME_OAK ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff + ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN ld [wJoyIgnore], a ld a, HS_CERULEAN_CAVE_GUY ld [wMissableObjectIndex], a predef HideObject - ld a, $2 + ld a, SCRIPT_HALLOFFAME_RESET_EVENTS_AND_SAVE ld [wHallOfFameCurScript], a ret HallOfFame_TextPointers: - dw HallofFameRoomText1 + def_text_pointers + dw_const HallOfFameOakText, TEXT_HALLOFFAME_OAK -HallofFameRoomText1: - text_far _HallofFameRoomText1 +HallOfFameOakText: + text_far _HallOfFameOakText text_end |