From a39a68356236af3850310a64233c3a16edbb92bf Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Fri, 11 Jun 2021 18:45:36 -0500 Subject: Normalize line endings --- src/engine/sequences/credits_sequence_commands.asm | 928 ++++++++++----------- src/engine/sequences/opening_sequence_commands.asm | 650 +++++++-------- 2 files changed, 789 insertions(+), 789 deletions(-) (limited to 'src/engine/sequences') diff --git a/src/engine/sequences/credits_sequence_commands.asm b/src/engine/sequences/credits_sequence_commands.asm index 9b66fd4..0fde871 100644 --- a/src/engine/sequences/credits_sequence_commands.asm +++ b/src/engine/sequences/credits_sequence_commands.asm @@ -1,464 +1,464 @@ -SetCreditsSequenceCmdPtr: ; 1d7fc (7:57fc) - ld a, LOW(CreditsSequence) - ld [wSequenceCmdPtr + 0], a - ld a, HIGH(CreditsSequence) - ld [wSequenceCmdPtr + 1], a - xor a - ld [wSequenceDelay], a - ret - -ExecuteCreditsSequenceCmd: ; 1d80b (7:580b) - ld a, [wSequenceDelay] - or a - jr z, .call_func - cp $ff - ret z ; sequence ended - - dec a ; still waiting - ld [wSequenceDelay], a - ret - -.call_func - ld a, [wSequenceCmdPtr + 0] - ld l, a - ld a, [wSequenceCmdPtr + 1] - ld h, a - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - push de - ld a, [hli] - ld c, a - ld a, [hli] - ld b, a - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - pop hl - call CallHL2 - jr ExecuteCreditsSequenceCmd - - ret ; stray ret - -AdvanceCreditsSequenceCmdPtrBy2: ; 1d835 (7:5835) - ld a, 2 - jr AdvanceCreditsSequenceCmdPtr - -AdvanceCreditsSequenceCmdPtrBy3: ; 1d839 (7:5839) - ld a, 3 - jr AdvanceCreditsSequenceCmdPtr - -AdvanceCreditsSequenceCmdPtrBy5: ; 1d83d (7:583d) - ld a, 5 - jr AdvanceCreditsSequenceCmdPtr - -AdvanceCreditsSequenceCmdPtrBy6: ; 1d841 (7:5841) - ld a, 6 - jr AdvanceCreditsSequenceCmdPtr - -AdvanceCreditsSequenceCmdPtrBy4: ; 1d845 (7:5845) - ld a, 4 -; fallthrough - -AdvanceCreditsSequenceCmdPtr: ; 1d847 (7:5847) - push hl - ld hl, wSequenceCmdPtr - add [hl] - ld [hli], a - ld a, [hl] - adc 0 - ld [hl], a - pop hl - ret - -CreditsSequenceCmd_Wait: ; 1d853 (7:5853) - ld a, c - ld [wSequenceDelay], a - jp AdvanceCreditsSequenceCmdPtrBy3 - -CreditsSequenceCmd_LoadScene: ; 1d85a (7:585a) - push bc - push de - farcall ClearNumLoadedFramesetSubgroups - call EmptyScreen - xor a - ldh [hSCX], a - ldh [hSCY], a - farcall Func_1288c - pop de - pop bc - ld a, c - ld c, b - ld b, a - ld a, e - call LoadScene - jp AdvanceCreditsSequenceCmdPtrBy5 - -CreditsSequenceCmd_LoadBooster: ; 1d878 (7:5878) - push bc - push de - farcall ClearNumLoadedFramesetSubgroups - call EmptyScreen - xor a - ldh [hSCX], a - ldh [hSCY], a - farcall Func_1288c - pop de - pop bc - ld a, c - ld c, b - ld b, a - ld a, e - farcall LoadBoosterGfx - jp AdvanceCreditsSequenceCmdPtrBy5 - -CreditsSequenceCmd_LoadClubMap: ; 1d897 (7:5897) - ld b, $00 - ld hl, wMastersBeatenList - add hl, bc - ld a, [hl] - or a - jr nz, .at_least_1 - inc a -.at_least_1 - dec a - ld c, a - add a - add a - add c ; *5 - ld c, a - ld hl, .CreditsOWClubMaps - add hl, bc - ld a, [hli] ; map x coord - ld c, a - ld a, [hli] ; map y coord - ld b, a - ld a, [hli] ; map ID - ld e, a - push hl - call LoadOWMapForCreditsSequence - pop hl - ld a, [hli] - ld h, [hl] - ld l, a - or h - jr z, .done - -.loop_npcs - ld a, [hli] ; NPC ID - or a - jr z, .done - ld d, a - ld a, [hli] ; NPC x coord - ld c, a - ld a, [hli] ; NPC y coord - ld b, a - ld a, [hli] ; NPC direction - ld e, a - push hl - call LoadNPCForCreditsSequence - pop hl - jr .loop_npcs - -.done - jp AdvanceCreditsSequenceCmdPtrBy3 - -credits_club_map: MACRO - db \1 ; x - db \2 ; y - db \3 ; OW map - dw \4 ; list of NPCs to load -ENDM - -.CreditsOWClubMaps - credits_club_map 16, 0, FIGHTING_CLUB, .CreditsNPCs_FightingClub - credits_club_map 32, 0, ROCK_CLUB, .CreditsNPCs_RockClub - credits_club_map 64, 0, WATER_CLUB, .CreditsNPCs_WaterClub - credits_club_map 32, 0, LIGHTNING_CLUB, .CreditsNPCs_LightningClub - credits_club_map 32, 0, GRASS_CLUB, .CreditsNPCs_GrassClub - credits_club_map 32, 16, PSYCHIC_CLUB, .CreditsNPCs_PsychicClub - credits_club_map 0, 0, SCIENCE_CLUB, .CreditsNPCs_ScienceClub - credits_club_map 32, 0, FIRE_CLUB, .CreditsNPCs_FireClub - credits_club_map 32, 0, CHALLENGE_HALL, .CreditsNPCs_ChallengeHall - credits_club_map 48, 0, POKEMON_DOME, .CreditsNPCs_PokemonDome - -.CreditsNPCs_FightingClub - ; NPC ID, x, y, direction - db NPC_CHRIS, 4, 8, SOUTH - db NPC_MICHAEL, 14, 10, SOUTH - db NPC_JESSICA, 18, 6, EAST - db NPC_MITCH, 10, 4, SOUTH - db NPC_PLAYER_CREDITS, 10, 6, NORTH - db $00 - -.CreditsNPCs_RockClub - ; NPC ID, x, y, direction - db NPC_RYAN, 20, 14, EAST - db NPC_GENE, 12, 6, SOUTH - db NPC_PLAYER_CREDITS, 12, 8, NORTH - db $00 - -.CreditsNPCs_WaterClub - ; NPC ID, x, y, direction - db NPC_JOSHUA, 22, 8, SOUTH - db NPC_AMY, 22, 4, NORTH - db NPC_PLAYER_CREDITS, 18, 10, NORTH - db $00 - -.CreditsNPCs_LightningClub - ; NPC ID, x, y, direction - db NPC_NICHOLAS, 6, 10, SOUTH - db NPC_BRANDON, 22, 12, NORTH - db NPC_ISAAC, 12, 4, NORTH - db NPC_PLAYER_CREDITS, 12, 10, NORTH - db $00 - -.CreditsNPCs_GrassClub - ; NPC ID, x, y, direction - db NPC_KRISTIN, 4, 10, EAST - db NPC_HEATHER, 14, 16, SOUTH - db NPC_NIKKI, 12, 4, SOUTH - db NPC_PLAYER_CREDITS, 12, 6, NORTH - db $00 - -.CreditsNPCs_PsychicClub - ; NPC ID, x, y, direction - db NPC_DANIEL, 8, 8, NORTH - db NPC_STEPHANIE, 22, 12, EAST - db NPC_MURRAY1, 12, 6, SOUTH - db NPC_PLAYER_CREDITS, 12, 8, NORTH - db $00 - -.CreditsNPCs_ScienceClub - ; NPC ID, x, y, direction - db NPC_JOSEPH, 10, 10, WEST - db NPC_RICK, 4, 4, SOUTH - db NPC_PLAYER_CREDITS, 4, 6, NORTH - db $00 - -.CreditsNPCs_FireClub - ; NPC ID, x, y, direction - db NPC_ADAM, 8, 14, SOUTH - db NPC_JONATHAN, 18, 10, SOUTH - db NPC_KEN, 14, 4, SOUTH - db NPC_PLAYER_CREDITS, 14, 6, NORTH - db $00 - -.CreditsNPCs_ChallengeHall - ; NPC ID, x, y, direction - db NPC_HOST, 14, 4, SOUTH - db NPC_RONALD1, 18, 8, WEST - db NPC_PLAYER_CREDITS, 12, 8, EAST - db $00 - -.CreditsNPCs_PokemonDome - ; NPC ID, x, y, direction - db NPC_COURTNEY, 18, 4, SOUTH - db NPC_STEVE, 22, 4, SOUTH - db NPC_JACK, 8, 4, SOUTH - db NPC_ROD, 14, 6, SOUTH - db NPC_PLAYER_CREDITS, 14, 10, NORTH - db $00 - -; bc = coordinates -; e = OW map -LoadOWMapForCreditsSequence: ; 1d9a6 (7:59a6) - push bc - push de - call EmptyScreen - pop de - pop bc - - ; set input coordinates and map - ld a, c - ldh [hSCX], a - ld a, b - ldh [hSCY], a - ld a, e - ld [wCurMap], a - - farcall LoadMapTilesAndPals - farcall Func_c9c7 - farcall SafelyCopyBGMapFromSRAMToVRAM - farcall DoMapOWFrame - xor a - ld [wd4ca], a - ld [wd4cb], a - ld a, PALETTE_29 - farcall LoadPaletteData - ret - -CreditsSequenceCmd_LoadOWMap: ; 1d9d5 (7:59d5) - call LoadOWMapForCreditsSequence - jp AdvanceCreditsSequenceCmdPtrBy5 - -CreditsSequenceCmd_DisableLCD: ; 1d9db (7:59db) - call DisableLCD - jp AdvanceCreditsSequenceCmdPtrBy2 - -CreditsSequenceCmd_FadeIn: ; 1d9e1 (7:59e1) - call DisableLCD - call Set_WD_on - farcall Func_10af9 - jp AdvanceCreditsSequenceCmdPtrBy2 - -CreditsSequenceCmd_FadeOut: ; 1d9ee (7:59ee) - farcall Func_10ab4 - call Func_3ca4 - call EnableLCD - call DoFrameIfLCDEnabled - call DisableLCD - call Set_WD_off - jp AdvanceCreditsSequenceCmdPtrBy2 - -CreditsSequenceCmd_DrawRectangle: ; 1da04 (7:5a04) - ld a, c - or $20 - ld e, a - ld d, $00 - ld c, b - ld b, 20 - xor a - lb hl, 0, 0 - call FillRectangle - jp AdvanceCreditsSequenceCmdPtrBy4 - -CreditsSequenceCmd_PrintText: ; 1da17 (7:5a17) - ld a, $01 - ld [wLineSeparation], a - push de - ld d, c - ld a, b - or $20 - ld e, a - call InitTextPrinting - pop hl - call PrintTextNoDelay - jp AdvanceCreditsSequenceCmdPtrBy6 - -CreditsSequenceCmd_PrintTextBox: ; 1da2c (7:5a2c) - ld a, $01 - ld [wLineSeparation], a - push de - ld d, c - ld e, b - call InitTextPrinting - pop hl - call PrintTextNoDelay - jp AdvanceCreditsSequenceCmdPtrBy6 - -CreditsSequenceCmd_InitOverlay: ; 1da3e (7:5a3e) - ld a, c - ld [wd647], a - ld a, b - ld [wd648], a - ld a, e - ld [wd649], a - ld a, d - ld [wd64a], a - call Func_1d765 - jp AdvanceCreditsSequenceCmdPtrBy6 - -CreditsSequenceCmd_LoadNPC: ; 1da54 (7:5a54) - call LoadNPCForCreditsSequence - jp AdvanceCreditsSequenceCmdPtrBy6 - -; bc = coordinates -; e = direction -; d = NPC ID -LoadNPCForCreditsSequence: ; 1da5a (7:5a5a) - ld a, c - ld [wLoadNPCXPos], a - ld a, b - ld [wLoadNPCYPos], a - ld a, e - ld [wLoadNPCDirection], a - ld a, d - farcall LoadNPCSpriteData - ld a, [wNPCSpriteID] - farcall CreateSpriteAndAnimBufferEntry - - ld c, SPRITE_ANIM_COORD_X - call GetSpriteAnimBufferProperty - ldh a, [hSCX] - ld c, a - ld a, [wLoadNPCXPos] - add a - add a - add a ; *8 - add 8 - sub c - ld [hli], a ; x - ldh a, [hSCY] - ld c, a - ld a, [wLoadNPCYPos] - add a - add a - add a ; *8 - add 16 - sub c - ld [hli], a ; y - - ld a, [wNPCAnim] - ld c, a - ld a, [wLoadNPCDirection] - add c - farcall StartNewSpriteAnimation - ret - -CreditsSequenceCmd_InitVolcanoSprite: ; 1da9e (7:5a9e) - farcall OverworldMap_InitVolcanoSprite - jp AdvanceCreditsSequenceCmdPtrBy2 - -CreditsSequenceCmd_TransformOverlay: ; 1daa5 (7:5aa5) -; either stretches or shrinks overlay -; to the input configurations - ld l, 0 - ld a, [wd647] - call .Func_1dade - ld [wd647], a - ld a, [wd648] - ld c, b - call .Func_1dade - ld [wd648], a - ld a, [wd649] - ld c, e - call .Func_1dade - ld [wd649], a - ld a, [wd64a] - ld c, d - call .Func_1dade - ld [wd64a], a - ld a, l - or a - jr z, .advance_sequence - ld a, 1 - ld [wSequenceDelay], a - ret - -.advance_sequence - call Func_1d765 - jp AdvanceCreditsSequenceCmdPtrBy6 - -; compares a with c -; if it's smaller: increase by 2 and increment l -; if it's larger: decrease by 2 and increment l -; if it's equal or $ff: do nothing -.Func_1dade - cp $ff - jr z, .done - cp c - jr z, .done - inc l - jr c, .incr_a -; decr a - dec a - dec a - jr .done -.incr_a - inc a - inc a -.done - ret +SetCreditsSequenceCmdPtr: ; 1d7fc (7:57fc) + ld a, LOW(CreditsSequence) + ld [wSequenceCmdPtr + 0], a + ld a, HIGH(CreditsSequence) + ld [wSequenceCmdPtr + 1], a + xor a + ld [wSequenceDelay], a + ret + +ExecuteCreditsSequenceCmd: ; 1d80b (7:580b) + ld a, [wSequenceDelay] + or a + jr z, .call_func + cp $ff + ret z ; sequence ended + + dec a ; still waiting + ld [wSequenceDelay], a + ret + +.call_func + ld a, [wSequenceCmdPtr + 0] + ld l, a + ld a, [wSequenceCmdPtr + 1] + ld h, a + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + push de + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + pop hl + call CallHL2 + jr ExecuteCreditsSequenceCmd + + ret ; stray ret + +AdvanceCreditsSequenceCmdPtrBy2: ; 1d835 (7:5835) + ld a, 2 + jr AdvanceCreditsSequenceCmdPtr + +AdvanceCreditsSequenceCmdPtrBy3: ; 1d839 (7:5839) + ld a, 3 + jr AdvanceCreditsSequenceCmdPtr + +AdvanceCreditsSequenceCmdPtrBy5: ; 1d83d (7:583d) + ld a, 5 + jr AdvanceCreditsSequenceCmdPtr + +AdvanceCreditsSequenceCmdPtrBy6: ; 1d841 (7:5841) + ld a, 6 + jr AdvanceCreditsSequenceCmdPtr + +AdvanceCreditsSequenceCmdPtrBy4: ; 1d845 (7:5845) + ld a, 4 +; fallthrough + +AdvanceCreditsSequenceCmdPtr: ; 1d847 (7:5847) + push hl + ld hl, wSequenceCmdPtr + add [hl] + ld [hli], a + ld a, [hl] + adc 0 + ld [hl], a + pop hl + ret + +CreditsSequenceCmd_Wait: ; 1d853 (7:5853) + ld a, c + ld [wSequenceDelay], a + jp AdvanceCreditsSequenceCmdPtrBy3 + +CreditsSequenceCmd_LoadScene: ; 1d85a (7:585a) + push bc + push de + farcall ClearNumLoadedFramesetSubgroups + call EmptyScreen + xor a + ldh [hSCX], a + ldh [hSCY], a + farcall Func_1288c + pop de + pop bc + ld a, c + ld c, b + ld b, a + ld a, e + call LoadScene + jp AdvanceCreditsSequenceCmdPtrBy5 + +CreditsSequenceCmd_LoadBooster: ; 1d878 (7:5878) + push bc + push de + farcall ClearNumLoadedFramesetSubgroups + call EmptyScreen + xor a + ldh [hSCX], a + ldh [hSCY], a + farcall Func_1288c + pop de + pop bc + ld a, c + ld c, b + ld b, a + ld a, e + farcall LoadBoosterGfx + jp AdvanceCreditsSequenceCmdPtrBy5 + +CreditsSequenceCmd_LoadClubMap: ; 1d897 (7:5897) + ld b, $00 + ld hl, wMastersBeatenList + add hl, bc + ld a, [hl] + or a + jr nz, .at_least_1 + inc a +.at_least_1 + dec a + ld c, a + add a + add a + add c ; *5 + ld c, a + ld hl, .CreditsOWClubMaps + add hl, bc + ld a, [hli] ; map x coord + ld c, a + ld a, [hli] ; map y coord + ld b, a + ld a, [hli] ; map ID + ld e, a + push hl + call LoadOWMapForCreditsSequence + pop hl + ld a, [hli] + ld h, [hl] + ld l, a + or h + jr z, .done + +.loop_npcs + ld a, [hli] ; NPC ID + or a + jr z, .done + ld d, a + ld a, [hli] ; NPC x coord + ld c, a + ld a, [hli] ; NPC y coord + ld b, a + ld a, [hli] ; NPC direction + ld e, a + push hl + call LoadNPCForCreditsSequence + pop hl + jr .loop_npcs + +.done + jp AdvanceCreditsSequenceCmdPtrBy3 + +credits_club_map: MACRO + db \1 ; x + db \2 ; y + db \3 ; OW map + dw \4 ; list of NPCs to load +ENDM + +.CreditsOWClubMaps + credits_club_map 16, 0, FIGHTING_CLUB, .CreditsNPCs_FightingClub + credits_club_map 32, 0, ROCK_CLUB, .CreditsNPCs_RockClub + credits_club_map 64, 0, WATER_CLUB, .CreditsNPCs_WaterClub + credits_club_map 32, 0, LIGHTNING_CLUB, .CreditsNPCs_LightningClub + credits_club_map 32, 0, GRASS_CLUB, .CreditsNPCs_GrassClub + credits_club_map 32, 16, PSYCHIC_CLUB, .CreditsNPCs_PsychicClub + credits_club_map 0, 0, SCIENCE_CLUB, .CreditsNPCs_ScienceClub + credits_club_map 32, 0, FIRE_CLUB, .CreditsNPCs_FireClub + credits_club_map 32, 0, CHALLENGE_HALL, .CreditsNPCs_ChallengeHall + credits_club_map 48, 0, POKEMON_DOME, .CreditsNPCs_PokemonDome + +.CreditsNPCs_FightingClub + ; NPC ID, x, y, direction + db NPC_CHRIS, 4, 8, SOUTH + db NPC_MICHAEL, 14, 10, SOUTH + db NPC_JESSICA, 18, 6, EAST + db NPC_MITCH, 10, 4, SOUTH + db NPC_PLAYER_CREDITS, 10, 6, NORTH + db $00 + +.CreditsNPCs_RockClub + ; NPC ID, x, y, direction + db NPC_RYAN, 20, 14, EAST + db NPC_GENE, 12, 6, SOUTH + db NPC_PLAYER_CREDITS, 12, 8, NORTH + db $00 + +.CreditsNPCs_WaterClub + ; NPC ID, x, y, direction + db NPC_JOSHUA, 22, 8, SOUTH + db NPC_AMY, 22, 4, NORTH + db NPC_PLAYER_CREDITS, 18, 10, NORTH + db $00 + +.CreditsNPCs_LightningClub + ; NPC ID, x, y, direction + db NPC_NICHOLAS, 6, 10, SOUTH + db NPC_BRANDON, 22, 12, NORTH + db NPC_ISAAC, 12, 4, NORTH + db NPC_PLAYER_CREDITS, 12, 10, NORTH + db $00 + +.CreditsNPCs_GrassClub + ; NPC ID, x, y, direction + db NPC_KRISTIN, 4, 10, EAST + db NPC_HEATHER, 14, 16, SOUTH + db NPC_NIKKI, 12, 4, SOUTH + db NPC_PLAYER_CREDITS, 12, 6, NORTH + db $00 + +.CreditsNPCs_PsychicClub + ; NPC ID, x, y, direction + db NPC_DANIEL, 8, 8, NORTH + db NPC_STEPHANIE, 22, 12, EAST + db NPC_MURRAY1, 12, 6, SOUTH + db NPC_PLAYER_CREDITS, 12, 8, NORTH + db $00 + +.CreditsNPCs_ScienceClub + ; NPC ID, x, y, direction + db NPC_JOSEPH, 10, 10, WEST + db NPC_RICK, 4, 4, SOUTH + db NPC_PLAYER_CREDITS, 4, 6, NORTH + db $00 + +.CreditsNPCs_FireClub + ; NPC ID, x, y, direction + db NPC_ADAM, 8, 14, SOUTH + db NPC_JONATHAN, 18, 10, SOUTH + db NPC_KEN, 14, 4, SOUTH + db NPC_PLAYER_CREDITS, 14, 6, NORTH + db $00 + +.CreditsNPCs_ChallengeHall + ; NPC ID, x, y, direction + db NPC_HOST, 14, 4, SOUTH + db NPC_RONALD1, 18, 8, WEST + db NPC_PLAYER_CREDITS, 12, 8, EAST + db $00 + +.CreditsNPCs_PokemonDome + ; NPC ID, x, y, direction + db NPC_COURTNEY, 18, 4, SOUTH + db NPC_STEVE, 22, 4, SOUTH + db NPC_JACK, 8, 4, SOUTH + db NPC_ROD, 14, 6, SOUTH + db NPC_PLAYER_CREDITS, 14, 10, NORTH + db $00 + +; bc = coordinates +; e = OW map +LoadOWMapForCreditsSequence: ; 1d9a6 (7:59a6) + push bc + push de + call EmptyScreen + pop de + pop bc + + ; set input coordinates and map + ld a, c + ldh [hSCX], a + ld a, b + ldh [hSCY], a + ld a, e + ld [wCurMap], a + + farcall LoadMapTilesAndPals + farcall Func_c9c7 + farcall SafelyCopyBGMapFromSRAMToVRAM + farcall DoMapOWFrame + xor a + ld [wd4ca], a + ld [wd4cb], a + ld a, PALETTE_29 + farcall LoadPaletteData + ret + +CreditsSequenceCmd_LoadOWMap: ; 1d9d5 (7:59d5) + call LoadOWMapForCreditsSequence + jp AdvanceCreditsSequenceCmdPtrBy5 + +CreditsSequenceCmd_DisableLCD: ; 1d9db (7:59db) + call DisableLCD + jp AdvanceCreditsSequenceCmdPtrBy2 + +CreditsSequenceCmd_FadeIn: ; 1d9e1 (7:59e1) + call DisableLCD + call Set_WD_on + farcall Func_10af9 + jp AdvanceCreditsSequenceCmdPtrBy2 + +CreditsSequenceCmd_FadeOut: ; 1d9ee (7:59ee) + farcall Func_10ab4 + call Func_3ca4 + call EnableLCD + call DoFrameIfLCDEnabled + call DisableLCD + call Set_WD_off + jp AdvanceCreditsSequenceCmdPtrBy2 + +CreditsSequenceCmd_DrawRectangle: ; 1da04 (7:5a04) + ld a, c + or $20 + ld e, a + ld d, $00 + ld c, b + ld b, 20 + xor a + lb hl, 0, 0 + call FillRectangle + jp AdvanceCreditsSequenceCmdPtrBy4 + +CreditsSequenceCmd_PrintText: ; 1da17 (7:5a17) + ld a, $01 + ld [wLineSeparation], a + push de + ld d, c + ld a, b + or $20 + ld e, a + call InitTextPrinting + pop hl + call PrintTextNoDelay + jp AdvanceCreditsSequenceCmdPtrBy6 + +CreditsSequenceCmd_PrintTextBox: ; 1da2c (7:5a2c) + ld a, $01 + ld [wLineSeparation], a + push de + ld d, c + ld e, b + call InitTextPrinting + pop hl + call PrintTextNoDelay + jp AdvanceCreditsSequenceCmdPtrBy6 + +CreditsSequenceCmd_InitOverlay: ; 1da3e (7:5a3e) + ld a, c + ld [wd647], a + ld a, b + ld [wd648], a + ld a, e + ld [wd649], a + ld a, d + ld [wd64a], a + call Func_1d765 + jp AdvanceCreditsSequenceCmdPtrBy6 + +CreditsSequenceCmd_LoadNPC: ; 1da54 (7:5a54) + call LoadNPCForCreditsSequence + jp AdvanceCreditsSequenceCmdPtrBy6 + +; bc = coordinates +; e = direction +; d = NPC ID +LoadNPCForCreditsSequence: ; 1da5a (7:5a5a) + ld a, c + ld [wLoadNPCXPos], a + ld a, b + ld [wLoadNPCYPos], a + ld a, e + ld [wLoadNPCDirection], a + ld a, d + farcall LoadNPCSpriteData + ld a, [wNPCSpriteID] + farcall CreateSpriteAndAnimBufferEntry + + ld c, SPRITE_ANIM_COORD_X + call GetSpriteAnimBufferProperty + ldh a, [hSCX] + ld c, a + ld a, [wLoadNPCXPos] + add a + add a + add a ; *8 + add 8 + sub c + ld [hli], a ; x + ldh a, [hSCY] + ld c, a + ld a, [wLoadNPCYPos] + add a + add a + add a ; *8 + add 16 + sub c + ld [hli], a ; y + + ld a, [wNPCAnim] + ld c, a + ld a, [wLoadNPCDirection] + add c + farcall StartNewSpriteAnimation + ret + +CreditsSequenceCmd_InitVolcanoSprite: ; 1da9e (7:5a9e) + farcall OverworldMap_InitVolcanoSprite + jp AdvanceCreditsSequenceCmdPtrBy2 + +CreditsSequenceCmd_TransformOverlay: ; 1daa5 (7:5aa5) +; either stretches or shrinks overlay +; to the input configurations + ld l, 0 + ld a, [wd647] + call .Func_1dade + ld [wd647], a + ld a, [wd648] + ld c, b + call .Func_1dade + ld [wd648], a + ld a, [wd649] + ld c, e + call .Func_1dade + ld [wd649], a + ld a, [wd64a] + ld c, d + call .Func_1dade + ld [wd64a], a + ld a, l + or a + jr z, .advance_sequence + ld a, 1 + ld [wSequenceDelay], a + ret + +.advance_sequence + call Func_1d765 + jp AdvanceCreditsSequenceCmdPtrBy6 + +; compares a with c +; if it's smaller: increase by 2 and increment l +; if it's larger: decrease by 2 and increment l +; if it's equal or $ff: do nothing +.Func_1dade + cp $ff + jr z, .done + cp c + jr z, .done + inc l + jr c, .incr_a +; decr a + dec a + dec a + jr .done +.incr_a + inc a + inc a +.done + ret diff --git a/src/engine/sequences/opening_sequence_commands.asm b/src/engine/sequences/opening_sequence_commands.asm index fac3aa7..6697b11 100644 --- a/src/engine/sequences/opening_sequence_commands.asm +++ b/src/engine/sequences/opening_sequence_commands.asm @@ -1,325 +1,325 @@ -ExecuteOpeningSequenceCmd: ; 1d408 (7:5408) - ld a, [wSequenceDelay] - or a - jr z, .call_function - cp $ff - ret z ; sequence ended - - dec a ; still waiting - ld [wSequenceDelay], a - ret - -.call_function - ld a, [wSequenceCmdPtr + 0] - ld l, a - ld a, [wSequenceCmdPtr + 1] - ld h, a - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - ld a, [hli] - ld c, a - ld a, [hli] - ld b, a - ld l, e - ld h, d - call CallHL2 - jr c, ExecuteOpeningSequenceCmd - ret - -AdvanceOpeningSequenceCmdPtrBy2: ; 1d42e (7:542e) - ld a, 2 - jr AdvanceOpeningSequenceCmdPtr - -AdvanceOpeningSequenceCmdPtrBy3: ; 1d432 (7:5432) - ld a, 3 - jr AdvanceOpeningSequenceCmdPtr - -AdvanceOpeningSequenceCmdPtrBy4: ; 1d436 (7:5436) - ld a, 4 -; fallthrough - -AdvanceOpeningSequenceCmdPtr: ; 1d438 (7:5438) - push hl - ld hl, wSequenceCmdPtr - add [hl] - ld [hli], a - ld a, [hl] - adc 0 - ld [hl], a - pop hl - ret - -OpeningSequenceCmd_WaitOrbsAnimation: ; 1d444 (7:5444) - ld c, $7 - ld de, wTitleScreenSprites -.loop - ld a, [de] - ld [wWhichSprite], a - farcall GetSpriteAnimCounter - cp $ff - jr nz, .no_carry - inc de - dec c - jr nz, .loop - call AdvanceOpeningSequenceCmdPtrBy2 - scf - ret - -.no_carry - or a - ret - -OpeningSequenceCmd_Wait: ; 1d460 (7:5460) - ld a, c - ld [wSequenceDelay], a - call AdvanceOpeningSequenceCmdPtrBy3 - scf - ret - -OpeningSequenceCmd_SetOrbsAnimations: ; 1d469 (7:5469) - ld l, c - ld h, b - - ld c, $7 - ld de, wTitleScreenSprites -.loop - push bc - push de - ld a, [de] - ld [wWhichSprite], a - ld a, [hli] - farcall StartSpriteAnimation - pop de - pop bc - inc de - dec c - jr nz, .loop - - call AdvanceOpeningSequenceCmdPtrBy4 - scf - ret - -OpeningSequenceCmd_SetOrbsCoordinates: ; 1d486 (7:5486) - ld l, c - ld h, b - - ld c, $7 - ld de, wTitleScreenSprites -.loop - push bc - push de - ld a, [de] - ld [wWhichSprite], a - push hl - ld c, SPRITE_ANIM_COORD_X - call GetSpriteAnimBufferProperty - ld e, l - ld d, h - pop hl - ld a, [hli] - add 8 - ld [de], a ; x - inc de - ld a, [hli] - add 16 - ld [de], a ; y - pop de - pop bc - inc de - dec c - jr nz, .loop - - call AdvanceOpeningSequenceCmdPtrBy4 - scf - ret - -OpeningOrbAnimations_CharizardScene: ; 1d4b0 (7:54b0) - db $c0 ; GRASS - db $c1 ; FIRE - db $c1 ; WATER - db $c0 ; COLORLESS - db $c1 ; LIGHTNING - db $c0 ; PSYCHIC - db $c1 ; FIGHTING - -OpeningOrbCoordinates_CharizardScene: ; 1d4b7 (7:54b7) - ; x coord, y coord - db 240, 28 ; GRASS - db 160, 120 ; FIRE - db 160, 8 ; WATER - db 240, 64 ; COLORLESS - db 160, 84 ; LIGHTNING - db 240, 100 ; PSYCHIC - db 160, 44 ; FIGHTING - -OpeningOrbAnimations_ScytherScene: ; 1d4c5 (7:54c5) - db $c1 ; GRASS - db $c0 ; FIRE - db $c0 ; WATER - db $c1 ; COLORLESS - db $c0 ; LIGHTNING - db $c1 ; PSYCHIC - db $c0 ; FIGHTING - -OpeningOrbCoordinates_ScytherScene: ; 1d4cc (7:54cc) - ; x coord, y coord - db 160, 28 ; GRASS - db 240, 120 ; FIRE - db 240, 8 ; WATER - db 160, 64 ; COLORLESS - db 240, 84 ; LIGHTNING - db 160, 100 ; PSYCHIC - db 240, 44 ; FIGHTING - -OpeningOrbAnimations_AerodactylScene: ; 1d4da (7:54da) - db $c2 ; GRASS - db $c5 ; FIRE - db $c8 ; WATER - db $cb ; COLORLESS - db $ce ; LIGHTNING - db $d1 ; PSYCHIC - db $d4 ; FIGHTING - -OpeningOrbCoordinates_AerodactylScene: ; 1d4e1 (7:54e1) - ; x coord, y coord - db 240, 32 ; GRASS - db 160, 112 ; FIRE - db 160, 16 ; WATER - db 240, 64 ; COLORLESS - db 160, 80 ; LIGHTNING - db 240, 96 ; PSYCHIC - db 160, 48 ; FIGHTING - -OpeningOrbAnimations_InitialTitleScreen: ; 1d4ef (7:54ef) - db $c3 ; GRASS - db $c6 ; FIRE - db $c9 ; WATER - db $cc ; COLORLESS - db $cf ; LIGHTNING - db $d2 ; PSYCHIC - db $d5 ; FIGHTING - -OpeningOrbCoordinates_InitialTitleScreen: ; 1d4f6 (7:54f6) - ; x coord, y coord - db 112, 144 ; GRASS - db 12, 144 ; FIRE - db 32, 144 ; WATER - db 92, 144 ; COLORLESS - db 52, 144 ; LIGHTNING - db 132, 144 ; PSYCHIC - db 72, 144 ; FIGHTING - -OpeningOrbAnimations_InTitleScreen: ; 1d504 (7:5504) - db $c4 ; GRASS - db $c7 ; FIRE - db $ca ; WATER - db $cd ; COLORLESS - db $d0 ; LIGHTNING - db $d3 ; PSYCHIC - db $d6 ; FIGHTING - -OpeningOrbCoordinates_InTitleScreen: ; 1d50b (7:550b) - ; x coord, y coord - db 112, 76 ; GRASS - db 0, 28 ; FIRE - db 32, 76 ; WATER - db 92, 252 ; COLORLESS - db 52, 252 ; LIGHTNING - db 144, 28 ; PSYCHIC - db 72, 76 ; FIGHTING - -OpeningSequenceCmd_PlayTitleScreenMusic: ; 1d519 (7:5519) - ld a, MUSIC_TITLESCREEN - call PlaySong - call AdvanceOpeningSequenceCmdPtrBy2 - scf - ret - -OpeningSequenceCmd_WaitSFX: ; 1d523 (7:5523) - call AssertSFXFinished - or a - jr nz, .no_carry - call AdvanceOpeningSequenceCmdPtrBy2 - scf - ret - -.no_carry - or a - ret - -OpeningSequenceCmd_PlaySFX: ; 1d530 (7:5530) - ld a, c - call PlaySFX - call AdvanceOpeningSequenceCmdPtrBy3 - scf - ret - -OpeningSequenceCmd_FadeIn: ; 1d539 (7:5539) - ld a, TRUE - ld [wOpeningSequencePalsNeedUpdate], a - call AdvanceOpeningSequenceCmdPtrBy2 - scf - ret - -OpeningSequenceCmd_FadeOut: ; 1d543 (7:5543) - farcall Func_10d50 - ld a, TRUE - ld [wOpeningSequencePalsNeedUpdate], a - call AdvanceOpeningSequenceCmdPtrBy2 - scf - ret - -OpeningSequenceCmd_LoadCharizardScene: ; 1d551 (7:5551) - lb bc, 6, 3 - ld a, SCENE_CHARIZARD_INTRO - jr LoadOpeningSceneAndUpdateSGBBorder - -OpeningSequenceCmd_LoadScytherScene: ; 1d558 (7:5558) - lb bc, 6, 3 - ld a, SCENE_SCYTHER_INTRO - jr LoadOpeningSceneAndUpdateSGBBorder - -OpeningSequenceCmd_LoadAerodactylScene: ; 1d55f (7:555f) - lb bc, 6, 3 - ld a, SCENE_AERODACTYL_INTRO -; fallthrough - -LoadOpeningSceneAndUpdateSGBBorder: ; 1d564 (7:5564) - call LoadOpeningScene - ld l, %001010 - lb bc, 0, 0 - lb de, 20, 18 - farcall Func_70498 - scf - ret - -OpeningSequenceCmd_LoadTitleScreenScene: ; 1d575 (7:5575) - lb bc, 0, 0 - ld a, SCENE_TITLE_SCREEN - call LoadOpeningScene - call OpeningSequenceEmptyFunc - scf - ret - -; a = scene ID -; bc = coordinates for scene -LoadOpeningScene: ; 1d582 (7:5582) - push af - push bc - call DisableLCD - pop bc - pop af - - farcall _LoadScene ; TODO change func name? - farcall Func_10d17 - - xor a - ld [wOpeningSequencePalsNeedUpdate], a - call AdvanceOpeningSequenceCmdPtrBy2 - call EnableLCD - ret - -OpeningSequenceEmptyFunc: ; 1d59c (7:559c) - ret +ExecuteOpeningSequenceCmd: ; 1d408 (7:5408) + ld a, [wSequenceDelay] + or a + jr z, .call_function + cp $ff + ret z ; sequence ended + + dec a ; still waiting + ld [wSequenceDelay], a + ret + +.call_function + ld a, [wSequenceCmdPtr + 0] + ld l, a + ld a, [wSequenceCmdPtr + 1] + ld h, a + ld a, [hli] + ld e, a + ld a, [hli] + ld d, a + ld a, [hli] + ld c, a + ld a, [hli] + ld b, a + ld l, e + ld h, d + call CallHL2 + jr c, ExecuteOpeningSequenceCmd + ret + +AdvanceOpeningSequenceCmdPtrBy2: ; 1d42e (7:542e) + ld a, 2 + jr AdvanceOpeningSequenceCmdPtr + +AdvanceOpeningSequenceCmdPtrBy3: ; 1d432 (7:5432) + ld a, 3 + jr AdvanceOpeningSequenceCmdPtr + +AdvanceOpeningSequenceCmdPtrBy4: ; 1d436 (7:5436) + ld a, 4 +; fallthrough + +AdvanceOpeningSequenceCmdPtr: ; 1d438 (7:5438) + push hl + ld hl, wSequenceCmdPtr + add [hl] + ld [hli], a + ld a, [hl] + adc 0 + ld [hl], a + pop hl + ret + +OpeningSequenceCmd_WaitOrbsAnimation: ; 1d444 (7:5444) + ld c, $7 + ld de, wTitleScreenSprites +.loop + ld a, [de] + ld [wWhichSprite], a + farcall GetSpriteAnimCounter + cp $ff + jr nz, .no_carry + inc de + dec c + jr nz, .loop + call AdvanceOpeningSequenceCmdPtrBy2 + scf + ret + +.no_carry + or a + ret + +OpeningSequenceCmd_Wait: ; 1d460 (7:5460) + ld a, c + ld [wSequenceDelay], a + call AdvanceOpeningSequenceCmdPtrBy3 + scf + ret + +OpeningSequenceCmd_SetOrbsAnimations: ; 1d469 (7:5469) + ld l, c + ld h, b + + ld c, $7 + ld de, wTitleScreenSprites +.loop + push bc + push de + ld a, [de] + ld [wWhichSprite], a + ld a, [hli] + farcall StartSpriteAnimation + pop de + pop bc + inc de + dec c + jr nz, .loop + + call AdvanceOpeningSequenceCmdPtrBy4 + scf + ret + +OpeningSequenceCmd_SetOrbsCoordinates: ; 1d486 (7:5486) + ld l, c + ld h, b + + ld c, $7 + ld de, wTitleScreenSprites +.loop + push bc + push de + ld a, [de] + ld [wWhichSprite], a + push hl + ld c, SPRITE_ANIM_COORD_X + call GetSpriteAnimBufferProperty + ld e, l + ld d, h + pop hl + ld a, [hli] + add 8 + ld [de], a ; x + inc de + ld a, [hli] + add 16 + ld [de], a ; y + pop de + pop bc + inc de + dec c + jr nz, .loop + + call AdvanceOpeningSequenceCmdPtrBy4 + scf + ret + +OpeningOrbAnimations_CharizardScene: ; 1d4b0 (7:54b0) + db $c0 ; GRASS + db $c1 ; FIRE + db $c1 ; WATER + db $c0 ; COLORLESS + db $c1 ; LIGHTNING + db $c0 ; PSYCHIC + db $c1 ; FIGHTING + +OpeningOrbCoordinates_CharizardScene: ; 1d4b7 (7:54b7) + ; x coord, y coord + db 240, 28 ; GRASS + db 160, 120 ; FIRE + db 160, 8 ; WATER + db 240, 64 ; COLORLESS + db 160, 84 ; LIGHTNING + db 240, 100 ; PSYCHIC + db 160, 44 ; FIGHTING + +OpeningOrbAnimations_ScytherScene: ; 1d4c5 (7:54c5) + db $c1 ; GRASS + db $c0 ; FIRE + db $c0 ; WATER + db $c1 ; COLORLESS + db $c0 ; LIGHTNING + db $c1 ; PSYCHIC + db $c0 ; FIGHTING + +OpeningOrbCoordinates_ScytherScene: ; 1d4cc (7:54cc) + ; x coord, y coord + db 160, 28 ; GRASS + db 240, 120 ; FIRE + db 240, 8 ; WATER + db 160, 64 ; COLORLESS + db 240, 84 ; LIGHTNING + db 160, 100 ; PSYCHIC + db 240, 44 ; FIGHTING + +OpeningOrbAnimations_AerodactylScene: ; 1d4da (7:54da) + db $c2 ; GRASS + db $c5 ; FIRE + db $c8 ; WATER + db $cb ; COLORLESS + db $ce ; LIGHTNING + db $d1 ; PSYCHIC + db $d4 ; FIGHTING + +OpeningOrbCoordinates_AerodactylScene: ; 1d4e1 (7:54e1) + ; x coord, y coord + db 240, 32 ; GRASS + db 160, 112 ; FIRE + db 160, 16 ; WATER + db 240, 64 ; COLORLESS + db 160, 80 ; LIGHTNING + db 240, 96 ; PSYCHIC + db 160, 48 ; FIGHTING + +OpeningOrbAnimations_InitialTitleScreen: ; 1d4ef (7:54ef) + db $c3 ; GRASS + db $c6 ; FIRE + db $c9 ; WATER + db $cc ; COLORLESS + db $cf ; LIGHTNING + db $d2 ; PSYCHIC + db $d5 ; FIGHTING + +OpeningOrbCoordinates_InitialTitleScreen: ; 1d4f6 (7:54f6) + ; x coord, y coord + db 112, 144 ; GRASS + db 12, 144 ; FIRE + db 32, 144 ; WATER + db 92, 144 ; COLORLESS + db 52, 144 ; LIGHTNING + db 132, 144 ; PSYCHIC + db 72, 144 ; FIGHTING + +OpeningOrbAnimations_InTitleScreen: ; 1d504 (7:5504) + db $c4 ; GRASS + db $c7 ; FIRE + db $ca ; WATER + db $cd ; COLORLESS + db $d0 ; LIGHTNING + db $d3 ; PSYCHIC + db $d6 ; FIGHTING + +OpeningOrbCoordinates_InTitleScreen: ; 1d50b (7:550b) + ; x coord, y coord + db 112, 76 ; GRASS + db 0, 28 ; FIRE + db 32, 76 ; WATER + db 92, 252 ; COLORLESS + db 52, 252 ; LIGHTNING + db 144, 28 ; PSYCHIC + db 72, 76 ; FIGHTING + +OpeningSequenceCmd_PlayTitleScreenMusic: ; 1d519 (7:5519) + ld a, MUSIC_TITLESCREEN + call PlaySong + call AdvanceOpeningSequenceCmdPtrBy2 + scf + ret + +OpeningSequenceCmd_WaitSFX: ; 1d523 (7:5523) + call AssertSFXFinished + or a + jr nz, .no_carry + call AdvanceOpeningSequenceCmdPtrBy2 + scf + ret + +.no_carry + or a + ret + +OpeningSequenceCmd_PlaySFX: ; 1d530 (7:5530) + ld a, c + call PlaySFX + call AdvanceOpeningSequenceCmdPtrBy3 + scf + ret + +OpeningSequenceCmd_FadeIn: ; 1d539 (7:5539) + ld a, TRUE + ld [wOpeningSequencePalsNeedUpdate], a + call AdvanceOpeningSequenceCmdPtrBy2 + scf + ret + +OpeningSequenceCmd_FadeOut: ; 1d543 (7:5543) + farcall Func_10d50 + ld a, TRUE + ld [wOpeningSequencePalsNeedUpdate], a + call AdvanceOpeningSequenceCmdPtrBy2 + scf + ret + +OpeningSequenceCmd_LoadCharizardScene: ; 1d551 (7:5551) + lb bc, 6, 3 + ld a, SCENE_CHARIZARD_INTRO + jr LoadOpeningSceneAndUpdateSGBBorder + +OpeningSequenceCmd_LoadScytherScene: ; 1d558 (7:5558) + lb bc, 6, 3 + ld a, SCENE_SCYTHER_INTRO + jr LoadOpeningSceneAndUpdateSGBBorder + +OpeningSequenceCmd_LoadAerodactylScene: ; 1d55f (7:555f) + lb bc, 6, 3 + ld a, SCENE_AERODACTYL_INTRO +; fallthrough + +LoadOpeningSceneAndUpdateSGBBorder: ; 1d564 (7:5564) + call LoadOpeningScene + ld l, %001010 + lb bc, 0, 0 + lb de, 20, 18 + farcall Func_70498 + scf + ret + +OpeningSequenceCmd_LoadTitleScreenScene: ; 1d575 (7:5575) + lb bc, 0, 0 + ld a, SCENE_TITLE_SCREEN + call LoadOpeningScene + call OpeningSequenceEmptyFunc + scf + ret + +; a = scene ID +; bc = coordinates for scene +LoadOpeningScene: ; 1d582 (7:5582) + push af + push bc + call DisableLCD + pop bc + pop af + + farcall _LoadScene ; TODO change func name? + farcall Func_10d17 + + xor a + ld [wOpeningSequencePalsNeedUpdate], a + call AdvanceOpeningSequenceCmdPtrBy2 + call EnableLCD + ret + +OpeningSequenceEmptyFunc: ; 1d59c (7:559c) + ret -- cgit v1.2.3