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.

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

merged 8 commits into from
Aug 27, 2020

Conversation

mid-kid
Copy link
Member

@mid-kid mid-kid commented Aug 22, 2020

Moved assets to the right directory, split engine/movie/intro.asm, and documented the code surrounding the splash screen.

@Rangi42
Copy link
Member

Rangi42 commented Aug 22, 2020

One other potential struct-related addition to this PR: object_struct constant names should match WRAM labels, as in #655. (Other struct-related issues that are more involved/self-contained: #757, #739, #748)

@mid-kid
Copy link
Member Author

mid-kid commented Aug 22, 2020

@Rangi42 I don't feel comfortable homogenizing the names for those without properly researching the subsystem to pick the "best" names.

@Rangi42
Copy link
Member

Rangi42 commented Aug 25, 2020

This is still marked as a draft; is there anything left to do, or can it be merged (along with similar updates to pokegold and pokered)? (pokered just for a gfx/splash/ directory)

@mid-kid
Copy link
Member Author

mid-kid commented Aug 27, 2020

IIRC I was still working on something, but I can't exactly recall what. I'll create a pokegold PR and undraft this.

Also commented the use of the field surrounding the struct
initialization functions.

SPRITEANIMSTRUCT_0C -> SPRITEANIMSTRUCT_VAR1
SPRITEANIMSTRUCT_0D -> SPRITEANIMSTRUCT_VAR2
SPRITEANIMSTRUCT_0E -> SPRITEANIMSTRUCT_VAR3
SPRITEANIMSTRUCT_0F -> SPRITEANIMSTRUCT_VAR4

BATTLEANIMSTRUCT_01 -> BATTLEANIMSTRUCT_OAMFLAGS
BATTLEANIMSTRUCT_ANON_JT_INDEX -> BATTLEANIMSTRUCT_JUMPTABLE_INDEX
BATTLEANIMSTRUCT_0F -> BATTLEANIMSTRUCT_VAR1
BATTLEANIMSTRUCT_10 -> BATTLEANIMSTRUCT_VAR2
@mid-kid mid-kid marked this pull request as ready for review August 27, 2020 12:53
These two sprite animations are related to the Game Freak Logo splash
screen, not the actual intro.
engine/movie/splash.asm Outdated Show resolved Hide resolved
@Rangi42 Rangi42 merged commit a147c35 into pret:master Aug 27, 2020
pokepret pushed a commit that referenced this pull request Aug 27, 2020
Better document splash screen
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants