From 152fb72933bbe7326d6172f3e2c8659346e8acc7 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 2 Feb 2021 10:06:15 +0000 Subject: Identify Duel Animation structs --- src/wram.asm | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) (limited to 'src/wram.asm') diff --git a/src/wram.asm b/src/wram.asm index 30ea0e3..34f2333 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -2365,8 +2365,23 @@ wd42a:: ; d42a wAnimFlags:: ; d42b ds $1 -wd42c:: ; d42c - ds $80 +wDuelAnimBuffer:: ; d42c + duel_anim_struct wDuelAnim1 + duel_anim_struct wDuelAnim2 + duel_anim_struct wDuelAnim3 + duel_anim_struct wDuelAnim4 + duel_anim_struct wDuelAnim5 + duel_anim_struct wDuelAnim6 + duel_anim_struct wDuelAnim7 + duel_anim_struct wDuelAnim8 + duel_anim_struct wDuelAnim9 + duel_anim_struct wDuelAnim10 + duel_anim_struct wDuelAnim11 + duel_anim_struct wDuelAnim12 + duel_anim_struct wDuelAnim13 + duel_anim_struct wDuelAnim14 + duel_anim_struct wDuelAnim15 + duel_anim_struct wDuelAnim16 wd4ac:: ; d4ac ds $1 @@ -2382,17 +2397,21 @@ wd4ad:: ; d4ad wDuelAnimationScreen:: ; d4ae ds $1 -wd4af:: ; d4af - ds $1 - -wd4b0:: ; d4b0 +; which side to play animation +; uses PLAYER_TURN and OPPONENT_TURN constants +wDuelAnimDuelistSide:: ; d4af ds $1 -wd4b1:: ; d4b1 +; used in GetAnimCoordsAndFlags to determine +; what coordinates to draw the animation in. +; e.g. used to know what Play Area card +; to draw a hit animation in the Play Area screen. +wDuelAnimLocationParam:: ; d4b0 ds $1 -wd4b2:: ; d4b2 - ds $1 +; damage value to display with animation +wDuelAnimDamage:: ; d4b1 + ds $2 wd4b3:: ; d4b3 ds $1 @@ -2417,7 +2436,8 @@ wd4bb:: ; d4bb wd4bc:: ; d4bc ds $2 -wd4be:: ; d4be +; bank number to return to after processing animation +wDuelAnimReturnBank:: ; d4be ds $1 wd4bf:: ; d4bf -- cgit v1.2.3 From 3dd204220082d85ce5f1c92250f7240e3dc92944 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 2 Feb 2021 11:55:55 +0000 Subject: Document duel animation playing routines --- src/wram.asm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/wram.asm') diff --git a/src/wram.asm b/src/wram.asm index 34f2333..4fbe652 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -2129,10 +2129,9 @@ wd23c:: ; d23c wd23d:: ; d23d ds $1 -wd23e:: ; d23e - ds $1 - - ds $50 +; palette loaded from Palette* data +wLoadedPalData:: ; d23e + ds $51 wd28f:: ; d28f ds $1 @@ -2383,10 +2382,10 @@ wDuelAnimBuffer:: ; d42c duel_anim_struct wDuelAnim15 duel_anim_struct wDuelAnim16 -wd4ac:: ; d4ac +wDuelAnimBufferCurPos:: ; d4ac ds $1 -wd4ad:: ; d4ad +wDuelAnimBufferSize:: ; d4ad ds $1 ; used to know what coordinate offsets to use to place animations -- cgit v1.2.3 From e8b079962bdee30fc5a36994ef928cdf47609898 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 2 Feb 2021 16:01:10 +0000 Subject: Document screen animations --- src/wram.asm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/wram.asm') diff --git a/src/wram.asm b/src/wram.asm index 4fbe652..aa6d106 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -2147,7 +2147,9 @@ wd292:: ; d292 ds $4 -wd297:: ; d297 +; temporarily holds the palettes from +; wBackgroundPalettesCGB +wTempBackgroundPalettesCGB:: ; d297 ds 8 palettes ds $4c @@ -2426,10 +2428,13 @@ wd4b7:: ; d4b7 wd4b8:: ; d4b8 ds $1 -wd4b9:: ; d4b9 +; pointer to a function to update +; the current screen animation +wScreenAnimUpdatePtr:: ; d4b9 ds $2 -wd4bb:: ; d4bb +; duration of the current screen animation +wScreenAnimDuration:: ; d4bb ds $1 wd4bc:: ; d4bc -- cgit v1.2.3