diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h new file mode 100644 index 00000000..d5e6557a --- /dev/null +++ b/include/fox_enmy2_assets.h @@ -0,0 +1,118 @@ +#ifndef FOX_ENMY2_ASSETS_H +#define FOX_ENMY2_ASSETS_H + +#include "global.h" + +// Displaylists + +extern Gfx D_40068F0[]; +extern Gfx D_4006E90[]; +extern Gfx D_4000170[]; +extern Gfx D_40084D0[]; +extern Gfx D_400A630[]; +extern Gfx D_4009800[]; +extern Gfx D_40073C0[]; +extern Gfx D_6011F90[]; +extern Gfx D_4000710[]; +extern Gfx D_400BD20[]; +extern Gfx D_4001310[]; +extern Gfx D_601F2A0[]; +extern Gfx D_400AAE0[]; +extern Gfx D_4000650[]; +extern Gfx D_6016190[]; +extern Gfx D_6023500[]; +extern Gfx D_6022DF0[]; +extern Gfx D_4008FA0[]; +extern Gfx D_60285F0[]; +extern Gfx D_600AF70[]; +extern Gfx D_6023E30[]; +extern Gfx D_6001CE0[]; +extern Gfx D_6000840[]; +extern Gfx D_6012A40[]; +extern Gfx D_6009950[]; +extern Gfx D_600B2B0[]; +extern Gfx D_600A2E0[]; +extern Gfx D_600B830[]; +extern Gfx D_6020D20[]; +extern Gfx D_60102C0[]; +extern Gfx D_6017B60[]; +extern Gfx D_6004D00[]; +extern Gfx D_601A880[]; +extern Gfx D_6015D60[]; +extern Gfx D_600B540[]; +extern Gfx D_4000EC0[]; +extern Gfx D_4008D50[]; +extern Gfx D_60102C0[]; +extern Gfx D_601F3D0[]; +extern Gfx D_6022B10[]; +extern Gfx D_60209F0[]; +extern Gfx D_6019430[]; +extern Gfx D_6018960[]; +extern Gfx D_6009F50[]; +extern Gfx D_600C2A0[]; +extern Gfx D_600BD40[]; +extern Gfx D_60205D0[]; +extern Gfx D_60036A0[]; +extern Gfx D_3007650[]; +extern Gfx D_60034D0[]; +extern Gfx D_6005360[]; +extern Gfx D_601B610[]; +extern Gfx D_601C6A0[]; +extern Gfx D_60188D0[]; +extern Gfx D_9012180[]; +extern Gfx D_900EFC0[]; +extern Gfx D_601C520[]; +extern Gfx D_600AF40[]; +extern Gfx D_7000C40[]; +extern Gfx D_70010E0[]; +extern Gfx D_7000E80[]; +extern Gfx D_70008F0[]; +extern Gfx D_7000280[]; +extern Gfx D_600AC70[]; +extern Gfx D_601A2B0[]; +extern Gfx D_6002500[]; +extern Gfx D_60043F0[]; +extern Gfx D_6004310[]; +extern Gfx D_6002740[]; +extern Gfx D_6002890[]; + +extern f32 D_60282A0[]; +extern f32 D_603298C[]; +extern f32 D_6032904[]; +extern f32 D_6032970[]; +extern f32 D_603285C[]; +extern f32 D_6032938[]; +extern f32 D_6032954[]; +extern f32 D_6028254[]; +extern f32 D_60280E0[]; +extern f32 D_6032878[]; +extern f32 D_6032894[]; +extern f32 D_60328B0[]; +extern f32 D_603238C[]; +extern f32 D_60328CC[]; +extern f32 D_6034478[]; +extern f32 D_603450C[]; +extern f32 D_6034588[]; +extern f32 D_6034124[]; +extern f32 D_602C1A0[]; +extern f32 D_60328E8[]; +extern f32 D_602F604[]; +extern f32 D_603445C[]; +extern f32 D_6034664[]; +extern f32 D_60347D4[]; +extern f32 D_6034770[]; +extern f32 D_60347F0[]; +extern f32 D_603486C[]; +extern f32 D_602C294[]; +extern f32 D_601B474[]; +extern f32 D_6030B4C[]; +extern f32 D_601B43C[]; +extern f32 D_6030B30[]; +extern f32 D_60368FC[]; +extern f32 D_60368E0[]; +extern f32 D_60364C0[]; +extern f32 D_601B944[]; +extern f32 D_6009D18[]; +extern f32 D_60368E0[]; + +#endif diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index 38c3686c..81aed539 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -1217,4 +1217,98 @@ D_06011044 = 0x006011044; D_0600FF74 = 0x00600FF74; D_06006EB4 = 0x006006EB4; D_06014D94 = 0x006014D94; -D_0302DE3C = 0x00302DE3C; \ No newline at end of file +D_0302DE3C = 0x00302DE3C; + +// fox_enmy2 +D_6011F90 = 0x06011F90; +D_4000710 = 0x04000710; +D_400BD20 = 0x0400BD20; +D_4001310 = 0x04001310; +D_601F2A0 = 0x0601F2A0; +D_4000650 = 0x04000650; +D_6016190 = 0x06016190; +D_6023500 = 0x06023500; +D_6022DF0 = 0x06022DF0; +D_4008FA0 = 0x04008FA0; +D_60285F0 = 0x060285F0; +D_600AF70 = 0x0600AF70; +D_6023E30 = 0x06023E30; +D_6001CE0 = 0x06001CE0; +D_6012A40 = 0x06012A40; +D_6009950 = 0x06009950; +D_600B2B0 = 0x0600B2B0; +D_600A2E0 = 0x0600A2E0; +D_600B830 = 0x0600B830; +D_6017B60 = 0x06017B60; +D_6004D00 = 0x06004D00; +D_601A880 = 0x0601A880; +D_6015D60 = 0x06015D60; +D_600B540 = 0x0600B540; +D_4000EC0 = 0x04000EC0; +D_4008D50 = 0x04008D50; +D_6022B10 = 0x06022B10; +D_60209F0 = 0x060209F0; +D_6019430 = 0x06019430; +D_6018960 = 0x06018960; +D_6009F50 = 0x06009F50; +D_600C2A0 = 0x0600C2A0; +D_600BD40 = 0x0600BD40; +D_60205D0 = 0x060205D0; +D_9012180 = 0x09012180; +D_900EFC0 = 0x0900EFC0; +D_601C520 = 0x0601C520; +D_7000C40 = 0x07000C40; +D_70010E0 = 0x070010E0; +D_7000E80 = 0x07000E80; +D_70008F0 = 0x070008F0; +D_7000280 = 0x07000280; +D_600AC70 = 0x0600AC70; +D_6002500 = 0x06002500; +D_60043F0 = 0x060043F0; +D_6004310 = 0x06004310; +D_6002740 = 0x06002740; +D_4006E90 = 0x04006E90; +D_4009800 = 0x04009800; +D_40073C0 = 0x040073C0; +D_4000170 = 0x04000170; +D_40084D0 = 0x040084D0; +D_400A630 = 0x0400A630; + +D_60282A0 = 0x060282A0; +D_603298C = 0x0603298C; +D_6032904 = 0x06032904; +D_6032970 = 0x06032970; +D_603285C = 0x0603285C; +D_6032938 = 0x06032938; +D_6032954 = 0x06032954; +D_6028254 = 0x06028254; +D_60280E0 = 0x060280E0; +D_6032878 = 0x06032878; +D_6032894 = 0x06032894; +D_60328B0 = 0x060328B0; +D_603238C = 0x0603238C; +D_60328CC = 0x060328CC; +D_6034478 = 0x06034478; +D_603450C = 0x0603450C; +D_6034588 = 0x06034588; +D_6034124 = 0x06034124; +D_602C1A0 = 0x0602C1A0; +D_60328E8 = 0x060328E8; +D_602F604 = 0x0602F604; +D_603445C = 0x0603445C; +D_6034664 = 0x06034664; +D_60347D4 = 0x060347D4; +D_6034770 = 0x06034770; +D_60347F0 = 0x060347F0; +D_603486C = 0x0603486C; +D_602C294 = 0x0602C294; +D_601B474 = 0x0601B474; +D_6030B4C = 0x06030B4C; +D_601B43C = 0x0601B43C; +D_6030B30 = 0x06030B30; +D_60368FC = 0x060368FC; +D_60368E0 = 0x060368E0; +D_60364C0 = 0x060364C0; +D_601B944 = 0x0601B944; +D_6009D18 = 0x06009D18; +D_60368E0 = 0x060368E0; diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c index 73583e8e..07e09767 100644 --- a/src/main/fox_enmy2.c +++ b/src/main/fox_enmy2.c @@ -4,10 +4,12 @@ s32 D_800CFF80[4] = { 0, 0, 0, 0 }; s32 D_800CFF90 = 0; s32 D_80161690; +#include "fox_enmy2_assets.h" + void func_80187530(Actor*); // figure out which one later void func_8006A7B0(u16* msg, s32 character) { - (void) "Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n"; + PRINTF("Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n"); if ((gRadioState == 0) || (D_80177D68 != character)) { Radio_PlayMessage(msg, character); } @@ -213,13 +215,13 @@ void func_8006B094(Actor* actor) { } s16 D_800CFF94[16] = { - 0, 0x62, 0x60, 0x5E, 0x5C, 0x5A, 0x58, 0x56, 0x54, 0x52, 0x50, 0x4E, 0x4C, 0x4A, 0x48, 0x46, + 0, 98, 96, 94, 92, 90, 88, 86, 84, 82, 80, 78, 76, 74, 72, 70, }; u8 D_800CFFB4[16] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2 }; f32 D_800CFFC4[16] = { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.99f, 0.98f, 0.94f, 0.88f, 0.8f, 1.0f, }; -Gfx* D_800D0004[3] = { 0x04000170, 0x040084D0, 0x0400A630 }; +Gfx* D_800D0004[3] = { D_4000170, D_40084D0, D_400A630 }; void func_8006B0A0(Actor* actor) { Vec3f sp34; @@ -851,114 +853,114 @@ void func_8006D350(Object_80* obj80) { } UnkStruct_D003C D_800D003C[108] = { - { 0x040068F0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { 0x04006E90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_40068F0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_4006E90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, - { 0x04009800, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { 0x040073C0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_4009800, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_40073C0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { D_4007AF0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { 0x06011F90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, - { 0x04000710, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 0, 1, 1, 1.0f, 1 }, + { D_6011F90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, + { D_4000710, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 0, 1, 1, 1.0f, 1 }, { NULL, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, - { 0x0400BD20, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { 0x04001310, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, + { D_400BD20, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_4001310, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, { D_400B390, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { D_6018C00, D_800CBE8C, 2.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { 0x0601F2A0, D_800CBEFC, 7.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { 0x0400AAE0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { 0x04000650, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, - { 0x06016190, 0x060282A0, -2.0f, 2100.0f, 3000.0f, 0, 0, 7, 0, 0.0f, 5 }, - { 0x06023500, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { 0x06022DF0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_601F2A0, D_800CBEFC, 7.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_400AAE0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_4000650, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 }, + { D_6016190, D_60282A0, -2.0f, 2100.0f, 3000.0f, 0, 0, 7, 0, 0.0f, 5 }, + { D_6023500, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_6022DF0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 1, 1, 0, 0.0f, 1 }, { NULL, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, { NULL, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 }, - { 0x04008FA0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { 0x060285F0, 0x0603298C, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x0600AF70, 0x06032904, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x06023E30, 0x06032970, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { NULL, 0x0603285C, 2.5f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 1 }, - { 0x06001CE0, 0x06032938, 3.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 1 }, - { 0x06000840, 0x06032954, 1.0f, 100.0f, 3000.0f, 2, 1, 0, 0, 1.0f, 1 }, - { 0x06012A40, 0x06028254, -2.0f, 2100.0f, 3001.0f, 0, 0, 7, 0, 0.0f, 2 }, - { NULL, 0x060280E0, -2.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 3 }, - { 0x06009950, 0x06032878, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_4008FA0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_60285F0, D_603298C, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_600AF70, D_6032904, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_6023E30, D_6032970, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { NULL, D_603285C, 2.5f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 1 }, + { D_6001CE0, D_6032938, 3.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 1 }, + { D_6000840, D_6032954, 1.0f, 100.0f, 3000.0f, 2, 1, 0, 0, 1.0f, 1 }, + { D_6012A40, D_6028254, -2.0f, 2100.0f, 3001.0f, 0, 0, 7, 0, 0.0f, 2 }, + { NULL, D_60280E0, -2.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 3 }, + { D_6009950, D_6032878, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { 0x0600B2B0, 0x06032894, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x0600A2E0, 0x060328B0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_600B2B0, D_6032894, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_600A2E0, D_60328B0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBEFC, 2.0f, 200.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { 0x0600B830, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { NULL, 0x0603238C, 1.0f, 500.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { 0x06020D20, 0x060328CC, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_600B830, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { NULL, D_603238C, 1.0f, 500.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_6020D20, D_60328CC, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBF34, 1.0f, 100.0f, 3001.0f, 2, 0, 0, 0, 0.0f, 1 }, - { D_60097E0, 0x06034478, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_601D730, 0x0603450C, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_60097E0, D_6034478, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_601D730, D_603450C, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, - { 0x060102C0, 0x06034588, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x06017B60, D_800CBEC4, -1.0f, 300.0f, 3001.0f, 0, 0, 0, 0, 1.0f, 1 }, - { 0x06004D00, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 1, 0, 4, 0, 1.0f, 1 }, - { 0x0601A880, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_60102C0, D_6034588, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_6017B60, D_800CBEC4, -1.0f, 300.0f, 3001.0f, 0, 0, 0, 0, 1.0f, 1 }, + { D_6004D00, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 1, 0, 4, 0, 1.0f, 1 }, + { D_601A880, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, { NULL, D_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 }, { NULL, D_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 }, { NULL, D_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 }, - { 0x06015D60, 0x06034124, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 }, - { NULL, 0x0602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x0600B540, 0x060328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x04000EC0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { 0x04008D50, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_6015D60, D_6034124, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 }, + { NULL, D_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_600B540, D_60328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_4000EC0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, + { D_4008D50, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, { NULL, D_800CBF34, -1.0f, 2000.0f, 3000.0f, 0, 0, 3, 0, 0.0f, 1 }, - { 0x060102C0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x0601F3D0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x06022B10, D_800CBF34, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, - { 0x060209F0, D_800CBF34, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, - { 0x06019430, D_800CBEC4, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { 0x06018960, D_800CBE8C, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { 0x06009F50, D_800CBF34, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_60102C0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_601F3D0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_6022B10, D_800CBF34, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, + { D_60209F0, D_800CBF34, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, + { D_6019430, D_800CBEC4, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_6018960, D_800CBE8C, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_6009F50, D_800CBF34, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBEC4, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { 0x0600C2A0, D_800CBEC4, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { 0x0600BD40, D_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { NULL, 0x0602F604, 3.0f, 100.0f, 3000.0f, 2, 0, 1, 0, 1.0f, 1 }, - { 0x060205D0, 0x0603445C, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { 0x060036A0, 0x06034664, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_600C2A0, D_800CBEC4, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_600BD40, D_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { NULL, D_602F604, 3.0f, 100.0f, 3000.0f, 2, 0, 1, 0, 1.0f, 1 }, + { D_60205D0, D_603445C, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_60036A0, D_6034664, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, { D_601AD70, D_800CBF34, 4.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 }, - { 0x03007650, D_800CBF34, 1.0f, 100.0f, 3000.0f, 2, 0, 5, 0, 0.0f, 1 }, - { 0x060034D0, 0x060347D4, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { 0x06005360, 0x06034770, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { D_600F6C0, 0x060347F0, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x0601B610, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, - { 0x0601C6A0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, - { 0x060188D0, 0x0603486C, 3.0f, 100.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, + { D_3007650, D_800CBF34, 1.0f, 100.0f, 3000.0f, 2, 0, 5, 0, 0.0f, 1 }, + { D_60034D0, D_60347D4, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_6005360, D_6034770, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_600F6C0, D_60347F0, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_601B610, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, + { D_601C6A0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, + { D_60188D0, D_603486C, 3.0f, 100.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 }, { NULL, D_800CBEA8, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 0 }, - { NULL, 0x0602C294, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 }, - { NULL, 0x0601B474, -1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 0.0f, 1 }, + { NULL, D_602C294, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 }, + { NULL, D_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 }, - { NULL, 0x06030B4C, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 60.0f, 1 }, - { 0x09012180, 0x0601B43C, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { NULL, D_6030B4C, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 60.0f, 1 }, + { D_9012180, D_601B43C, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 }, - { 0x0900EFC0, D_800CBF34, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, - { NULL, 0x06030B30, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_900EFC0, D_800CBF34, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, + { NULL, D_6030B30, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, { NULL, D_6030B14_f32, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { 0x0601C520, 0x060368FC, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { 0x0600AF40, 0x060368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { 0x07000C40, D_800CC0D4, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x070010E0, D_800CC0F0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x07000E80, D_800CC054, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, - { 0x070008F0, D_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 0 }, - { 0x07000280, D_800CC070, -1.0f, 1000.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 0 }, - { 0x0600AC70, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, - { 0x0601A2B0, 0x060364C0, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, - { 0x06002500, 0x0601B944, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x060043F0, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x06004310, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, - { 0x06002740, 0x06009D18, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_601C520, D_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_600AF40, D_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_7000C40, D_800CC0D4, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_70010E0, D_800CC0F0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_7000E80, D_800CC054, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 }, + { D_70008F0, D_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 0 }, + { D_7000280, D_800CC070, -1.0f, 1000.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 0 }, + { D_600AC70, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_601A2B0, D_60364C0, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 }, + { D_6002500, D_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_60043F0, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_6004310, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, + { D_6002740, D_6009D18, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 }, { NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, { NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, { NULL, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 }, { NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 0, 0, 6, 0, 0.0f, 0 }, - { 0x06002890, 0x060368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, + { D_6002890, D_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 }, }; u8 D_800D0DBC[6][4] = { // could be in-function