Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better document splash screen #762

Merged
merged 8 commits into from
Aug 27, 2020
Merged

Better document splash screen #762

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
926e231
Move all splash screen files to gfx/splash
mid-kid Aug 21, 2020
2b2c1ac
Split engine/movie/intro.asm into itself and splash.asm
mid-kid Aug 21, 2020
733664b
Document splash screen animation
mid-kid Aug 22, 2020
13c4a93
Fix some constants surrounding sprite animations
mid-kid Aug 22, 2020
d39da49
Modify macros/wram.asm to match recent renames
mid-kid Aug 22, 2020
15c08ad
Small changes to better match pokegold
mid-kid Aug 27, 2020
353f78f
GS_INTRO_STAR/SPARKLE -> GS_GAMEFREAK_LOGO_STAR/SPARKLE
mid-kid Aug 27, 2020
3b43f79
Use hex for tile IDs in engine/movie/splash.asm
mid-kid Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/gfx/sprite_anims.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ DoAnimFrame:
callfar ComposeMail_AnimateCursor
ret

.GameFreakLogo:
.GameFreakLogo
Rangi42 marked this conversation as resolved.
Show resolved Hide resolved
callfar GameFreakLogoSpriteAnim
ret

Expand Down
11 changes: 5 additions & 6 deletions engine/movie/splash.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ GameFreakPresentsScene:
dw GameFreakPresents_WaitSpriteAnim
dw GameFreakPresents_PlaceGameFreak
dw GameFreakPresents_PlacePresents
dw GameFreakPresents_DelayEnd
dw GameFreakPresents_WaitForTimer

GameFreakPresents_NextScene:
ld hl, wJumptableIndex
Expand All @@ -149,17 +149,16 @@ GameFreakPresents_PlaceGameFreak:

.PlaceGameFreak:
ld [hl], 0
ld hl, .GAME_FREAK
ld hl, .game_freak
decoord 5, 10
ld bc, .end - .GAME_FREAK
ld bc, .end - .game_freak
call CopyBytes
call GameFreakPresents_NextScene
ld de, SFX_GAME_FREAK_PRESENTS
call PlaySFX
ret

.GAME_FREAK:
; G A M E _ F R E A K
.game_freak
db 0, 1, 2, 3, 13, 4, 5, 3, 1, 6
mid-kid marked this conversation as resolved.
Show resolved Hide resolved
.end
db "@"
Expand All @@ -186,7 +185,7 @@ GameFreakPresents_PlacePresents:
.end
db "@"

GameFreakPresents_DelayEnd:
GameFreakPresents_WaitForTimer:
ld hl, wIntroSceneTimer
ld a, [hl]
cp 128
Expand Down