From a9caa3d48d9e096a3e4a96e5b16a5f0ae81807b2 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Tue, 6 Feb 2024 20:13:26 -0300 Subject: [PATCH] fox_enmy symbols --- include/fox_enmy_assets.h | 27 +++++++++++++++++++++++++++ linker_scripts/us/undefined_syms.ld | 22 ++++++++++++++++++++++ src/main/fox_enmy.c | 8 +++++--- 3 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 include/fox_enmy_assets.h diff --git a/include/fox_enmy_assets.h b/include/fox_enmy_assets.h new file mode 100644 index 00000000..8df06095 --- /dev/null +++ b/include/fox_enmy_assets.h @@ -0,0 +1,27 @@ +#ifndef FOX_ENMY_ASSETS_H +#define FOX_ENMY_ASSETS_H + +#include "global.h" + +extern ObjectInit D_060371A4[]; +extern ObjectInit D_06026CC4[]; +extern ObjectInit D_0602A164[]; +extern ObjectInit D_06023F64[]; +extern ObjectInit D_060287A4[]; +extern ObjectInit D_0602E4F4[]; +extern ObjectInit D_06007E74[]; +extern ObjectInit D_0601F234[]; +extern ObjectInit D_06026714[]; +extern ObjectInit D_0C035154[]; +extern ObjectInit D_06006AA4[]; +extern ObjectInit D_06031000[]; +extern ObjectInit D_06006C60[]; +extern ObjectInit D_0602E5C8[]; +extern ObjectInit D_0600EAD4[]; +extern ObjectInit D_06011044[]; +extern ObjectInit D_0600FF74[]; +extern ObjectInit D_06006EB4[]; +extern ObjectInit D_06014D94[]; +extern ObjectInit D_0302DE3C[]; + +#endif diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index ae1d9b5a..38c3686c 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -1196,3 +1196,25 @@ D_1010970 = 0x01010970; // fox_demo D_601F3B8 = 0x0601F3B8; + +// fox_enmy +D_060371A4 = 0x0060371A4; +D_06026CC4 = 0x006026CC4; +D_0602A164 = 0x00602A164; +D_06023F64 = 0x006023F64; +D_060287A4 = 0x0060287A4; +D_0602E4F4 = 0x00602E4F4; +D_06007E74 = 0x006007E74; +D_0601F234 = 0x00601F234; +D_06026714 = 0x006026714; +D_0C035154 = 0x00C035154; +D_06006AA4 = 0x006006AA4; +D_06031000 = 0x006031000; +D_06006C60 = 0x006006C60; +D_0602E5C8 = 0x00602E5C8; +D_0600EAD4 = 0x00600EAD4; +D_06011044 = 0x006011044; +D_0600FF74 = 0x00600FF74; +D_06006EB4 = 0x006006EB4; +D_06014D94 = 0x006014D94; +D_0302DE3C = 0x00302DE3C; \ No newline at end of file diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c index eb067a5d..52680217 100644 --- a/src/main/fox_enmy.c +++ b/src/main/fox_enmy.c @@ -5,10 +5,12 @@ s32 D_Timer_80161670[4]; s32 D_80161680; u8 D_80161684; +#include "fox_enmy_assets.h" + ObjectInit* D_800CFDA0[] = { - 0x060371A4, 0x06026CC4, 0x0602A164, 0x06023F64, 0x060287A4, 0x0602E4F4, 0x06007E74, - 0x0601F234, 0x06026714, 0x0C035154, 0x06006AA4, 0x06031000, 0x06006C60, 0x0602E5C8, - 0x0600EAD4, NULL, 0x06011044, 0x0600FF74, 0x06006EB4, 0x06014D94, 0x0302DE3C, + D_060371A4, D_06026CC4, D_0602A164, D_06023F64, D_060287A4, D_0602E4F4, D_06007E74, + D_0601F234, D_06026714, D_0C035154, D_06006AA4, D_06031000, D_06006C60, D_0602E5C8, + D_0600EAD4, NULL, D_06011044, D_0600FF74, D_06006EB4, D_06014D94, D_0302DE3C, }; s32 D_800CFDF4[] = { OBJ_80_0,