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 6 commits
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
8 changes: 4 additions & 4 deletions constants/battle_anim_constants.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; battle_anim_struct members (see macros/wram.asm)
const_def
const BATTLEANIMSTRUCT_INDEX
const BATTLEANIMSTRUCT_01
const BATTLEANIMSTRUCT_OAMFLAGS
const BATTLEANIMSTRUCT_02
const BATTLEANIMSTRUCT_FRAMESET_ID
const BATTLEANIMSTRUCT_FUNCTION
Expand All @@ -14,9 +14,9 @@
const BATTLEANIMSTRUCT_PARAM
const BATTLEANIMSTRUCT_DURATION
const BATTLEANIMSTRUCT_FRAME
const BATTLEANIMSTRUCT_ANON_JT_INDEX
const BATTLEANIMSTRUCT_0F
const BATTLEANIMSTRUCT_10
const BATTLEANIMSTRUCT_JUMPTABLE_INDEX
const BATTLEANIMSTRUCT_VAR1
const BATTLEANIMSTRUCT_VAR2
const_skip 7
BATTLEANIMSTRUCT_LENGTH EQU const_value
NUM_ANIM_OBJECTS EQU 10 ; see wActiveAnimObjects
Expand Down
8 changes: 4 additions & 4 deletions constants/sprite_anim_constants.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
const SPRITEANIMSTRUCT_DURATIONOFFSET ; 9
const SPRITEANIMSTRUCT_FRAME ; a
const SPRITEANIMSTRUCT_JUMPTABLE_INDEX ; b
const SPRITEANIMSTRUCT_0C ; c
const SPRITEANIMSTRUCT_0D ; d
const SPRITEANIMSTRUCT_0E ; e
const SPRITEANIMSTRUCT_0F ; f
const SPRITEANIMSTRUCT_VAR1 ; c
const SPRITEANIMSTRUCT_VAR2 ; d
const SPRITEANIMSTRUCT_VAR3 ; e
const SPRITEANIMSTRUCT_VAR4 ; f
SPRITEANIMSTRUCT_LENGTH EQU const_value
NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs

Expand Down
5 changes: 2 additions & 3 deletions engine/battle_anims/anim_commands.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@ RunBattleAnimCommand:
ld hl, BattleAnimCommands
add hl, de
add hl, de

ld a, [hli]
ld h, [hl]
ld l, a
Expand Down Expand Up @@ -714,7 +713,7 @@ BattleAnimCmd_IncObj:
ret

.found
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
inc [hl]
ret
Expand Down Expand Up @@ -765,7 +764,7 @@ BattleAnimCmd_SetObj:

.found
call GetBattleAnimByte
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
ld [hl], a
ret
Expand Down
38 changes: 19 additions & 19 deletions engine/battle_anims/core.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,42 +39,42 @@ endr
ld hl, BATTLEANIMSTRUCT_INDEX
add hl, bc
ld a, [wLastAnimObjectIndex]
ld [hli], a ; Index
ld [hli], a ; BATTLEANIMSTRUCT_INDEX
ld a, [de]
inc de
ld [hli], a ; 01
ld [hli], a ; BATTLEANIMSTRUCT_OAMFLAGS
ld a, [de]
inc de
ld [hli], a ; 02
ld [hli], a ; BATTLEANIMSTRUCT_02
ld a, [de]
inc de
ld [hli], a ; Frameset ID
ld [hli], a ; BATTLEANIMSTRUCT_FRAMESET_ID
ld a, [de]
inc de
ld [hli], a ; Function
ld [hli], a ; BATTLEANIMSTRUCT_FUNCTION
ld a, [de]
inc de
ld [hli], a ; 05
ld [hli], a ; BATTLEANIMSTRUCT_PALETTE
ld a, [de]
call GetBattleAnimTileOffset
ld [hli], a ; Tile ID
ld [hli], a ; BATTLEANIMSTRUCT_TILEID
ld a, [wBattleObjectTempXCoord]
ld [hli], a ; X Coord
ld [hli], a ; BATTLEANIMSTRUCT_XCOORD
ld a, [wBattleObjectTempYCoord]
ld [hli], a ; Y Coord
ld [hli], a ; BATTLEANIMSTRUCT_YCOORD
xor a
ld [hli], a ; X Offset
ld [hli], a ; Y Offset
ld [hli], a ; BATTLEANIMSTRUCT_XOFFSET
ld [hli], a ; BATTLEANIMSTRUCT_YOFFSET
ld a, [wBattleObjectTempParam]
ld [hli], a ; Param
ld [hli], a ; BATTLEANIMSTRUCT_PARAM
xor a
ld [hli], a ; 0c
ld [hli], a ; BATTLEANIMSTRUCT_DURATION
dec a
ld [hli], a ; 0d
ld [hli], a ; BATTLEANIMSTRUCT_FRAME
xor a
ld [hli], a ; 0e
ld [hli], a ; 0f
ld [hl], a ; 10
ld [hli], a ; BATTLEANIMSTRUCT_JUMPTABLE_INDEX
ld [hli], a ; BATTLEANIMSTRUCT_VAR1
ld [hl], a ; BATTLEANIMSTRUCT_VAR2
ret

BattleAnimOAMUpdate:
Expand Down Expand Up @@ -199,7 +199,7 @@ BattleAnimOAMUpdate:
ret

InitBattleAnimBuffer:
ld hl, BATTLEANIMSTRUCT_01
ld hl, BATTLEANIMSTRUCT_OAMFLAGS
add hl, bc
ld a, [hl]

Expand Down Expand Up @@ -232,7 +232,7 @@ InitBattleAnimBuffer:
and a
ret z

ld hl, BATTLEANIMSTRUCT_01
ld hl, BATTLEANIMSTRUCT_OAMFLAGS
add hl, bc
ld a, [hl]
ld [wBattleAnimTempOAMFlags], a
Expand Down
Loading