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/engine/home.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/engine/home.asm') diff --git a/src/engine/home.asm b/src/engine/home.asm index c860dd3..cc16ca3 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -11121,7 +11121,7 @@ Func_3b6a: ; 3b6a (0:3b6a) ld [wTempAnimation], a ; hold an animation temporarily ldh a, [hBankROM] push af - ld [wd4be], a + ld [wDuelAnimReturnBank], a push hl push bc @@ -11171,7 +11171,7 @@ Func_3bb5: ; 3bb5 (0:3bb5) ld [wd4c0], a ldh a, [hBankROM] push af - ld a, [wd4be] + ld a, [wDuelAnimReturnBank] call BankswitchROM call Func_3cb4 call CallHL2 -- 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/engine/home.asm | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src/engine/home.asm') diff --git a/src/engine/home.asm b/src/engine/home.asm index cc16ca3..476f182 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -11115,9 +11115,12 @@ CheckAnyAnimationPlaying: ; 3b52 (0:3b52) pop hl ret +; plays duel animation +; the animations are loaded to a buffer +; and played in order, so they can be stacked ; input: ; - a = animation index -Func_3b6a: ; 3b6a (0:3b6a) +PlayDuelAnimation: ; 3b6a (0:3b6a) ld [wTempAnimation], a ; hold an animation temporarily ldh a, [hBankROM] push af @@ -11126,25 +11129,25 @@ Func_3b6a: ; 3b6a (0:3b6a) push hl push bc push de - ld a, BANK(Func_1ca31) + ld a, BANK(LoadDuelAnimationToBuffer) call BankswitchROM ld a, [wTempAnimation] cp $61 - jr nc, .asm_3b90 + jr nc, .load_buffer - ld hl, wd4ad - ld a, [wd4ac] + ld hl, wDuelAnimBufferSize + ld a, [wDuelAnimBufferCurPos] cp [hl] - jr nz, .asm_3b90 + jr nz, .load_buffer call CheckAnyAnimationPlaying - jr nc, .asm_3b95 + jr nc, .play_anim -.asm_3b90 - call Func_1ca31 +.load_buffer + call LoadDuelAnimationToBuffer jr .done -.asm_3b95 - call Func_1c8ef +.play_anim + call PlayLoadedDuelAnimation jr .done .done -- cgit v1.2.3 From ab9b857e68af66e8bc37628bd76dbba337971a15 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 2 Feb 2021 23:31:36 +0000 Subject: More animation-related functions --- src/engine/home.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/engine/home.asm') diff --git a/src/engine/home.asm b/src/engine/home.asm index 476f182..9a0fcbb 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -11132,7 +11132,7 @@ PlayDuelAnimation: ; 3b6a (0:3b6a) ld a, BANK(LoadDuelAnimationToBuffer) call BankswitchROM ld a, [wTempAnimation] - cp $61 + cp DUEL_SPECIAL_ANIMS jr nc, .load_buffer ld hl, wDuelAnimBufferSize -- cgit v1.2.3