diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-28 21:52:57 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-28 21:54:13 -0400 |
| commit | 33e45dea924632318a727ce6a9534328ed5927bb (patch) | |
| tree | 7430f8e7040fe4cd5f213d506f4ebd653283be49 /engine | |
| parent | 82bcac8463366ff24776bf1d228bd449b2a99a04 (diff) | |
Changes for hall of fame and credits.
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/events/halloffame.asm | 7 | ||||
| -rwxr-xr-x | engine/gfx/color.asm | 2 | ||||
| -rwxr-xr-x | engine/movie/credits.asm | 35 |
3 files changed, 26 insertions, 18 deletions
diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 4df4af5c..53ab9f9a 100755 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -14,6 +14,9 @@ HallOfFame:: ld hl, wStatusFlags set STATUSFLAGS_HALL_OF_FAME_F, [hl] +; Bug: Gold/Silver fail to (conditionally) erase the previous save and +; initialize the current save, if the player did not save on this playthrough! + ld hl, wHallOfFameCount ld a, [hl] cp HOF_MASTER_COUNT @@ -65,7 +68,7 @@ HallOfFame_FadeOutMusic: ld c, 100 jp DelayFrames -HallOfFame_PlayMusicDE: +HallOfFame_PlayMusicDE:: push de ld de, MUSIC_NONE call PlayMusic @@ -550,7 +553,7 @@ HOF_AnimatePlayerPic: ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " call ByteFill - ld a, $0c + ld a, CAL ld [wTrainerClass], a ld de, vTiles2 farcall GetTrainerPic diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index a39ab794..37b1d7ba 100755 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -76,7 +76,7 @@ Unused_CheckShininess: and a ret -Function908e: +SGB_ApplyCreditsPals:: push de push bc ld hl, PalPacket_a155 diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 6db529e5..533c3d79 100755 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -1,3 +1,8 @@ +INCLUDE "constants.asm" + + +SECTION "Credits", ROMX + Credits:: ld b, a bit 6, b ; Hall Of Fame @@ -297,7 +302,7 @@ ParseCredits: call .get ld bc, SCREEN_WIDTH * 2 call AddNTimes - ld a, $70 + ld a, BANK(CreditsStrings) call FarString jr .loop @@ -324,7 +329,7 @@ ParseCredits: .music ; Play the credits music. - ld de, $24 + ld de, MUSIC_CREDITS call HallOfFame_PlayMusicDE jr .loop @@ -423,7 +428,7 @@ ConstructCreditsTilemap: xor a ldh [hBGMapMode], a ldh [hBGMapAddress], a - ld hl, wTilemap + hlcoord 0, 0 call .InitTopPortion hlcoord 0, 14 call .InitTopPortion @@ -488,7 +493,7 @@ GetCreditsPalette: ld a, [hli] ld e, a ld d, [hl] - farcall Function908e + farcall SGB_ApplyCreditsPals ret .asm_6bcf @@ -501,11 +506,11 @@ GetCreditsPalette: ld a, 8 call .UpdatePals - ld hl, wBGPals1 + 14 + ld hl, wBGPals1 palette PAL_BG_RED color 3 xor a ld [hli], a ld [hl], a - ld hl, wBGPals1 + 142 + ld hl, wBGPals2 palette PAL_BG_RED color 3 xor a ld [hli], a ld [hl], a @@ -582,24 +587,24 @@ Credits_LoadBorderGFX: .Frames: dw CreditsBellossomGFX - dw CreditsBellossomGFX + 16 tiles + dw CreditsBellossomGFX + 16 tiles dw CreditsBellossomGFX - dw CreditsBellossomGFX + 32 tiles + dw CreditsBellossomGFX + 32 tiles dw CreditsTogepiGFX - dw CreditsTogepiGFX + 16 tiles + dw CreditsTogepiGFX + 16 tiles dw CreditsTogepiGFX - dw CreditsTogepiGFX + 32 tiles + dw CreditsTogepiGFX + 32 tiles dw CreditsElekidGFX - dw CreditsElekidGFX + 16 tiles + dw CreditsElekidGFX + 16 tiles dw CreditsElekidGFX - dw CreditsElekidGFX + 32 tiles + dw CreditsElekidGFX + 32 tiles dw CreditsSentretGFX - dw CreditsSentretGFX + 16 tiles - dw CreditsSentretGFX + 32 tiles - dw CreditsSentretGFX + 48 tiles + dw CreditsSentretGFX + 16 tiles + dw CreditsSentretGFX + 32 tiles + dw CreditsSentretGFX + 48 tiles Credits_TheEnd: ld a, $40 |