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

dump anim scripts for efxmagic #658

Merged
merged 1 commit into from
Aug 14, 2024
Merged

dump anim scripts for efxmagic #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 0 additions & 42 deletions data/banim-efxmagic-fire.s
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions data/const_data_efxmagic_DC944.s
View file
Open in desktop

This file was deleted.

6,907 changes: 5,989 additions & 918 deletions data/data_banim.s
View file
Open in desktop

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions include/efxbattle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1572,9 +1572,9 @@ extern u16 Tsa_0865ADC4[];
extern u16 Img_FenrirSprites[];
extern u16 Pal_FenrirSprites_A[];
extern u16 Pal_FenrirSprites_B[];
extern u32 gUnknown_0865C77C[];
extern u32 gUnknown_0865C7A8[];
extern u32 gUnknown_0865C7D4[];
extern u32 AnimScr_EfxFenrir1[];
extern u32 AnimScr_EfxFenrir2[];
extern u32 AnimScr_EfxFenrir3[];
extern u16 Img_0865C8C0[];
extern u16 Img_0865CE1C[];
extern u16 Img_0865D498[];
Expand Down Expand Up @@ -1670,15 +1670,15 @@ extern u16 Tsa_0866E8F8[];
extern u16 Tsa_0866EC80[];
extern u16 Img_PurgeSprites[];
extern u16 Pal_PurgeSprites[];
extern u32 gUnknown_0866F58C[];
extern u32 AnimScr_EfxPurge[];
extern u16 Img_HealSpellBg[];
extern u16 * gUnknown_0866F774[];
extern u16 * Tsa_HealSpellBg[];
extern u16 Pal_HealSpellBg[];
extern u16 Img_HealSprites_Sparkles[];
extern u16 Pal_HealSprites_Sparkles[];
extern u16 gUnknown_08670548[];
extern u16 * gUnknown_08670D40[];
extern u16 * gUnknown_086716A0[];
extern u16 Img_EfxLiveBG_B[];
extern u16 * Tsa_EfxLiveBG_B_L[];
extern u16 * Tsa_EfxLiveBG_B_R[];
extern u16 gUnknown_08672000[];
extern u16 gUnknown_08672220[];
extern u32 AnimScr_EfxLiveOBJ1[];
Expand Down Expand Up @@ -1780,38 +1780,38 @@ extern u16 Pal_BerserkBg[];
extern u16 Img_BerserkSprites_A[];
extern u16 Img_BerserkSprites_B[];
extern u16 Pal_BerserkSprites[];
extern u32 gUnknown_0868D2B4[];
extern u32 gUnknown_0868D2C8[];
extern u32 gUnknown_0868D2DC[];
extern u32 gUnknown_0868D2F0[];
extern u32 gUnknown_0868D304[];
extern u32 gUnknown_0868D678[];
extern u32 gUnknown_0868D684[];
extern u32 gUnknown_0868D690[];
extern u32 gUnknown_0868D69C[];
extern u32 gUnknown_0868D6A8[];
extern u32 AnimScr_EfxBerserk1[];
extern u32 AnimScr_EfxBerserk2[];
extern u32 AnimScr_EfxBerserk3[];
extern u32 AnimScr_EfxBerserk4[];
extern u32 AnimScr_EfxBerserk5[];
extern u32 AnimScr_EfxBerserk6[];
extern u32 AnimScr_EfxBerserk7[];
extern u32 AnimScr_EfxBerserk8[];
extern u32 AnimScr_EfxBerserk9[];
extern u32 AnimScr_EfxBerserk10[];
extern u16 Img_BarrierBg[];
extern u16 Pal_BarrierBg[];
extern u16 Tsa_0868DF9C[];
extern u16 Tsa_0868E054[];
extern u16 Tsa_0868E118[];
extern u16 Tsa_0868E208[];
extern u16 Tsa_0868E338[];
extern u16 gUnknown_0868E46C[];
extern u32 gUnknown_08692524[];
extern u32 gUnknown_08692674[];
extern u16 Img_EfxMshield[];
extern u32 AnimScr_EfxMshield1[];
extern u32 AnimScr_EfxMshield2[];
extern u16 Pal_IvaldiSprites[];
extern u16 Img_IvaldiSprites[];
extern u32 gUnknown_0869307C[];
extern u32 gUnknown_086930A8[];
extern u32 gUnknown_086930D4[];
extern u32 gUnknown_08693118[];
extern u32 gUnknown_08693160[];
extern u32 gUnknown_0869316C[];
extern u32 gUnknown_086936C4[];
extern u32 gUnknown_086936F0[];
extern u32 gUnknown_0869371C[];
extern u32 gUnknown_08693760[];
extern u32 AnimScr_EfxIvald_R1[];
extern u32 AnimScr_EfxIvald_R2[];
extern u32 AnimScr_EfxIvald_R3[];
extern u32 AnimScr_EfxIvald_R4[];
extern u32 AnimScr_EfxIvald2_L[];
extern u32 AnimScr_EfxIvald2_R[];
extern u32 AnimScr_EfxIvald_L1[];
extern u32 AnimScr_EfxIvald_L2[];
extern u32 AnimScr_EfxIvald_L3[];
extern u32 AnimScr_EfxIvald_L4[];
extern u16 Img_IvaldiBg1[];
extern u16 Pal_IvaldiBg1[];
extern u16 Tsa_086945E4[];
Expand Down Expand Up @@ -1871,16 +1871,16 @@ extern u16 Pal_IvaldiBg4[];
extern u16 Tsa_086A1D00[];
extern u16 Img_GleipnirSprites_Rocks[];
extern u16 Pal_GleipnirSprites_Rocks[];
extern u32 gUnknown_086A2724[];
extern u32 gUnknown_086A273C[];
extern u32 gUnknown_086A2844[];
extern u32 gUnknown_086A285C[];
extern u32 AnimScr_EfxDarkGradoOBJ01piece1[];
extern u32 AnimScr_EfxDarkGradoOBJ01piece2[];
extern u32 AnimScr_EfxDarkGradoOBJ01piece3[];
extern u32 AnimScr_EfxDarkGradoOBJ01piece4[];
extern u16 Img_GleipnirSprites_Comet[];
extern u16 Pal_GleipnirSprites_Comet[];
extern u32 gUnknown_086A2DBC[];
extern u32 gUnknown_086A2DD0[];
extern u32 gUnknown_086A2E98[];
extern u32 gUnknown_086A2EAC[];
extern u32 AnimScr_EfxDarkGradoOBJ02piece1_R[];
extern u32 AnimScr_EfxDarkGradoOBJ02piece2_R[];
extern u32 AnimScr_EfxDarkGradoOBJ02piece1_L[];
extern u32 AnimScr_EfxDarkGradoOBJ02piece2_L[];
extern u16 Img_086A2EC0[];
extern u16 Img_086A34D0[];
extern u16 Img_086A3BA0[];
Expand Down Expand Up @@ -1957,9 +1957,9 @@ extern u16 Pal_GleipnirBg_Fog[];
extern u16 Tsa_GleipnirBg_Fog[];
extern u16 Img_CrimsonEyeSprites[];
extern u16 Pal_CrimsonEyeSprites[];
extern u32 gUnknown_086B5974[];
extern u32 gUnknown_086B5984[];
extern u32 gUnknown_086B598C[];
extern u32 AnimScr_EfxCrimsonEyeOBJ[];
extern u32 AnimScr_EfxCrimsonEyeOBJFinishPiece1[];
extern u32 AnimScr_EfxCrimsonEyeOBJFinishPiece2[];
extern u16 Pal_efxGorgonBGFinish[];
extern u16 Img_efxCrimsonEyeBG[];
extern u16 Pal_efxCrimsonEyeBG[];
Expand All @@ -1982,7 +1982,7 @@ extern u16 Tsa_086BCD70[];
extern u16 Tsa_086BCFE8[];
extern u16 Img_StoneSprites[];
extern u16 Pal_StoneSprites[];
extern u32 gUnknown_086BDA5C[];
extern u32 AnimScr_EfxStone[];
extern u16 Img_086BDB7C[];
extern u16 Img_086BE0CC[];
extern u16 Img_086BE668[];
Expand Down Expand Up @@ -2344,7 +2344,7 @@ extern u16 Tsa_ShineBg2_H[];
extern u16 Tsa_ShineBg2_I[];
extern u16 Img_ShineSprites[];
extern u16 Pal_ShineSprites[];
extern u32 gUnknown_08728C04[];
extern u32 AnimScr_EfxShine[];
extern u16 Img_LunaBg1[];
extern u16 Pal_LunaBg1[];
extern u16 Tsa_LunaBg1_A[];
Expand All @@ -2369,9 +2369,9 @@ extern u16 Tsa_LunaBg3_K[];
extern u16 Tsa_LunaBg3_L[];
extern u16 Img_LunaSprites[];
extern u16 Pal_LunaSprites[];
extern u32 gUnknown_0872DFEC[];
extern u32 gUnknown_0872E024[];
extern u32 gUnknown_0872E24C[];
extern u32 AnimScr_EfxLuna1[];
extern u32 AnimScr_EfxLuna2[];
extern u32 AnimScr_EfxLuna4[];
extern u16 Img_ExcaliburBg1[];
extern u16 Pal_ExcaliburBg1[];
extern u16 Tsa_ExcaliburBg1[];
Expand All @@ -2382,7 +2382,7 @@ extern u16 Tsa_ExcaliburBg2_Right[];
extern u16 Pal_ExcaliburBg3[];
extern u16 Img_ExcaliburSprites[];
extern u16 Pal_ExcaliburSprites[];
extern u32 gUnknown_087312BC[];
extern u32 AnimScr_EfxExcalibur[];
extern u16 Pal_08731348[];
extern u16 Img_GespenstBg4[];
extern u16 Pal_GespenstBg4[];
Expand Down Expand Up @@ -2446,8 +2446,8 @@ extern u16 Pal_EfxChillEffectBG[];
extern u16 Tsa1_EfxChillEffectBG[];
extern u16 Tsa2_EfxChillEffectBG[];
extern u16 Tsa3_EfxChillEffectBG[];
extern u32 gUnknown_08746508[];
extern u32 gUnknown_0874670C[];
extern u32 AnimScr_EfxChill_R[];
extern u32 AnimScr_EfxChill_L[];
extern u16 Img_08746760[];
extern u16 Img_08746F70[];
extern u16 Img_08747C7C[];
Expand Down Expand Up @@ -2505,7 +2505,7 @@ extern u16 Tsa_08755DE0[];
extern u16 Tsa_08755E94[];
extern u16 Tsa_08755F3C[];
extern u16 Img_SongSprites[];
extern u32 gUnknown_08758134[];
extern u32 AnimScr_EfxSong[];
extern u16 Img_EfxLokmsunaObj[];
extern u32 AnimScr_EfxLokmsunaObjLeft[];
extern u32 AnimScr_EfxLokmsunaObjRight[];
Expand Down
2 changes: 1 addition & 1 deletion include/efxmagic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ void sub_80696F0(void);
int sub_8069704(int a, int b, int c);
int sub_806977C(int a, int b, int c);
void efxDarkGradoOBJ01piece_Loop(struct ProcEfxOBJ * proc);
void sub_8069878(struct Anim * anim, s16 b, s16 c, s16 d, u16 e);
void NewEfxDarkGradoOBJ01piece(struct Anim * anim, s16 b, s16 c, s16 d, u16 e);
void efxDarkGradoOBJ01_Loop(struct ProcEfxOBJ * proc);
void StartSubSpell_efxDarkGradoOBJ01(struct Anim * anim);
void efxDarkGradoOBJ02piece_Loop(struct ProcEfxOBJ * proc);
Expand Down
1 change: 0 additions & 1 deletion include/ekrbattle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,6 @@ extern const u8 Img_080DBE1C[];
extern const u8 Img_080DC350[];
extern const u16 Pal_080DC85C[2];
extern const u16 FrameConfig_AnimaHitBG[];
extern const u16 gUnknown_080DCDE4[];
// extern ??? gFrameConfig_080DD1F4
// extern ??? gUnknown_080DD8C6
// extern ??? gUnknown_080DD8CC
Expand Down
2 changes: 0 additions & 2 deletions ldscript.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,6 @@ SECTIONS
. = ALIGN(4); src/banim-efxmagic-breath.o(.rodata);
. = ALIGN(4); src/banim-efxmagic-thunder.o(.rodata);
. = ALIGN(4); src/banim-efxmagic-fire.o(.rodata);
. = ALIGN(4); data/const_data_efxmagic_DC944.o(.rodata);
. = ALIGN(4); src/banim-efxmagic-fimbulvetr.o(.rodata);
. = ALIGN(4); src/banim-efxmagic-bolting.o(.rodata);
. = ALIGN(4); src/banim-efxmagic-aircalibur.o(.rodata);
Expand Down Expand Up @@ -1022,7 +1021,6 @@ SECTIONS
. = ALIGN(4); src/banim-efxmagic-breath.o(.data);
. = ALIGN(4); src/banim-efxmagic-thunder.o(.data);
. = ALIGN(4); src/banim-efxmagic-fire.o(.data);
. = ALIGN(4); data/banim-efxmagic-fire.o(.data);
. = ALIGN(4); src/banim-efxmagic-fimbulvetr.o(.data);
. = ALIGN(4); src/banim-efxmagic-bolting.o(.data);
. = ALIGN(4); src/banim-efxmagic-aircalibur.o(.data);
Expand Down
2 changes: 1 addition & 1 deletion scripts/dump_anim_sprite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def main(args):
index = 1

PreName = None
PreName = "EfxHazymoonOBJ2_3"
PreName = "EfxStone"

with open(rom, 'rb') as f:
rom_data = f.read()
Expand Down
6 changes: 3 additions & 3 deletions src/banim-efxmagic-crimsoneye.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,11 @@ void StartSubSpell_efxCrimsonEyeOBJFinishPiece(struct Anim * anim, int terminato

if (flag)
{
scr = gUnknown_086B5984;
scr = AnimScr_EfxCrimsonEyeOBJFinishPiece1;
}
else
{
scr = gUnknown_086B598C;
scr = AnimScr_EfxCrimsonEyeOBJFinishPiece2;
}

frontAnim = EfxCreateFrontAnim(anim, scr, scr, scr, scr);
Expand Down Expand Up @@ -1175,7 +1175,7 @@ void StartSubSpell_efxCrimsonEyeOBJ(struct Anim * anim)
proc->unk32 -= 16;
proc->unk3A -= 16;

scr = gUnknown_086B5974;
scr = AnimScr_EfxCrimsonEyeOBJ;

proc->anim2 = frontAnim = EfxCreateFrontAnim(anim, scr, scr, scr, scr);

Expand Down
2 changes: 1 addition & 1 deletion src/banim-efxmagic-demonsurge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ void StartSubSpell_efxGorgonOBJTwisterPiece(struct Anim * anim, int flag, int c,
proc->terminator = terminator;
proc->unk44 = c;

scr = gUnknown_086B5974;
scr = AnimScr_EfxCrimsonEyeOBJ;
frontAnim = EfxCreateFrontAnim(anim, scr, scr, scr, scr);
proc->anim2 = frontAnim;

Expand Down
Loading