From 89ae8dff96bf6afcf9015446fe24df90b872c774 Mon Sep 17 00:00:00 2001 From: petrie911 <69443847+petrie911@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:41:43 -0600 Subject: [PATCH] fox_6B3B0 and a bunch of names for things (#50) * stuff * three whole files * format * format and such * a switch in time * merge prep * nintendo switch * format * the great switch statement of our time * 43AC0 matched * stuff * Enums everywhere * oh god the switch * knakyo * new headers * format * fox * everyone hates recursion * format * one more thing * one more one more thing * renames --- include/functions.h | 321 +- include/gfx.h | 285 +- include/global.h | 38 +- include/hud.h | 4 +- include/sf64dma.h | 54 +- include/sf64level.h | 86 + include/sf64math.h | 54 + include/sf64mesg.h | 89 +- include/sf64object.h | 720 ++++ include/sf64thread.h | 125 + include/structs.h | 459 +-- include/variables.h | 298 +- linker_scripts/us/symbol_addrs.txt | 39 +- linker_scripts/us/symbol_addrs_engine.txt | 341 +- linker_scripts/us/undefined_syms.ld | 1 + src/assets/ast_DE5D50.c | 1452 ++++---- src/main/fox_43AC0.c | 117 + src/main/fox_52730.c | 311 +- src/main/fox_6B3B0.c | 3889 +++++++++++++++++++++ src/main/fox_97F80.c | 4 +- src/main/fox_A24B0.c | 258 +- src/main/fox_A4290.c | 4 +- src/main/fox_A48A0.c | 4 +- src/main/fox_display.c | 14 +- src/main/fox_edata.c | 8 +- src/main/fox_edata_1C.c | 833 ++--- src/main/fox_edisplay.c | 509 +-- src/main/fox_enmy1.c | 1513 ++++---- src/main/fox_load.c | 112 +- src/main/fox_load_inits.c | 54 +- src/main/fox_message.c | 16 +- src/main/fox_radio.c | 410 ++- src/main/lib.c | 2 +- src/main/main.c | 2 +- src/main/matrix.c | 128 +- src/main/sf_2EFE0.c | 39 +- src/main/sf_43AC0.c | 25 - src/main/sf_6B3B0.c | 125 - src/main/sf_77E40.c | 368 +- src/main/sf_A4B50.c | 536 +-- src/main/sf_hud.c | 423 +-- src/overlays/ovl_DF4260/DF4260.c | 2 +- src/overlays/ovl_DF4260/DFEE30.c | 2 +- src/overlays/ovl_EBFBE0/fox_option.c | 162 +- src/overlays/ovl_EBFBE0/fox_title.c | 196 +- yamls/us/main.yaml | 20 +- 46 files changed, 9738 insertions(+), 4714 deletions(-) create mode 100644 include/sf64level.h create mode 100644 include/sf64object.h create mode 100644 include/sf64thread.h create mode 100644 src/main/fox_43AC0.c create mode 100644 src/main/fox_6B3B0.c delete mode 100644 src/main/sf_43AC0.c delete mode 100644 src/main/sf_6B3B0.c diff --git a/include/functions.h b/include/functions.h index 0c68b58f..87d5378d 100644 --- a/include/functions.h +++ b/include/functions.h @@ -4,13 +4,8 @@ #include "libc/stdbool.h" #include "structs.h" #include "fox_option.h" - -void Controller_Init(void); -void Controller_UpdateInput(void); -void Controller_ReadData(void); -void Save_ReadData(void); -void Save_WriteData(void); -void Controller_Rumble(void); +#include "sf64object.h" +#include "sf64thread.h" s32 Lib_vsPrintf(char* dst, const char* fmt, va_list args); void Lib_Perspective(Gfx** dList); @@ -18,56 +13,9 @@ void Lib_Ortho(Gfx** dList); void Lib_DmaRead(void* src, void* dst, s32 size); void Lib_FillScreen(u8 setFill); -void Lights_SetOneLight(Gfx** dList, s32 dirX, s32 dirY, s32 dirZ, s32 colR, s32 colG, s32 colB, s32 ambR, s32 ambG, s32 ambB); -void Lights_SetTwoLights(Gfx** dList, s32 dir1x, s32 dir1y, s32 dir1z, s32 dir2x, s32 dir2y, s32 dir2z, s32 col1r, s32 col1g, - s32 col1b, s32 col2r, s32 col2g, s32 col2b, s32 ambR, s32 ambG, s32 ambB); -f32 Math_ModF(f32 value, f32 mod); -void Rand_Init(void); -f32 Rand_ZeroOne(void); -void Rand_SetSeed(s32 seed1, s32 seed2, s32 seed3); -f32 Rand_ZeroOneSeeded(void); -f32 Math_Atan2F(f32 y, f32 x); -f32 Math_Atan2F_XY(f32 x, f32 y); -f32 Math_Atan2F_XYAlt(f32 x, f32 y); -f32 Math_PowF(f32 base, s32 exp); -void Math_MinMax(s32* min, s32* max, s32 val1, s32 val2, s32 val3); - -void Matrix_Copy(Matrix*, Matrix*); -void Matrix_Push(Matrix** mtxStack); -void Matrix_Pop(Matrix** mtxStack); -void Matrix_Mult(Matrix*, Matrix*, u8); -void Matrix_Translate(Matrix*, f32, f32, f32, u8); -void Matrix_Scale(Matrix*, f32, f32, f32, u8); -void Matrix_RotateX(Matrix*, f32, u8); -void Matrix_RotateY(Matrix*, f32, u8); -void Matrix_RotateZ(Matrix*, f32, u8); -void Matrix_RotateAxis(Matrix*, f32, f32, f32, f32, u8); -void Matrix_ToMtx(Mtx *dest); -void Matrix_FromMtx(Mtx *src, Matrix *dest); -void Matrix_MultVec3f(Matrix*, Vec3f*, Vec3f*); -void Matrix_MultVec3fNoTranslate(Matrix*, Vec3f*, Vec3f*); -void Matrix_GetYRPAngles(Matrix*, Vec3f*); -void Matrix_GetXYZAngles(Matrix*, Vec3f*); -void Matrix_LookAt(Matrix*, f32, f32, f32, f32, f32, f32, f32, f32, f32, u8); -void Matrix_SetGfxMtx(Gfx**); - -s32 Timer_CreateTask(u64, TimerAction, s32*, s32); - void Memory_FreeAll(void); void* Memory_Allocate(s32); -void Timer_Increment(s32* address, s32 value); -void Timer_SetValue(s32* address, s32 value); -void Timer_CompleteTask(TimerTask*); -void Timer_Wait(u64); - -s32 Save_WriteEeprom(SaveFile*); -s32 Save_ReadEeprom(SaveFile*); - -void Fault_ThreadEntry(void*); -void func_80007FE4(FrameBuffer*, u16, u16); -void Fault_Init(void); - void func_8000FFCC(void); u8* func_8001C3EC(void); @@ -75,7 +23,7 @@ void func_80016A50(void); void func_800182F4(s32); void func_80019218(u32, Vec3f*, u8, f32*, f32*, s8*); void func_8001A500(Vec3f*); -void func_8001A55C(f32*, u32); +void func_8001A55C(Vec3f*, u32); void func_8001A838(u32); void func_8001ACDC(s32); void func_8001AE58(void); @@ -83,8 +31,11 @@ s32 func_8001AE78(void); s32 func_8001AED4(void); void func_8001AF40(s32); void func_8001D1C8(s32, s32); -void func_8001D400(s32); +void func_8001D2FC(Vec3f *, u16); +void func_8001D3A0(Vec3f *, u16); +void func_8001D400(s8); void func_8001D444(u8, u16, u8, u8); +void func_8001D4AC(u16, u8, u8, u8); void func_8001D638(u8); void func_8001DA90(u8); void func_8001DBD0(s32); @@ -129,35 +80,25 @@ void RdRam_CheckIPL3(void); void Mio0_Decompress(void* header, u8* dst); s32 vsprintf(char* dst, const char* fmt, va_list args); -f32 Math_FAtanF(f32); -f32 Math_FAtan2F(f32, f32); -f32 Math_FAsinF(f32); -f32 Math_FAcosF(f32); - -f32 __sinf(f32); -f32 __cosf(f32); - -s64 __ull_div(s64, s64); -s64 __ll_mul(s64, s64); -s64 __ll_rshift(s64, s64); - // sf_2EFE0 -void func_8002E3E0(Object_2F4 *); +void func_8002E3E0(Object_2F4*); void func_8002E548(void); -void func_8002E5E0(Object*); -void func_8002E604(Object*); -void func_8002E628(Object*); -void func_8002E64C(Object*); -void func_8002E670(Object*); -void func_8002E694(Object*); -void func_8002E6B8(Object*); -void func_8002E6DC(Object*); +void func_8002E5E0(Object_408*); +void func_8002E604(Object_408*); +void func_8002E628(Object_408*); +void func_8002E64C(Object_408*); +void func_8002E670(Object_2F4*); +void func_8002E694(Object_2F4*); +void func_8002E6B8(Object_2F4*); +void func_8002E6DC(Object_2F4*); +void func_8002EE64(Object_2F4 *); void func_8002F5F4(void); -void func_800319AC(Object*); -void func_80035448(Object*); +void func_800319AC(Object_2F4*); +void func_80035448(Object_2F4*); //sf_36930 void func_80035E48(Object_70 *); +void func_800365E4(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32); void func_8003DA0C(void); void func_8003DAF0(void); void func_8003DE68(s32, s32); @@ -167,24 +108,25 @@ void func_80040954(void); void func_80040CDC(void); void func_80040CE4(void); -// sf_43AC0 +// fox_43AC0 void func_80042FAC(Object_408 *); -void func_80042FB8(Object*); -void func_80042FC4(Object*); +void func_80042FB8(Object_408*); +void func_80042FC4(Object_408*); void func_80042FD0(Object_408 *); -void func_80042FDC(Object*); -void func_80042FE8(Object*); -void func_800444BC(UnkStruct_D_80178280 *); +void func_80042FDC(Object_408*); +void func_80042FE8(Object_408*); +void func_800444BC(Player *); void func_800515C4(void); // sf_496E0 -void func_8004F8AC(Object*); -void func_8004FEC0(Object*); +void func_8004F8AC(Object_2F4*); +void func_8004FEC0(Object_2F4*); +void func_800515C4(void); // fox_52730 -void func_80053658(UnkStruct_D_80161630 *); +void func_80053658(WingInfo *); void func_8005465C(s32); -void func_80057814(UnkStruct_D_80178280* arg0); +void func_80057814(Player* arg0); void func_80057D00(void); // fox_edata @@ -207,6 +149,9 @@ void func_80059C40(Object_4C*); void func_80059F68(Object_6C*); void func_80059FDC(Object_6C*); void func_8005A094(Object_2F4*); +void func_8005ADAC(Object_2F4*); +void func_8005B1E8(Object_2F4*, s32); +void func_8005B388(Object_2F4*); void func_8005B6A4(Object_2F4*); void func_8005B71C(Object_2F4*); void func_8005B7CC(Object_2F4*); @@ -231,22 +176,24 @@ s32 func_8005F9DC(Vec3f*); void func_80060714(s32 arg0); void func_8006089C(u8 arg0); void func_80060968(void); -void func_80060FBC(Object*, Vec3f*); +void Object_Kill(Object*, Vec3f*); s32 func_80060FE4(Vec3f*, f32); void func_800612B8(ObjectStruct_1C*, u32); -void func_80061364(Object_80*); -void func_80061394(Object_4C*); -void func_800613C4(Object_2F4*); -void func_80061404(Object_408*); -void func_80061444(Object_6C*); -void func_80061474(Object_8C*); +void Object_80_Initialize(Object_80*); +void Object_4C_Initialize(Object_4C*); +void Object_2F4_Initialize(Object_2F4*); +void Object_408_Initialize(Object_408*); +void Object_6C_Initialize(Object_6C*); +void Object_8C_Initialize(Object_8C*); void func_80061B68(void); void func_80061CD0(void); void func_80061E48(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3); void func_80061F0C(Object_2F4* arg0, ObjectInit* arg1, s32 arg2); void func_80062180(ObjectInit* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); +void func_80062C38(f32, f32); s32 func_800631A8(Vec3f*, f32*, Vec3f*); s32 func_8006326C(Vec3f* arg0, Vec3f* arg1, s32 arg2, Object* arg3); +s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3); void func_800652CC(Object_80*); void func_800654E4(Object *); void func_800656D4(Object_2F4*); @@ -265,6 +212,7 @@ void func_800671D0(Object_6C *); void func_800674B4(f32, f32, f32, f32, f32, f32, f32, f32); void func_8006753C(Object_2F4*); void func_80067874(Object_2F4*); +void func_80067A40(void); void func_80067B1C(Object_6C*); void func_80067BEC(Object_6C*); void func_80067F6C(Object_6C*); @@ -290,31 +238,31 @@ void func_80069DF4(Object_80 *); void func_80069E88(Object_4C *); void func_80069F30(Object_6C *); void func_80069FD4(Object_8C *); -void func_8006A06C(UnkStruct_D_80174750*); +void func_8006A06C(UnkEntity30*); void func_8006A38C(void); void func_8006A3E8(void); -//sf_6B3B0 -void func_8006A96C(Object*); -void func_8006A978(Object*); -void func_8006AA98(Object*); -void func_8006AC08(Object*); -void func_8006AD18(Object*); -void func_8006B094(Object*); -void func_8006B0A0(Object_2F4 *, s32); +//fox_6B3B0 +void func_8006A96C(Object_2F4*); +void func_8006A978(Object_2F4*); +void func_8006AA98(Object_80*); +void func_8006AC08(Object_2F4*); +void func_8006AD18(Object_2F4*); +void func_8006B094(Object_2F4*); +void func_8006B0A0(Object_2F4 *); void func_8006B74C(Object_2F4 *); -void func_8006B95C(Object*); -void func_8006BB78(Object*); -void func_8006C008(Object*); -void func_8006D350(Object*); +void func_8006B95C(Object_80*); +void func_8006BB78(Object_2F4*); +void func_8006C008(Object_2F4*); +void func_8006D350(Object_80*); void func_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32); -void func_80072594(Object*); -void func_80074F90(Object*); -void func_80074FF0(Object*); -void func_800763A4(Object_2F4 *, s32); -void func_8007717C(Object_2F4 *, s32); -void func_800771CC(Object*); -void func_80077218(Object*); +void func_80072594(Object_2F4*); +s32 func_80074F90(Object_80*); +void func_80074FF0(Object_2F4*); +void func_800763A4(Object_2F4 *); +void func_8007717C(Object_2F4 *); +void func_800771CC(Object_2F4*); +void func_80077218(Object_2F4*); // sf_77E40 void func_80077240(f32 posX, f32 posY, f32 posZ, s32 arg3); @@ -338,7 +286,7 @@ void func_8007879C(Object_8C* arg0); void func_800788B0(Object_8C* arg0); void func_80078A64(Object_8C* arg0); void func_80078AEC(Object_8C* arg0); -void func_80078B8C(void *unused); +void func_80078B8C(Object_8C *arg0); void func_80078BE0(Object_8C* arg0); void func_80078C84(Object_8C* arg0); void func_80078CE8(Object_8C* arg0); @@ -359,7 +307,7 @@ void func_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 arg3); void func_8007A5F8(Object_8C* arg0, Vec3f* arg1, u32 arg2); void func_8007A6F0(Vec3f *, u32); void func_8007A748(Object_8C*); -s32 func_8007A774(UnkStruct_D_80178280*, Object_8C*, f32); +s32 func_8007A774(Player*, Object_8C*, f32); void func_8007A818(Object_8C*, f32 posX, f32 posY, f32 posZ, f32, u8, u8, u16); void func_8007A900(f32 posX, f32 posY, f32 posZ, f32, u8, u8, u16); void func_8007A994(Object_8C*); @@ -376,64 +324,71 @@ void func_8007B3B8(Object_8C*); void func_8007B550(f32 posX, f32 posY, f32 posZ, f32 arg3, s32 arg4); void func_8007B5C0(Object_8C*); void func_8007B62C(Object_8C*); -void func_8007B670(void*); +void func_8007B670(Object_8C*); void func_8007B67C(Object_8C*); void func_8007B758(Object_8C*); void func_8007B8F8(f32 posX, f32 posY, f32 posZ, f32 arg3); void func_8007B960(Object_8C*); void func_8007BC7C(f32, f32, f32, f32); -void func_8007BCE8(Object*); -void func_8007B9DC(Object*); -void func_8007BDE0(Object*); -void func_8007BE54(Object*); -void func_8007BEE8(Object*); +void func_8007BCE8(Object_8C*); +void func_8007B9DC(Object_8C*); +void func_8007BDE0(Object_8C*); +void func_8007BE54(Object_8C*); +void func_8007BEE8(Object_8C*); void func_8007BFFC(f32, f32, f32, f32, f32, f32, f32, s32); void func_8007C120(f32, f32, f32, f32, f32, f32, f32, s32); -void func_8007C250(Object*); +void func_8007C250(Object_8C*); void func_8007C484(f32, f32, f32, f32, f32, f32, f32, s32); -void func_8007C50C(Object*); -void func_8007C8C4(Object*); -void func_8007C9E0(Object*); -void func_8007CAF0(Object*); +void func_8007C50C(Object_8C*); +void func_8007C688(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4); +void func_8007C8C4(Object_8C*); +void func_8007C9E0(Object_8C*); +void func_8007CAF0(Object_8C*); void func_8007D074(f32, f32, f32, f32); void func_8007D0E0(f32, f32, f32, f32); void func_8007D10C(f32, f32, f32, f32); +void func_8007D1E0(f32, f32, f32, f32); void func_8007D2C8(f32, f32, f32, f32); -void func_8007D2F4(Object*); -void func_8007D55C(Object*); -void func_8007D748(Object*); -void func_8007D8A8(Object*); -void func_8007DA58(Object*); -void func_8007DAE4(Object*); -void func_8007DB70(Object*); -void func_8007DED4(Object*); -void func_8007E014(Object*); -void func_8007E258(Object*); -void func_8007E298(Object*); -void func_8007E330(Object*); -void func_8007E3E4(Object*); -void func_8007E45C(Object*); -void func_8007E5CC(Object*); -void func_8007E648(Object*); +void func_8007D24C(f32, f32, f32, f32); +void func_8007D2F4(Object_8C*); +void func_8007D55C(Object_8C*); +void func_8007D748(Object_8C*); +void func_8007D8A8(Object_8C*); +void func_8007D9DC(f32, f32, f32, f32, f32, s32); +void func_8007DA58(Object_8C*); +void func_8007DAE4(Object_8C*); +void func_8007DB70(Object_8C*); +void func_8007DED4(Object_8C*); +void func_8007E014(Object_8C*); +void func_8007E258(Object_8C*); +void func_8007E298(Object_8C*); +void func_8007E330(Object_8C*); +void func_8007E3E4(Object_8C*); +void func_8007E45C(Object_8C*); +void func_8007E5CC(Object_8C*); +void func_8007E648(Object_8C*); +void func_8007E93C(Object_8C *arg0, u16 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); void func_8007F04C(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32); // Object_Spawn? -void func_8007F438(Object*); -void func_8007F6B0(Object*); -void func_8007F958(Object*); -void func_8007FBE0(Object*); -void func_8007FE88(Object*); -void func_800802B8(Object*); -void func_800802D8(Object*); -void func_800802F8(Object*); -void func_80080360(Object*); -void func_8008040C(Object*); -void func_8008092C(Object*); -void func_80080ACC(Object*); -void func_80080D04(Object*); -void func_80081C5C(Object*); -void func_80082F78(Object*); -void func_800837EC(Object*); -void func_80083B8C(Object*); -void func_80083FA8(Object*); +void func_8007F20C(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); +void func_8007F438(Object_8C*); +void func_8007F6B0(Object_8C*); +void func_8007F958(Object_8C*); +void func_8007FBE0(Object_8C*); +void func_8007FE88(Object_8C*); +void func_800802B8(Object_8C*); +void func_800802D8(Object_8C*); +void func_800802F8(Object_8C*); +void func_80080360(Object_8C*); +void func_8008040C(Object_8C*); +void func_8008092C(Object_8C*); +void func_80080ACC(Object_8C*); +void func_80080D04(Object_8C*); +void func_80081C5C(Object_8C*); +void func_80082F78(Object_8C*); +void func_800837EC(Object_8C*); +void func_80083B8C(Object_8C*); +void func_80083D2C(f32 arg0, f32 arg1, f32 arg2, f32 arg3); +void func_80083FA8(Object_8C*); void func_80084194(Object_8C*); // fox_84F70 @@ -467,13 +422,13 @@ void func_8008E51C(s32* , f32); void func_8008E9EC(f32, f32); void func_8008EA14(f32, f32); void func_8008FA84(void); -void func_8008FE78(Object*); +void func_8008FE78(Object_408*); void func_8008FFF0(Object_408*, s32); bool func_8009092C(Object_2F4*); void func_800907C4(Object_408*); s32 func_800915FC(Object_2F4*); void func_80092D48(Object_2F4 *); -void func_80092EC0(Object*); +void func_80092EC0(Object_2F4*); void func_80094954(Object_8C*); void func_80094BBC(Object_8C*); void func_80094D20(f32, f32); @@ -484,8 +439,8 @@ s32 func_800988B4(Vec3f *vec, Plane *plane); s32 func_800998FC(Vec3f*, Vec3f*, Vec3f*, s32, Vec3f*, f32*); // fox_A24B0 -void func_800A18B0(void); -void func_800A1980(void); +void Game_Initialize(void); +void Game_SetGameState(void); bool func_800A1B6C(void); void func_800A1C14(Gfx **); void func_800A1E68(Gfx **); @@ -503,13 +458,17 @@ bool func_800A3690(Vec3f*, Vec3f*, s32, Vec3f*); void func_800A3CA0(void); // sf_A4B50 -s32 func_800A3F50(u16); +s32 Play_CheckMedalStatus(u16); +s32 Play_GetMaxHealth(void); void func_800A5844(void); void func_800A5D6C(void); void func_800A6148(void); -void func_800A6CD0(UnkStruct_D_80178280 *, s32, s32); +void func_800A69F8(s32 arg0, f32 arg1, f32 arg2, f32 arg3); +void func_800A6CD0(Player *, s32, s32); +s32 func_800A73E4(f32* arg0, s32* arg1, f32 posX, f32 posY, f32 posZ); +s32 func_800A78C4(f32* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6); void func_800B6F50(f32, f32, f32, f32, f32, f32); -void func_800B73E0(UnkStruct_D_80178280 *); +void func_800B73E0(Player *); s32 func_800A73E4(f32* arg0, s32* arg1, f32 posX, f32 posY, f32 posZ); void func_800B86CC(void); @@ -532,6 +491,8 @@ s32 Save_Read(void); void func_EFFA40_80187520(s32, void*); +void func_DF4260_80187530(Object_80*); +void func_DF4260_8018753C(Object_80*); void func_DF4260_801878D8(Object_408 *); void func_DF4260_8018B0B4(Object_2F4 *); void func_DF4260_8018BE7C(Object_408 *); @@ -543,10 +504,14 @@ void func_DF4260_801935CC(Object_408 *); void func_DF4260_80198310(Object_408 *); void func_DF4260_801988E0(void); -void func_E08400_80187B08(Object_2F4 *, s32); +void func_E08400_80187B08(Object_2F4 *); void func_E08400_80188A40(Object_408 *); +void func_E08400_8018CCF8(Object_2F4 *); +void func_E16C50_801AC8A8(f32, f32, f32, f32, s32); +void func_E16C50_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32); void func_E16C50_80187754(Object_408 *); +void func_E16C50_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32); void func_E16C50_80190F08(Object_2F4 *); void func_E16C50_801915A4(Object_2F4 *); void func_E16C50_80191BB8(Object_2F4 *); @@ -566,13 +531,15 @@ void func_E16C50_801B6E54(Object_2F4 *); void func_E16C50_801B7AF0(Object_2F4 *); void func_E16C50_801BA57C(Object_2F4 *); void func_E16C50_801BB26C(Object_2F4 *); +void func_E16C50_80190430(Object_2F4 *); void func_E51970_80193CA4(Object_408 *); -void func_E51970_80198594(Object_408 *, s32); +void func_E51970_80198594(Object_408 *); +void func_E6A810_8018769C(Object_2F4 *); void func_E6A810_80189B80(Object_2F4 *); void func_E6A810_8018ADC4(Object_2F4 *); -void func_E6A810_8018B720(Object_2F4 *, s32); +void func_E6A810_8018B720(Object_2F4 *); void func_E6A810_8018B96C(Object_2F4 *); void func_E6A810_8018BFB0(Object_2F4 *); void func_E6A810_8018E3B0(Object_2F4 *); @@ -581,7 +548,7 @@ void func_E6A810_8018E5E8(Object_2F4 *); void func_E6A810_8018EFF0(Object_4C *); void func_E6A810_8018F0D8(Object_80 *); void func_E6A810_8018FA48(Object_408 *); -void func_E6A810_801990DC(Object_408 *, s32); +void func_E6A810_801990DC(Object_408 *); void func_E6A810_80199F8C(Object_2F4 *); void func_E6A810_801A3E70(Object_2F4 *); void func_E6A810_801A4660(Object_2F4 *); @@ -594,10 +561,12 @@ void func_E6A810_801B58AC(Gfx **, f32); s32 func_E6A810_801B6AEC(f32, f32, f32); void func_E6A810_801B6E20(f32, f32, f32 *, f32 *, f32 *); -void func_E9F1D0_801888F4(Object_2F4 *, s32); +void func_E9F1D0_801A4CB0(Object_2F4*); +void func_E9F1D0_801A3BD4(Object_2F4*); +void func_E9F1D0_801888F4(Object_2F4 *); void func_E9F1D0_8018D16C(Object_408 *); void func_E9F1D0_80197CC4(Object_408 *); -void func_E9F1D0_801A6164(UnkStruct_D_80178280 *); +void func_E9F1D0_801A6164(Player *); void func_EF0260_8018A96C(void); void func_EF0260_8018AAC4(void); diff --git a/include/gfx.h b/include/gfx.h index 47f4b6ef..292a4032 100644 --- a/include/gfx.h +++ b/include/gfx.h @@ -7,12 +7,20 @@ #define SCREEN_WIDTH 320 #define SCREEN_HEIGHT 240 +#define FILL_COLOR(rgba) (((rgba) << 0x10) | (rgba)) #define RGBA16_RED(color16) (((color16) >> 0xB) & 0x1F) #define RGBA16_GRN(color16) (((color16) >> 6) & 0x1F) #define RGBA16_BLU(color16) (((color16) >> 1) & 0x1F) // unclear what the right macro for this is // #define RGBA16_PACK(r, g, b, a) (((u16) ((r) * 0x800) & 0xF800) | ((u16) ((g) * 0x40) & 0x7C0) | ((u16) ((b) * 2) & 0x3E) | ((a) & 1)) +// used for convenience while decopming. You should find/replace them with the full macros before PRing +#define GDL(dl) gSPDisplayList(gMasterDisp++, dl) // 06000000 dl +#define GPC(r, g, b, a) gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, r, g, b, a) // FA000000 RRGGBBAA +#define GEC(r, g, b, a) gDPSetEnvColor(gMasterDisp++, r, g, b, a) // FB000000 RRGGBBAA +#define GSGM_BACK(mode) gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK) // B7000000 00002000, most common geometry mode changed +#define GCGM_BACK(mode) gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK) // B6000000 00002000 + #define gSPSetOtherModeHi(pkt, settings) gSPSetOtherMode(pkt, G_SETOTHERMODE_H, G_MDSFT_BLENDMASK, 24, settings) #define gsSPSetOtherModeHi(settings) gsSPSetOtherMode(G_SETOTHERMODE_H, G_MDSFT_BLENDMASK, 24, settings) @@ -20,6 +28,146 @@ #define VTX_T(x,y,z,s,t,cr,cg,cb,a) { { x, y, z }, 0, { s, t }, { cr, cg, cb, a } } +typedef union { + u16 data[SCREEN_HEIGHT * SCREEN_WIDTH]; + u16 array[SCREEN_HEIGHT][SCREEN_WIDTH]; +} FrameBuffer; // size = 0x25800 + +typedef s32 (*OverrideLimbDraw)(s32, Gfx**, Vec3f*, Vec3f*, void*); +typedef void (*PostLimbDraw)(s32, Vec3f*, void*); + +typedef struct { + /* 0x0 */ u16 xLen; + /* 0x2 */ u16 x; + /* 0x4 */ u16 yLen; + /* 0x6 */ u16 y; + /* 0x8 */ u16 zLen; + /* 0xA */ u16 z; +} JointKey; // size = 0xC + +typedef struct { + /* 0x00 */ s16 frameCount; + /* 0x02 */ s16 limbCount; + /* 0x04 */ u16* frameData; + /* 0x08 */ JointKey* jointKey; +} AnimationHeader; // size = 0xC + +typedef struct Limb { + /* 0x000 */ Gfx* dList; + /* 0x004 */ Vec3f trans; + /* 0x010 */ Vec3s rot; + /* 0x018 */ struct Limb* sibling; + /* 0x01C */ struct Limb* child; +} Limb; // size = 0x20 + +typedef Limb* SkelAnime; + +typedef struct { + /* 0x00 */ AnimationHeader* unk_0; + /* 0x04 */ AnimationHeader* unk_4; + /* 0x08 */ SkelAnime* skelanime; +} Animation; // size = 0x0C + +void Lights_SetOneLight(Gfx** dList, s32 dirX, s32 dirY, s32 dirZ, s32 colR, s32 colG, s32 colB, s32 ambR, s32 ambG, s32 ambB); +void Lights_SetTwoLights(Gfx** dList, s32 dir1x, s32 dir1y, s32 dir1z, s32 dir2x, s32 dir2y, s32 dir2z, s32 col1r, s32 col1g, + s32 col1b, s32 col2r, s32 col2g, s32 col2b, s32 ambR, s32 ambG, s32 ambB); + +char* Graphics_ClearPrintBuffer(char *buf, s32 fill, s32 len); +s32 Graphics_Printf(const char *fmt, ...); +void Texture_Scroll(void *texture, s32 width, s32 height, u8 mode); +void Texture_Mottle(void *dst, void *src, u8 mode); +s32 Animation_GetLimbIndex(Limb* limb, Limb** skeleton); +void Animation_DrawLimb(s32 mode, Limb * limb, Limb* *skeleton, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data); +void Animation_DrawSkeleton(s32 mode, Limb** skeletonSegment, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data, Matrix* transform); +s16 Animation_GetFrameData(AnimationHeader *animationSegmemt, s32 frame, Vec3f *frameTable); +s16 Animation_GetFrameCount(AnimationHeader *animationSegment); +void Animation_FindBoundingBox(Gfx* dList, s32 len, Vec3f *min, Vec3f *max, s32 *vtxFound, s32 *vtxCount, Vtx* *vtxList); +void Animation_GetDListBoundingBox(Gfx *dList, s32 len, Vec3f *min, Vec3f *max); +void Animation_GetSkeletonBoundingBox(Limb **skeletonSegment, AnimationHeader *animationSegment, s32 frame, Vec3f *min, Vec3f* max); +void TextureRect_4bCI(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_4bCI_Flip(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_4bCI_MirX(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_4bCI_MirY(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_8bCI(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_16bRGBA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_16bRGBA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_8bIA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_8bIA_FilpMirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_8bIA_FilpMirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_8bIA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_8bIA_MirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_16bIA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_16bIA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_16bIA_MirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_16bIA_MirXY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void TextureRect_32bRGBA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); +void Graphics_FillRectangle(Gfx **gfxPtr, s32 ulx, s32 uly, s32 lrx, s32 lry, u8 r, u8 g, u8 b, u8 a); +u16* func_8009F7B4(Gfx **gfxPtr, u8 width, u8 height); +void Graphics_DisplayHUDNumber(s32 xPos, s32 yPos, s32 number); +void Graphics_DisplaySmallNumber(s32 xPos, s32 yPos, s32 number); +void Graphics_DisplayLargeText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char *text); +s32 Graphics_GetLargeTextWidth(char *text); +void Graphics_DisplayLargeNumber(s32 xPos, s32 yPos, s32 number); +void Graphics_DisplaySmallText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char *text); +s32 Graphics_GetSmallTextWidth(char *text); +void func_800A1540(s32 arg0, s32 arg1, s32 arg2, s32 arg3); +void func_800A1558(f32 weight, u16 size, void *src1, void *src2, void *dst); + +void RCP_SetupDL(Gfx** gfxP, s16 i); +void RCP_SetFog(Gfx** gfxP, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_0(void); +void RCP_SetupDL_1(void); +void RCP_SetupDL_11(void); +void RCP_SetupDL_12(void); +void RCP_SetupDL_2(void); +void RCP_SetupDL_3(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_4(void); +void RCP_SetupDL_7(void); +void RCP_SetupDL_9(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_8(void); +void RCP_SetupDL_13(void); +void RCP_SetupDL_14(void); +void RCP_SetupDL_17(void); +void RCP_SetupDL_36(void); +void RCP_SetupDL_52(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_62(void); +void RCP_SetupDL_37(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_18(void); +void RCP_SetupDL_20(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_19(void); +void RCP_SetupDL_21(void); +void RCP_SetupDL_33(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_34(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_40(void); +void RCP_SetupDL_42(void); +void RCP_SetupDL_43(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_60(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_47(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_66(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_55(void); +void RCP_SetupDL_57(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_45(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_46(void); +void RCP_SetupDL_41(void); +void RCP_SetupDL_64(void); +void RCP_SetupDL_64_2(void); +void RCP_SetupDL_23(void); +void RCP_SetupDL_29(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_30(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); +void RCP_SetupDL_27(void); +void RCP_SetupDL_32(void); +void RCP_SetupDL_73(void); +void RCP_SetupDL_76(void); +void RCP_SetupDL_74(void); +void RCP_SetupDL_78(void); +void RCP_SetupDL_81(void); +void RCP_SetupDL_48(void); +void RCP_SetupDL_68(void); +void RCP_SetupDL_49(void); +void RCP_SetupDL_44(void); +void RCP_SetupDL_50(void); +void RCP_SetupDL_61(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); + typedef enum SetupDL { /* 0x00 */ SETUPDL_0, /* 0x01 */ SETUPDL_1, @@ -114,141 +262,4 @@ typedef enum SetupDL { extern Gfx gSetupDLs[SETUPDL_MAX][9]; // 0x800D31B0 -typedef s32 (*OverrideLimbDraw)(s32, Gfx**, Vec3f*, Vec3f*, void*); -typedef void (*PostLimbDraw)(s32, Vec3f*, void*); - -typedef struct { - /* 0x0 */ u16 xLen; - /* 0x2 */ u16 x; - /* 0x4 */ u16 yLen; - /* 0x6 */ u16 y; - /* 0x8 */ u16 zLen; - /* 0xA */ u16 z; -} JointKey; // size = 0xC - -typedef struct { - /* 0x00 */ s16 frameCount; - /* 0x02 */ s16 limbCount; - /* 0x04 */ u16* frameData; - /* 0x08 */ JointKey* jointKey; -} AnimationHeader; // size = 0xC - -typedef struct Limb { - /* 0x000 */ Gfx* dList; - /* 0x004 */ Vec3f trans; - /* 0x010 */ Vec3s rot; - /* 0x018 */ struct Limb* sibling; - /* 0x01C */ struct Limb* child; -} Limb; // size = 0x20 - -typedef Limb* SkelAnime; - -typedef struct { - /* 0x00 */ AnimationHeader* unk_0; - /* 0x04 */ AnimationHeader* unk_4; - /* 0x08 */ SkelAnime* skelanime; -} Animation; // size = 0x0C - -char* Graphics_ClearPrintBuffer(char *buf, s32 fill, s32 len); -s32 Graphics_Printf(const char *fmt, ...); -void Texture_Scroll(void *texture, s32 width, s32 height, u8 mode); -void Texture_Mottle(void *dst, void *src, u8 mode); -s32 Animation_GetLimbIndex(Limb* limb, Limb** skeleton); -void Animation_DrawLimb(s32 mode, Limb * limb, Limb* *skeleton, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data); -void Animation_DrawSkeleton(s32 mode, Limb** skeletonSegment, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data, Matrix* transform); -s16 Animation_GetFrameData(AnimationHeader *animationSegmemt, s32 frame, Vec3f *frameTable); -s16 Animation_GetFrameCount(AnimationHeader *animationSegment); -void Animation_FindBoundingBox(Gfx* dList, s32 len, Vec3f *min, Vec3f *max, s32 *vtxFound, s32 *vtxCount, Vtx* *vtxList); -void Animation_GetDListBoundingBox(Gfx *dList, s32 len, Vec3f *min, Vec3f *max); -void Animation_GetSkeletonBoundingBox(Limb **skeletonSegment, AnimationHeader *animationSegment, s32 frame, Vec3f *min, Vec3f* max); -f32 Math_SmoothStepToF(f32 *value, f32 target, f32 scale, f32 maxStep, f32 minStep); -f32 Math_SmoothStepToAngle(f32 *angle, f32 target, f32 scale, f32 maxStep, f32 minStep); -void Math_SmoothStepToVec3fArray(Vec3f *src, Vec3f *dst, s32 mode, s32 count, f32 scale, f32 maxStep, f32 minStep); -s32 Math_PursueVec3f(Vec3f *pos, Vec3f *target, Vec3f *rot, f32 stepSize, f32 scaleTurn, f32 maxTurn, f32 dist); -void TextureRect_4bCI(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_4bCI_Flip(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_4bCI_MirX(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_4bCI_MirY(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_8bCI(Gfx **gfxPtr, void* texture, void* palette, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_16bRGBA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_16bRGBA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_8bIA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_8bIA_FilpMirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_8bIA_FilpMirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_8bIA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_8bIA_MirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_16bIA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_16bIA_MirX(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_16bIA_MirY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_16bIA_MirXY(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void TextureRect_32bRGBA(Gfx **gfxPtr, void* texture, u32 width, u32 height, f32 xPos, f32 yPos, f32 xScale, f32 yScale); -void Graphics_FillRectangle(Gfx **gfxPtr, s32 ulx, s32 uly, s32 lrx, s32 lry, u8 r, u8 g, u8 b, u8 a); -void Math_Vec3fFromAngles(Vec3f *step, f32 xRot, f32 yRot, f32 stepsize); -f32 Math_RadToDeg(f32 rAngle); -u16* func_8009F7B4(Gfx **gfxPtr, u8 width, u8 height); -void Graphics_DisplayHUDNumber(s32 xPos, s32 yPos, s32 number); -void Graphics_DisplaySmallNumber(s32 xPos, s32 yPos, s32 number); -void Graphics_DisplayLargeText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char *text); -s32 Graphics_GetLargeTextWidth(char *text); -void Graphics_DisplayLargeNumber(s32 xPos, s32 yPos, s32 number); -void Graphics_DisplaySmallText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char *text); -s32 Graphics_GetSmallTextWidth(char *text); -void func_800A1540(s32 arg0, s32 arg1, s32 arg2, s32 arg3); -void func_800A1558(f32 weight, u16 size, void *src1, void *src2, void *dst); - -void RCP_SetupDL(Gfx** gfxP, s16 i); -void RCP_SetFog(Gfx** gfxP, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_0(void); -void RCP_SetupDL_1(void); -void RCP_SetupDL_11(void); -void RCP_SetupDL_12(void); -void RCP_SetupDL_2(void); -void RCP_SetupDL_3(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_4(void); -void RCP_SetupDL_7(void); -void RCP_SetupDL_9(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_8(void); -void RCP_SetupDL_13(void); -void RCP_SetupDL_14(void); -void RCP_SetupDL_17(void); -void RCP_SetupDL_36(void); -void RCP_SetupDL_52(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_62(void); -void RCP_SetupDL_37(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_18(void); -void RCP_SetupDL_20(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_19(void); -void RCP_SetupDL_21(void); -void RCP_SetupDL_33(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_34(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_40(void); -void RCP_SetupDL_42(void); -void RCP_SetupDL_43(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_60(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_47(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_66(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_55(void); -void RCP_SetupDL_57(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_45(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_46(void); -void RCP_SetupDL_41(void); -void RCP_SetupDL_64(void); -void RCP_SetupDL_64_2(void); -void RCP_SetupDL_23(void); -void RCP_SetupDL_29(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_30(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); -void RCP_SetupDL_27(void); -void RCP_SetupDL_32(void); -void RCP_SetupDL_73(void); -void RCP_SetupDL_76(void); -void RCP_SetupDL_74(void); -void RCP_SetupDL_78(void); -void RCP_SetupDL_81(void); -void RCP_SetupDL_48(void); -void RCP_SetupDL_68(void); -void RCP_SetupDL_49(void); -void RCP_SetupDL_44(void); -void RCP_SetupDL_50(void); -void RCP_SetupDL_61(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); - #endif diff --git a/include/global.h b/include/global.h index 6c78115b..0a9b4a08 100644 --- a/include/global.h +++ b/include/global.h @@ -17,41 +17,9 @@ #include "macros.h" #include "sf64math.h" #include "sf64mesg.h" +#include "sf64object.h" +#include "sf64level.h" +#include "sf64thread.h" #include "gfx.h" -typedef enum { - SI_READ_CONTROLLER = 10, - SI_READ_SAVE, - SI_WRITE_SAVE, - SI_RUMBLE, - SI_SAVE_FAILED, - SI_SAVE_SUCCESS, - SI_CONT_READ_DONE, -} SerialMesg; - -#define MSG_QUEUE_EMPTY -1 - -#define FAULT_MESG_BREAK 1 -#define FAULT_MESG_FAULT 2 - -#define TASK_MESG_1 1 -#define TASK_MESG_2 2 - -#define EVENT_MESG_SP 1 -#define EVENT_MESG_DP 2 -#define EVENT_MESG_VI 3 -#define EVENT_MESG_PRENMI 4 - -typedef enum { - THREAD_ID_SYSTEM, - THREAD_ID_IDLE, - THREAD_ID_FAULT, - THREAD_ID_MAIN, - THREAD_ID_4, - THREAD_ID_AUDIO, - THREAD_ID_GRAPHICS, - THREAD_ID_7, - THREAD_ID_SERIAL, -} ThreadID; - #endif // GLOBAL_H diff --git a/include/hud.h b/include/hud.h index 24ed4aeb..03b17705 100644 --- a/include/hud.h +++ b/include/hud.h @@ -64,7 +64,7 @@ extern s32 D_80161718; extern s32 D_8016171C; extern s32 D_801617E8[]; extern s32 D_801617FC; -extern s32 D_80161A98; +extern s32 gHitCount; extern s32 D_80177838; extern s32 D_80177854; extern s32 D_80177880; @@ -75,7 +75,7 @@ extern s32 D_80177B48; extern s32 D_80177B50[]; extern s32 D_80177B70[]; extern s32 D_80177E7C; -extern s32 D_80178234; +extern s32 gCurrentLevel; extern s32 D_80178750; #endif diff --git a/include/sf64dma.h b/include/sf64dma.h index f63af22d..249bc487 100644 --- a/include/sf64dma.h +++ b/include/sf64dma.h @@ -92,33 +92,33 @@ typedef struct { extern DmaEntry gDmaTable[]; // 178A70 -extern OverlayInit sLogoOverlay[1]; // sets segment 15 with no overlay -extern OverlayInit sCreditsOverlay_6[6]; // overlay EF0260 -extern OverlayInit sEBFBE0_Overlay1[1]; // EBFBE0 -extern OverlayInit sEBFBE0_Overlay2[1]; // EBFBE0 -extern OverlayInit sEBFBE0_Overlay3[1]; // EBFBE0 -extern OverlayInit sEBFBE0_Overlay4[1]; // EBFBE0 -extern OverlayInit sDF4260_Overlay1[1]; // DF4260 -extern OverlayInit sE08400_Overlay1_2[2]; // E08400 -extern OverlayInit sE6A810_Overlay1_6[6]; // E6A810 -extern OverlayInit sE08400_Overlay2_2[2]; // E08400 -extern OverlayInit sE51970_Overlay1[1]; // E51970 -extern OverlayInit sE16C50_Overlay1[1]; // E16C50 -extern OverlayInit sE16C50_Overlay2[1]; // E16C50 -extern OverlayInit sE51970_Overlay2_2[2]; // E51970 -extern OverlayInit sE16C50_Overlay3[1]; // E16C50 -extern OverlayInit sE9F1D0_Overlay1[1]; // E9F1D0 -extern OverlayInit sE16C50_Overlay4[1]; // E16C50 -extern OverlayInit sE16C50_Overlay5[1]; // E16C50 -extern OverlayInit sDF4260_Overlay2[1]; // DF4260 -extern OverlayInit sE9F1D0_Overlay2[1]; // E9F1D0 -extern OverlayInit sE9F1D0_Overlay3_2[2]; // E9F1D0 -extern OverlayInit sE08400_Overlay3[1]; // E08400 -extern OverlayInit sE51970_Overlay3[1]; // E51970 -extern OverlayInit sE51970_Overlay4[1]; // E51970 -extern OverlayInit sE6A810_Overlay2_2[2]; // E6A810 -extern OverlayInit sDF4260_Overlay3[1]; // DF4260 -extern OverlayInit sE08400_Overlay4_2[2]; // E08400 +extern OverlayInit sNoOvl_Logo[1]; // sets segment 15 with no overlay +extern OverlayInit sOvlEF0260_Credits[6]; // overlay EF0260 +extern OverlayInit sOvlEBFBE0_Title[1]; // EBFBE0 +extern OverlayInit sOvlEBFBE0_Menu[1]; // EBFBE0 +extern OverlayInit sOvlEBFBE0_Map[1]; // EBFBE0 +extern OverlayInit sOvlEBFBE0_State5[1]; // EBFBE0 +extern OverlayInit sOvlDF4260_Corneria[1]; // DF4260 +extern OverlayInit sOvlE08400_Meteo[2]; // E08400 +extern OverlayInit sOvlE6A810_Titania[6]; // E6A810 +extern OverlayInit sOvlE08400_SectorX[2]; // E08400 +extern OverlayInit sOvlE51970_SectorZ[1]; // E51970 +extern OverlayInit sOvlE16C50_Aquas[1]; // E16C50 +extern OverlayInit sOvlE16C50_Area6[1]; // E16C50 +extern OverlayInit sOvlE51970_Fortuna[2]; // E51970 +extern OverlayInit sOvlE16C50_Unk4[1]; // E16C50 +extern OverlayInit sOvlE9F1D0_SectorY[1]; // E9F1D0 +extern OverlayInit sOvlE16C50_Solar[1]; // E16C50 +extern OverlayInit sOvlE16C50_Zoness[1]; // E16C50 +extern OverlayInit sOvlDF4260_Venom1[1]; // DF4260 +extern OverlayInit sOvlE9F1D0_Venom2[1]; // E9F1D0 +extern OverlayInit sOvlE9F1D0_VenomSW[2]; // E9F1D0 +extern OverlayInit sOvlE08400_Setup20[1]; // E08400 +extern OverlayInit sOvlE51970_Bolse[1]; // E51970 +extern OverlayInit sOvlE51970_Katina[1]; // E51970 +extern OverlayInit sOvlE6A810_Macbeth[2]; // E6A810 +extern OverlayInit sOvlDF4260_Training[1]; // DF4260 +extern OverlayInit sOvlE08400_Versus[2]; // E08400 extern OverlayInit sEFFA40_Overlay[1]; // EFFA40 DECLARE_SEGMENT(makerom); diff --git a/include/sf64level.h b/include/sf64level.h new file mode 100644 index 00000000..5ab18b4b --- /dev/null +++ b/include/sf64level.h @@ -0,0 +1,86 @@ +#ifndef SF64_LEVEL +#define SF64_LEVEL + +#include "structs.h" + +typedef enum { + LEVELTYPE_GROUND, + LEVELTYPE_SPACE, + LEVELTYPE_UNK2, + LEVELTYPE_UNK3, +} LevelType; + +typedef struct { + /* 0x00 */ s32 type; + /* 0x04 */ s32 unk_04; + /* 0x08 */ u16 bgColor; + /* 0x0A */ u16 unk_0A; + /* 0x0C */ s32 fogR; + /* 0x10 */ s32 fogG; + /* 0x14 */ s32 fogB; + /* 0x18 */ s32 fogN; + /* 0x1C */ s32 fogF; + /* 0x20 */ Vec3f unk_20; + /* 0x2C */ s32 lightR; + /* 0x30 */ s32 lightG; + /* 0x34 */ s32 lightB; + /* 0x38 */ s32 ambR; + /* 0x3C */ s32 ambG; + /* 0x40 */ s32 ambB; +} EnvSettings; // size = 0x44? + +typedef enum { + OVL_SETUP_TITLE, + OVL_SETUP_MENU, + OVL_SETUP_MAP, + OVL_SETUP_STATE_5, + OVL_SETUP_CREDITS, + OVL_SETUP_CORNERIA, + OVL_SETUP_METEO, + OVL_SETUP_TITANIA, + OVL_SETUP_SECTOR_X, + OVL_SETUP_AQUAS, + OVL_SETUP_AREA_6, + OVL_SETUP_FORTUNA, + OVL_SETUP_UNK_4, + OVL_SETUP_SECTOR_Y, + OVL_SETUP_SOLAR, + OVL_SETUP_ZONESS, + OVL_SETUP_VENOM_2, + OVL_SETUP_TRAINING, + OVL_SETUP_VENOM_1, + OVL_SETUP_KATINA, + OVL_SETUP_20, + OVL_SETUP_MACBETH, + OVL_SETUP_BOLSE, + OVL_SETUP_SECTOR_Z, + OVL_SETUP_VENOM_SW, + OVL_SETUP_VERSUS = 50, + OVL_SETUP_LOGO = 99, +} OverlaySetups; + +typedef enum { + LEVEL_CORNERIA, + LEVEL_METEO, + LEVEL_SECTOR_X, + LEVEL_AREA_6, + LEVEL_UNK_4, + LEVEL_SECTOR_Y, + LEVEL_VENOM_1, + LEVEL_SOLAR, + LEVEL_ZONESS, + LEVEL_VENOM_2, + LEVEL_TRAINING, + LEVEL_MACBETH, + LEVEL_TITANIA, + LEVEL_AQUAS, + LEVEL_FORTUNA, + LEVEL_UNK_15, + LEVEL_KATINA, + LEVEL_BOLSE, + LEVEL_SECTOR_Z, + LEVEL_VENOM_SW, + LEVEL_VERSUS, +} LevelId; + +#endif diff --git a/include/sf64math.h b/include/sf64math.h index 508a848e..420a2d1e 100644 --- a/include/sf64math.h +++ b/include/sf64math.h @@ -9,6 +9,11 @@ typedef struct { /* 0x8 */ f32 z; } Vec3f; // size = 0xC +typedef struct { + Vec3f normal; + f32 dist; +} Plane; + typedef struct { /* 0x0 */ s16 x; /* 0x2 */ s16 y; @@ -26,4 +31,53 @@ typedef union { // u64 force_struct_alignment; } Matrix; // size = 0x40 +f32 Math_ModF(f32 value, f32 mod); +void Rand_Init(void); +f32 Rand_ZeroOne(void); +void Rand_SetSeed(s32 seed1, s32 seed2, s32 seed3); +f32 Rand_ZeroOneSeeded(void); +f32 Math_Atan2F(f32 y, f32 x); +f32 Math_Atan2F_XY(f32 x, f32 y); +f32 Math_Atan2F_XYAlt(f32 x, f32 y); +f32 Math_PowF(f32 base, s32 exp); +void Math_MinMax(s32* min, s32* max, s32 val1, s32 val2, s32 val3); + +f32 Math_SmoothStepToF(f32 *value, f32 target, f32 scale, f32 maxStep, f32 minStep); +f32 Math_SmoothStepToAngle(f32 *angle, f32 target, f32 scale, f32 maxStep, f32 minStep); +void Math_SmoothStepToVec3fArray(Vec3f *src, Vec3f *dst, s32 mode, s32 count, f32 scale, f32 maxStep, f32 minStep); +s32 Math_PursueVec3f(Vec3f *pos, Vec3f *target, Vec3f *rot, f32 stepSize, f32 scaleTurn, f32 maxTurn, f32 dist); +void Math_Vec3fFromAngles(Vec3f *step, f32 xRot, f32 yRot, f32 stepsize); +f32 Math_RadToDeg(f32 rAngle); + +void Matrix_Copy(Matrix*, Matrix*); +void Matrix_Push(Matrix** mtxStack); +void Matrix_Pop(Matrix** mtxStack); +void Matrix_Mult(Matrix*, Matrix*, u8); +void Matrix_Translate(Matrix*, f32, f32, f32, u8); +void Matrix_Scale(Matrix*, f32, f32, f32, u8); +void Matrix_RotateX(Matrix*, f32, u8); +void Matrix_RotateY(Matrix*, f32, u8); +void Matrix_RotateZ(Matrix*, f32, u8); +void Matrix_RotateAxis(Matrix*, f32, f32, f32, f32, u8); +void Matrix_ToMtx(Mtx *dest); +void Matrix_FromMtx(Mtx *src, Matrix *dest); +void Matrix_MultVec3f(Matrix*, Vec3f*, Vec3f*); +void Matrix_MultVec3fNoTranslate(Matrix*, Vec3f*, Vec3f*); +void Matrix_GetYRPAngles(Matrix*, Vec3f*); +void Matrix_GetXYZAngles(Matrix*, Vec3f*); +void Matrix_LookAt(Matrix*, f32, f32, f32, f32, f32, f32, f32, f32, f32, u8); +void Matrix_SetGfxMtx(Gfx**); + +f32 Math_FAtanF(f32); +f32 Math_FAtan2F(f32, f32); +f32 Math_FAsinF(f32); +f32 Math_FAcosF(f32); + +f32 __sinf(f32); +f32 __cosf(f32); + +s64 __ull_div(s64, s64); +s64 __ll_mul(s64, s64); +s64 __ll_rshift(s64, s64); + #endif diff --git a/include/sf64mesg.h b/include/sf64mesg.h index 5a8b0260..c3015b6d 100644 --- a/include/sf64mesg.h +++ b/include/sf64mesg.h @@ -21,6 +21,87 @@ bool Message_DisplayText(Gfx** gfxPtr, u16* msgPtr, s32 xPos, s32 yPos, s32 len) void Message_DisplayScrollingText(Gfx** gfxPtr, u16* msgPtr, s32 xPos, s32 yPos, s32 yRangeHi, s32 yRangeLo, s32 len); bool Message_IsPrintingChar(u16* msgPtr, s32 charPos); +typedef enum { + RCID_FOX = 0, + RCID_FOX_OPEN, + RCID_FOX_RED = 5, + RCID_FOX_RED_OPEN, + RCID_STATIC = 2, + RCID_STATIC_FLIP, + RCID_FALCO = 10, + RCID_FALCO_OPEN, + RCID_FALCO_RED = 15, + RCID_FALCO_RED_OPEN, + RCID_SLIPPY = 20, + RCID_SLIPPY_OPEN, + RCID_SLIPPY_RED = 25, + RCID_SLIPPY_RED_OPEN, + RCID_PEPPY = 30, + RCID_PEPPY_OPEN, + RCID_PEPPY_RED = 35, + RCID_PEPPY_RED_OPEN, + RCID_KATT = 40, + RCID_KATT_OPEN, + RCID_ANDROSS = 50, + RCID_ANDROSS_OPEN, + RCID_ANDROSS_RED = 55, + RCID_ANDROSS_RED_OPEN, + RCID_JAMES = 60, + RCID_JAMES_OPEN, + RCID_PEPPER = 70, + RCID_PEPPER_OPEN, + RCID_BOSS_CORNERIA = 80, + RCID_BOSS_CORNERIA_OPEN, + RCID_ROB64 = 90, + RCID_ROB64_OPEN, + RCID_ROB64_RED = 95, + RCID_ROB64_RED_OPEN, + RCID_BOSS_METEO = 100, + RCID_BOSS_METEO_OPEN, + RCID_BOSS_CORNERIA2 = 110, + RCID_BOSS_CORNERIA2_OPEN, + RCID_BOSS_AREA6 = 120, + RCID_BOSS_AREA6_OPEN, + RCID_BOSS_ZONESS = 130, + RCID_BOSS_ZONESS_OPEN, + RCID_ROB64_2 = 140, + RCID_ROB64_2_OPEN, + RCID_BOSS_SECTORX = 150, + RCID_BOSS_SECTORX_OPEN, + RCID_BOSS_SECTORY = 160, + RCID_BOSS_SECTORY_OPEN, + RCID_BILL = 170, + RCID_BILL_OPEN, + RCID_CAIMAN_AREA6 = 180, + RCID_CAIMAN_AREA6_OPEN, + RCID_BOSS_MACBETH = 190, + RCID_BOSS_MACBETH_OPEN, + RCID_WOLF = 200, + RCID_WOLF_OPEN, + RCID_PIGMA = 210, + RCID_PIGMA_OPEN, + RCID_LEON = 220, + RCID_LEON_OPEN, + RCID_ANDREW = 230, + RCID_ANDREW_OPEN, + RCID_WOLF_2 = 240, + RCID_WOLF_2_OPEN, + RCID_PIGMA_2 = 250, + RCID_PIGMA_2_OPEN, + RCID_LEON_2 = 260, + RCID_LEON_2_OPEN, + RCID_ANDREW_2 = 270, + RCID_ANDREW_2_OPEN, + RCID_ROB64_TITLE = 300, + RCID_ROB64_TITLE_OPEN, + RCID_PEPPER_TITLE = 310, + RCID_PEPPER_TITLE_OPEN, + RCID_TRAINING = 350, + RCID_TRAINING_OPEN, + RCID_FOX_EXPERT = 400, + RCID_FOX_EXPERT_OPEN, +} RadioCharacterId; + typedef enum { MSGCHAR_END, MSGCHAR_NWL, @@ -30,10 +111,10 @@ typedef enum { MSGCHAR_NP5, MSGCHAR_NP6, MSGCHAR_NP7, - MSGCHAR_NP8, - MSGCHAR_NP9, - MSGCHAR_NPA, - MSGCHAR_NPB, + MSGCHAR_PRI0, + MSGCHAR_PRI1, + MSGCHAR_PRI2, + MSGCHAR_PRI3, MSGCHAR_SPC, MSGCHAR_QSP, MSGCHAR_HSP, diff --git a/include/sf64object.h b/include/sf64object.h new file mode 100644 index 00000000..27325a5e --- /dev/null +++ b/include/sf64object.h @@ -0,0 +1,720 @@ +#ifndef SF64_OBJECT +#define SF64_OBJECT + +#include "libultra/ultra64.h" +#include "sf64math.h" + +typedef struct { + /* 0x00 */ f32 zPos1; + /* 0x04 */ s16 zPos2; + /* 0x06 */ s16 xPos; + /* 0x08 */ s16 yPos; + /* 0x0A */ s16 unk_A; + /* 0x0C */ s16 unk_C; + /* 0x0E */ s16 unk_E; + /* 0x10 */ s16 id; +} ObjectInit; // size = 0x14 + +typedef struct { + /* 0x00 */ Gfx* unk_00; + /* 0x04 */ f32* unk_04; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 unk_10; + /* 0x14 */ u8 unk_14; + /* 0x15 */ u8 unk_15; + /* 0x16 */ u8 unk_16; + /* 0x17 */ u8 unk_17; + /* 0x18 */ f32 unk_18; + /* 0x1C */ u8 unk_1C; +} UnkStruct_D003C; // size = 0x20 + +typedef struct { + /* 0x00 */ u8 status; + /* 0x02 */ u16 id; + /* 0x04 */ Vec3f pos; + /* 0x10 */ Vec3f rot; +} Object; // size = 0x1C + +typedef void (*ObjectFunc)(Object*); + +typedef struct { + /* 0x00 */ union { + ObjectFunc draw; + Gfx* dList; + }; + /* 0x00 */ u8 drawType; + /* 0x08 */ ObjectFunc action; // argument must have object type. + /* 0x0C */ f32* unk_0C; // some sort of script? + /* 0x10 */ f32 unk_10; // z coordinate of something + /* 0x14 */ s16 unk_14; // can be -1, 0, 1 + /* 0x16 */ s16 unk_16; // can be 0, 1, 2 + /* 0x18 */ u8 unk_18; // damage? + /* 0x19 */ u8 unk_19; // can be 0, 1, 2 + /* 0x1C */ f32 unk_1C; // y offset of something + /* 0x20 */ u8 unk_20; // increment for something +} ObjectStruct_1C; // size = 0x24 + +typedef struct { + /* 0x00 */ Object obj; + /* 0x1C */ char pad1C[4]; + /* 0x20 */ Vec3f unk_20; + /* 0x2C */ char pad2C[0xC]; + /* 0x38 */ Vec3f unk_38; + /* 0x44 */ char pad44[0x14]; + /* 0x58 */ s32 unk_58; + /* 0x5C */ char pad5C[4]; + /* 0x60 */ s32 unk_60; + /* 0x64 */ s32 unk_64; + /* 0x68 */ s32 unk_68; + /* 0x6C */ char pad6C[4]; +} Object_70; // size = 0x70 + +typedef struct { + /* 0x00 */ Object obj; + /* 0x1C */ ObjectStruct_1C unk_1C; + /* 0x40 */ char unk40[0x8]; + /* 0x48 */ Vec3f unk_48; + /* 0x54 */ f32 unk_54; +} Object_58; // size = 0x58 + +typedef struct { + /* 0x00 */ Object obj; + /* 0x1C */ ObjectStruct_1C unk_1C; + /* 0x40 */ s32 unk_40; + /* 0x44 */ s32 unk_44; + /* 0x48 */ s32 unk_48; + /* 0x4C */ s32 unk_4C; + /* 0x50 */ u8 unk_50; + /* 0x51 */ char pad51[3]; + /* 0x54 */ s32 unk_54; + /* 0x58 */ char pad58[8]; + /* 0x60 */ f32 unk_60; + /* 0x64 */ Vec3f unk_64; + /* 0x70 */ Vec3f unk_70; + /* 0x7C */ char pad7C[4]; +} Object_80; // size = 0x80 + +typedef struct { + /* 0x00 */ Object obj; + /* 0x1C */ ObjectStruct_1C unk_1C; + /* 0x40 */ s32 unk_40; + /* 0x44 */ char pad44[1]; + /* 0x45 */ u8 unk_45; // could be short loaded as u8 + /* 0x46 */ s8 unk_46; + /* 0x48 */ s32 unk_48; +} Object_4C; // size = 0x4C + +typedef struct { + /* 0x00 */ Object obj; + /* 0x1C */ ObjectStruct_1C unk_1C; + /* 0x40 */ s32 unk_40; + /* 0x44 */ s16 unk_44; + /* 0x46 */ u8 unk_46; + /* 0x48 */ u16 unk_48; + /* 0x4A */ u16 unk_4A; + /* 0x4C */ s8 unk_4C; + /* 0x4E */ s16 unk_4E; + /* 0x50 */ f32 unk_50; + /* 0x54 */ f32 unk_54; + /* 0x58 */ f32 unk_58; + /* 0x5C */ Vec3f unk_5C; + /* 0x68 */ f32 unk_68; +} Object_6C; // size 0x6C + +typedef struct { + /* 0x00 */ Object obj; + /* 0x1C */ ObjectStruct_1C unk_1C; + /* 0x40 */ s32 unk_40; + /* 0x44 */ s16 unk_44; + /* 0x46 */ s16 unk_46; + /* 0x48 */ s16 unk_48; + /* 0x4A */ s16 unk_4A; + /* 0x4C */ u8 unk_4C; + /* 0x4E */ s16 unk_4E; + /* 0x50 */ u16 unk_50; + /* 0x52 */ char pad52[0x2]; + /* 0x54 */ Vec3f unk_54; + /* 0x60 */ Vec3f unk_60; + /* 0x6C */ f32 unk_6C; + /* 0x70 */ f32 unk_70; + /* 0x74 */ Gfx* unk_74; + /* 0x78 */ s16 unk_78; + /* 0x7A */ s16 unk_7A; + /* 0x7C */ char pad7C[4]; + /* 0x80 */ Vec3f unk_80; +} Object_8C; // size 0x8C + +typedef struct { + /* 0x000 */ Object obj; + /* 0x01C */ ObjectStruct_1C unk_01C; + /* 0x040 */ s32 unk_040; + /* 0x044 */ char unk_44[0xA]; + /* 0x04E */ s16 unk_04E; + /* 0x050 */ s16 unk_050; + /* 0x052 */ s16 unk_052; + /* 0x054 */ s16 unk_054; + /* 0x056 */ s16 unk_056; + /* 0x058 */ s16 unk_058; + /* 0x05A */ s16 unk_05A; + /* 0x05C */ s16 unk_05C; + /* 0x05E */ u8 unk_05E; + /* 0x05F */ char pad5F[3]; + /* 0x062 */ s8 unk_062; + /* 0x063 */ char pad63[1]; + /* 0x064 */ s16 unk_064; + /* 0x066 */ s16 unk_066; + /* 0x068 */ f32 unk_068; + /* 0x06C */ f32 unk_06C; + /* 0x070 */ f32 unk_070; + /* 0x074 */ f32 unk_074; + /* 0x078 */ char pad78[0xC]; + /* 0x084 */ f32 unk_084; + /* 0x088 */ s16 unk_088; + /* 0x08A */ s16 unk_08A; + /* 0x08C */ char pad8C[6]; + /* 0x092 */ u16 unk_092; + /* 0x094 */ char pad94[0x12]; + /* 0x0A6 */ s16 unk_0A6; + /* 0x0A8 */ char padA8[6]; + /* 0x0AE */ s16 unk_0AE; + /* 0x0B0 */ char padB0[0x16]; + /* 0x0C6 */ u16 unk_0C6; + /* 0x0C8 */ char padC8[1]; + /* 0x0C9 */ u8 unk_0C9; + /* 0x0CA */ char padCA[6]; + /* 0x0D0 */ s16 unk_0D0; + /* 0x0D2 */ char padD2[4]; + /* 0x0D6 */ s16 unk_0D6; + /* 0x0D8 */ char padD8[4]; + /* 0x0DC */ f32 unk_0DC; + /* 0x0E0 */ f32 unk_0E0; + /* 0x0E4 */ f32 unk_0E4; + /* 0x0E8 */ f32 unk_0E8; + /* 0x0EC */ f32 unk_0EC; + /* 0x0F0 */ f32 unk_0F0; + /* 0x0F4 */ f32 unk_0F4; + /* 0x0F8 */ f32 unk_0F8; + /* 0x0FC */ f32 unk_0FC; + /* 0x100 */ Vec3f unk_100; + /* 0x10C */ char pad10C[4]; + /* 0x110 */ f32 unk_110; + /* 0x114 */ f32 unk_114; + /* 0x118 */ char pad118[0x7C]; + /* 0x194 */ f32 unk_194; + /* 0x198 */ f32 unk_198; + /* 0x19C */ f32 unk_19C; + /* 0x1A0 */ char pad1A0[0x168]; + /* 0x308 */ Vec3f unk_308; + /* 0x314 */ char pad314[0xE4]; + /* 0x3F8 */ f32 unk_3F8; + /* 0x3FC */ Vec3f unk_3FC; +} Object_408; // size = 0x408 + +typedef struct { + /* 0x000 */ Object obj; + /* 0x01C */ ObjectStruct_1C unk_01C; + /* 0x040 */ s32 unk_040; + /* 0x044 */ u8 unk_044; + /* 0x046 */ s16 unk_046; + /* 0x048 */ s16 unk_048; + /* 0x04A */ s16 unk_04A; + /* 0x04C */ s16 unk_04C; + /* 0x04E */ s16 unk_04E; + /* 0x050 */ bool unk_050; + /* 0x054 */ bool unk_054; + /* 0x058 */ s32 unk_058; + /* 0x05C */ s32 unk_05C; + /* 0x060 */ s32 unk_060; + /* 0x064 */ s32 unk_064; + /* 0x068 */ s32 unk_068; + /* 0x06C */ s32 unk_06C; + /* 0x070 */ s32 unk_070; + /* 0x074 */ s32 unk_074; + /* 0x078 */ s32 unk_078; + /* 0x07C */ s32 unk_07C; + /* 0x080 */ s32 unk_080; + /* 0x084 */ s32 unk_084; + /* 0x088 */ s32 unk_088; + /* 0x08C */ s32 unk_08C; + /* 0x090 */ s32 unk_090; + /* 0x094 */ s32 unk_094; + /* 0x098 */ s32 unk_098; + /* 0x09C */ s32 unk_09C; + /* 0x0A0 */ char padA0[0x10]; + /* 0x0B0 */ s32 unk_0B0; + /* 0x0B4 */ s16 unk_0B4; + /* 0x0B6 */ s16 unk_0B6; + /* 0x0B8 */ s16 unk_0B8; + /* 0x0BA */ char pad0BA[0x2]; + /* 0x0BC */ u16 unk_0BC; + /* 0x0BC */ u16 unk_0BE; + /* 0x0C0 */ u16 unk_0C0; + /* 0x0C2 */ u16 unk_0C2; + /* 0x0C4 */ u16 unk_0C4; + /* 0x0C6 */ u16 unk_0C6; + /* 0x0C8 */ u8 unk_0C8; + /* 0x0C9 */ u8 unk_0C9; + /* 0x0C9 */ u8 unk_0CA[4]; + /* 0x0CE */ s16 unk_0CE; + /* 0x0D0 */ s8 unk_0D0; + /* 0x0D1 */ s16 unk_0D2; + /* 0x0D4 */ s16 unk_0D4; + /* 0x0D6 */ u16 unk_0D6; + /* 0x0D8 */ Vec3f unk_0D8; + /* 0x0E4 */ s16 unk_0E4; + /* 0x0E6 */ s16 unk_0E6; + /* 0x0E8 */ Vec3f unk_0E8; + /* 0x0F4 */ Vec3f unk_0F4; + /* 0x100 */ Vec3f unk_100; + /* 0x10C */ f32 unk_10C; + /* 0x110 */ f32 unk_110; + /* 0x114 */ f32 unk_114; + /* 0x118 */ f32 unk_118; + /* 0x11C */ f32 unk_11C; + /* 0x120 */ f32 unk_120; + /* 0x124 */ Vec3f unk_124; + /* 0x130 */ f32 unk_130; + /* 0x134 */ f32 unk_134; + /* 0x138 */ f32 unk_138; + /* 0x13C */ f32 unk_13C; + /* 0x140 */ f32 unk_140; + /* 0x144 */ f32 unk_144; + /* 0x148 */ f32 unk_148; + /* 0x14C */ f32 unk_14C; + /* 0x150 */ f32 unk_150; + /* 0x154 */ f32 unk_154; + /* 0x158 */ f32 unk_158; + /* 0x15C */ f32 unk_15C; + /* 0x160 */ f32 unk_160; + /* 0x164 */ f32 unk_164; + /* 0x168 */ f32 unk_168; + /* 0x16C */ f32 unk_16C; + /* 0x170 */ f32 unk_170; + /* 0x174 */ f32 unk_174; + /* 0x178 */ f32 unk_178; + /* 0x17C */ f32 unk_17C; + /* 0x180 */ f32 unk_180; + /* 0x184 */ f32 unk_184; + /* 0x188 */ f32 unk_188; + /* 0x18C */ Vec3f unk_18C[28]; // could be joint table + /* 0x2DC */ Vec3f unk_2DC; + /* 0x2E8 */ Vec3f unk_2E8; +} Object_2F4; // size = 0x2F4 + +typedef enum{ +/* -1*/ OBJECT_INVALID=-1, + /* 0 */ OBJECT_0, + /* 1 */ OBJECT_1, + /* 2 */ OBJECT_2, + /* 3 */ OBJECT_3, + /* 4 */ OBJECT_4, + /* 5 */ OBJECT_5, + /* 6 */ OBJECT_6, + /* 7 */ OBJECT_7, + /* 8 */ OBJECT_8, + /* 9 */ OBJECT_9, + /* 10 */ OBJECT_10, + /* 11 */ OBJECT_11, + /* 12 */ OBJECT_12, + /* 13 */ OBJECT_13, + /* 14 */ OBJECT_14, + /* 15 */ OBJECT_15, + /* 16 */ OBJECT_16, + /* 17 */ OBJECT_17, + /* 18 */ OBJECT_18, + /* 19 */ OBJECT_19, + /* 20 */ OBJECT_20, + /* 21 */ OBJECT_21, + /* 22 */ OBJECT_22, + /* 23 */ OBJECT_23, + /* 24 */ OBJECT_24, + /* 25 */ OBJECT_25, + /* 26 */ OBJECT_26, + /* 27 */ OBJECT_27, + /* 28 */ OBJECT_28, + /* 29 */ OBJECT_29, + /* 30 */ OBJECT_30, + /* 31 */ OBJECT_31, + /* 32 */ OBJECT_32, + /* 33 */ OBJECT_33, + /* 34 */ OBJECT_34, + /* 35 */ OBJECT_35, + /* 36 */ OBJECT_36, + /* 37 */ OBJECT_37, + /* 38 */ OBJECT_38, + /* 39 */ OBJECT_39, + /* 40 */ OBJECT_40, + /* 41 */ OBJECT_41, + /* 42 */ OBJECT_42, + /* 43 */ OBJECT_43, + /* 44 */ OBJECT_44, + /* 45 */ OBJECT_45, + /* 46 */ OBJECT_46, + /* 47 */ OBJECT_47, + /* 48 */ OBJECT_48, + /* 49 */ OBJECT_49, + /* 50 */ OBJECT_50, + /* 51 */ OBJECT_51, + /* 52 */ OBJECT_52, + /* 53 */ OBJECT_53, + /* 54 */ OBJECT_54, + /* 55 */ OBJECT_55, + /* 56 */ OBJECT_56, + /* 57 */ OBJECT_57, + /* 58 */ OBJECT_58, + /* 59 */ OBJECT_59, + /* 60 */ OBJECT_60, + /* 61 */ OBJECT_61, + /* 62 */ OBJECT_62, + /* 63 */ OBJECT_63, + /* 64 */ OBJECT_64, + /* 65 */ OBJECT_65, + /* 66 */ OBJECT_66, + /* 67 */ OBJECT_67, + /* 68 */ OBJECT_68, + /* 69 */ OBJECT_69, + /* 70 */ OBJECT_70, + /* 71 */ OBJECT_71, + /* 72 */ OBJECT_72, + /* 73 */ OBJECT_73, + /* 74 */ OBJECT_74, + /* 75 */ OBJECT_75, + /* 76 */ OBJECT_76, + /* 77 */ OBJECT_77, + /* 78 */ OBJECT_78, + /* 79 */ OBJECT_79, + /* 80 */ OBJECT_80, + /* 81 */ OBJECT_81, + /* 82 */ OBJECT_82, + /* 83 */ OBJECT_83, + /* 84 */ OBJECT_84, + /* 85 */ OBJECT_85, + /* 86 */ OBJECT_86, + /* 87 */ OBJECT_87, + /* 88 */ OBJECT_88, + /* 89 */ OBJECT_89, + /* 90 */ OBJECT_90, + /* 91 */ OBJECT_91, + /* 92 */ OBJECT_92, + /* 93 */ OBJECT_93, + /* 94 */ OBJECT_94, + /* 95 */ OBJECT_95, + /* 96 */ OBJECT_96, + /* 97 */ OBJECT_97, + /* 98 */ OBJECT_98, + /* 99 */ OBJECT_99, + /* 100 */ OBJECT_100, + /* 101 */ OBJECT_101, + /* 102 */ OBJECT_102, + /* 103 */ OBJECT_103, + /* 104 */ OBJECT_104, + /* 105 */ OBJECT_105, + /* 106 */ OBJECT_106, + /* 107 */ OBJECT_107, + /* 108 */ OBJECT_108, + /* 109 */ OBJECT_109, + /* 110 */ OBJECT_110, + /* 111 */ OBJECT_111, + /* 112 */ OBJECT_112, + /* 113 */ OBJECT_113, + /* 114 */ OBJECT_114, + /* 115 */ OBJECT_115, + /* 116 */ OBJECT_116, + /* 117 */ OBJECT_117, + /* 118 */ OBJECT_118, + /* 119 */ OBJECT_119, + /* 120 */ OBJECT_120, + /* 121 */ OBJECT_121, + /* 122 */ OBJECT_122, + /* 123 */ OBJECT_123, + /* 124 */ OBJECT_124, + /* 125 */ OBJECT_125, + /* 126 */ OBJECT_126, + /* 127 */ OBJECT_127, + /* 128 */ OBJECT_128, + /* 129 */ OBJECT_129, + /* 130 */ OBJECT_130, + /* 131 */ OBJECT_131, + /* 132 */ OBJECT_132, + /* 133 */ OBJECT_133, + /* 134 */ OBJECT_134, + /* 135 */ OBJECT_135, + /* 136 */ OBJECT_136, + /* 137 */ OBJECT_137, + /* 138 */ OBJECT_138, + /* 139 */ OBJECT_139, + /* 140 */ OBJECT_140, + /* 141 */ OBJECT_141, + /* 142 */ OBJECT_142, + /* 143 */ OBJECT_143, + /* 144 */ OBJECT_144, + /* 145 */ OBJECT_145, + /* 146 */ OBJECT_146, + /* 147 */ OBJECT_147, + /* 148 */ OBJECT_148, + /* 149 */ OBJECT_149, + /* 150 */ OBJECT_150, + /* 151 */ OBJECT_151, + /* 152 */ OBJECT_152, + /* 153 */ OBJECT_153, + /* 154 */ OBJECT_154, + /* 155 */ OBJECT_155, + /* 156 */ OBJECT_156, + /* 157 */ OBJECT_157, + /* 158 */ OBJECT_158, + /* 159 */ OBJECT_159, + /* 160 */ OBJECT_160, + /* 161 */ OBJECT_161, // start of 4C + /* 162 */ OBJECT_162, + /* 163 */ OBJECT_163, + /* 164 */ OBJECT_164, + /* 165 */ OBJECT_165, + /* 166 */ OBJECT_166, + /* 167 */ OBJECT_167, + /* 168 */ OBJECT_168, + /* 169 */ OBJECT_169, + /* 170 */ OBJECT_170, + /* 171 */ OBJECT_171, + /* 172 */ OBJECT_172, + /* 173 */ OBJECT_173, + /* 174 */ OBJECT_174, + /* 175 */ OBJECT_175, + /* 176 */ OBJECT_176, // start of 2F4 + /* 177 */ OBJECT_177, + /* 178 */ OBJECT_178, + /* 179 */ OBJECT_179, + /* 180 */ OBJECT_180, + /* 181 */ OBJECT_181, + /* 182 */ OBJECT_182, + /* 183 */ OBJECT_183, + /* 184 */ OBJECT_184, + /* 185 */ OBJECT_185, + /* 186 */ OBJECT_186, + /* 187 */ OBJECT_187, + /* 188 */ OBJECT_188, + /* 189 */ OBJECT_189, + /* 190 */ OBJECT_190, + /* 191 */ OBJECT_191, + /* 192 */ OBJECT_192, + /* 193 */ OBJECT_193, + /* 194 */ OBJECT_194, + /* 195 */ OBJECT_195, + /* 196 */ OBJECT_196, + /* 197 */ OBJECT_197, + /* 198 */ OBJECT_198, + /* 199 */ OBJECT_199, + /* 200 */ OBJECT_200, + /* 201 */ OBJECT_201, + /* 202 */ OBJECT_202, + /* 203 */ OBJECT_203, + /* 204 */ OBJECT_204, + /* 205 */ OBJECT_205, + /* 206 */ OBJECT_206, + /* 207 */ OBJECT_207, + /* 208 */ OBJECT_208, + /* 209 */ OBJECT_209, + /* 210 */ OBJECT_210, + /* 211 */ OBJECT_211, + /* 212 */ OBJECT_212, + /* 213 */ OBJECT_213, + /* 214 */ OBJECT_214, + /* 215 */ OBJECT_215, + /* 216 */ OBJECT_216, + /* 217 */ OBJECT_217, + /* 218 */ OBJECT_218, + /* 219 */ OBJECT_219, + /* 220 */ OBJECT_220, + /* 221 */ OBJECT_221, + /* 222 */ OBJECT_222, + /* 223 */ OBJECT_223, + /* 224 */ OBJECT_224, + /* 225 */ OBJECT_225, + /* 226 */ OBJECT_226, + /* 227 */ OBJECT_227, + /* 228 */ OBJECT_228, + /* 229 */ OBJECT_229, + /* 230 */ OBJECT_230, + /* 231 */ OBJECT_231, + /* 232 */ OBJECT_232, + /* 233 */ OBJECT_233, + /* 234 */ OBJECT_234, + /* 235 */ OBJECT_235, + /* 236 */ OBJECT_236, + /* 237 */ OBJECT_237, + /* 238 */ OBJECT_238, + /* 239 */ OBJECT_239, + /* 240 */ OBJECT_240, + /* 241 */ OBJECT_241, + /* 242 */ OBJECT_242, + /* 243 */ OBJECT_243, + /* 244 */ OBJECT_244, + /* 245 */ OBJECT_245, + /* 246 */ OBJECT_246, + /* 247 */ OBJECT_247, + /* 248 */ OBJECT_248, + /* 249 */ OBJECT_249, + /* 250 */ OBJECT_250, + /* 251 */ OBJECT_251, + /* 252 */ OBJECT_252, + /* 253 */ OBJECT_253, + /* 254 */ OBJECT_254, + /* 255 */ OBJECT_255, + /* 256 */ OBJECT_256, + /* 257 */ OBJECT_257, + /* 258 */ OBJECT_258, + /* 259 */ OBJECT_259, + /* 260 */ OBJECT_260, + /* 261 */ OBJECT_261, + /* 262 */ OBJECT_262, + /* 263 */ OBJECT_263, + /* 264 */ OBJECT_264, + /* 265 */ OBJECT_265, + /* 266 */ OBJECT_266, + /* 267 */ OBJECT_267, + /* 268 */ OBJECT_268, + /* 269 */ OBJECT_269, + /* 270 */ OBJECT_270, + /* 271 */ OBJECT_271, + /* 272 */ OBJECT_272, + /* 273 */ OBJECT_273, + /* 274 */ OBJECT_274, + /* 275 */ OBJECT_275, + /* 276 */ OBJECT_276, + /* 277 */ OBJECT_277, + /* 278 */ OBJECT_278, + /* 279 */ OBJECT_279, + /* 280 */ OBJECT_280, + /* 281 */ OBJECT_281, + /* 282 */ OBJECT_282, + /* 283 */ OBJECT_283, + /* 284 */ OBJECT_284, + /* 285 */ OBJECT_285, + /* 286 */ OBJECT_286, + /* 287 */ OBJECT_287, + /* 288 */ OBJECT_288, + /* 289 */ OBJECT_289, + /* 290 */ OBJECT_290, + /* 291 */ OBJECT_291, + /* 292 */ OBJECT_292, // start of 408 + /* 293 */ OBJECT_293, + /* 294 */ OBJECT_294, + /* 295 */ OBJECT_295, + /* 296 */ OBJECT_296, + /* 297 */ OBJECT_297, + /* 298 */ OBJECT_298, + /* 299 */ OBJECT_299, + /* 300 */ OBJECT_300, + /* 301 */ OBJECT_301, + /* 302 */ OBJECT_302, + /* 303 */ OBJECT_303, + /* 304 */ OBJECT_304, + /* 305 */ OBJECT_305, + /* 306 */ OBJECT_306, + /* 307 */ OBJECT_307, + /* 308 */ OBJECT_308, + /* 309 */ OBJECT_309, + /* 310 */ OBJECT_310, + /* 311 */ OBJECT_311, + /* 312 */ OBJECT_312, + /* 313 */ OBJECT_313, + /* 314 */ OBJECT_314, + /* 315 */ OBJECT_315, + /* 316 */ OBJECT_316, + /* 317 */ OBJECT_317, + /* 318 */ OBJECT_318, + /* 319 */ OBJECT_319, + /* 320 */ OBJECT_320, + /* 321 */ OBJECT_321, + /* 322 */ OBJECT_6C_LASERS, // start of 6C + /* 323 */ OBJECT_323, + /* 324 */ OBJECT_6C_SILVER_RING, + /* 325 */ OBJECT_325, + /* 326 */ OBJECT_326, + /* 327 */ OBJECT_6C_BOMB, + /* 328 */ OBJECT_328, + /* 329 */ OBJECT_329, + /* 330 */ OBJECT_330, + /* 331 */ OBJECT_331, + /* 332 */ OBJECT_332, + /* 333 */ OBJECT_333, + /* 334 */ OBJECT_334, + /* 335 */ OBJECT_6C_1UP, + /* 336 */ OBJECT_6C_GOLD_RING, + /* 337 */ OBJECT_6C_WING_REPAIR, + /* 338 */ OBJECT_338, + /* 339 */ OBJECT_339, // start of 8C + /* 340 */ OBJECT_340, + /* 341 */ OBJECT_341, + /* 342 */ OBJECT_342, + /* 343 */ OBJECT_343, + /* 344 */ OBJECT_344, + /* 345 */ OBJECT_345, + /* 346 */ OBJECT_346, + /* 347 */ OBJECT_347, + /* 348 */ OBJECT_348, + /* 349 */ OBJECT_349, + /* 350 */ OBJECT_350, + /* 351 */ OBJECT_351, + /* 352 */ OBJECT_352, + /* 353 */ OBJECT_353, + /* 354 */ OBJECT_354, + /* 355 */ OBJECT_355, + /* 356 */ OBJECT_356, + /* 357 */ OBJECT_357, + /* 358 */ OBJECT_358, + /* 359 */ OBJECT_359, + /* 360 */ OBJECT_360, + /* 361 */ OBJECT_361, + /* 362 */ OBJECT_362, + /* 363 */ OBJECT_363, + /* 364 */ OBJECT_364, + /* 365 */ OBJECT_365, + /* 366 */ OBJECT_366, + /* 367 */ OBJECT_367, + /* 368 */ OBJECT_368, + /* 369 */ OBJECT_369, + /* 370 */ OBJECT_370, + /* 371 */ OBJECT_371, + /* 372 */ OBJECT_372, + /* 373 */ OBJECT_373, + /* 374 */ OBJECT_374, + /* 375 */ OBJECT_375, + /* 376 */ OBJECT_376, + /* 377 */ OBJECT_377, + /* 378 */ OBJECT_378, + /* 379 */ OBJECT_379, + /* 380 */ OBJECT_380, + /* 381 */ OBJECT_381, + /* 382 */ OBJECT_382, + /* 383 */ OBJECT_383, + /* 384 */ OBJECT_384, + /* 385 */ OBJECT_385, + /* 386 */ OBJECT_386, + /* 387 */ OBJECT_387, + /* 388 */ OBJECT_388, + /* 389 */ OBJECT_389, + /* 390 */ OBJECT_390, + /* 391 */ OBJECT_391, + /* 392 */ OBJECT_392, + /* 393 */ OBJECT_393, + /* 394 */ OBJECT_394, + /* 395 */ OBJECT_395, + /* 396 */ OBJECT_396, + /* 397 */ OBJECT_397, + /* 398 */ OBJECT_398, + /* 399 */ OBJECT_399, + /* 400 */ OBJECT_ID_MAX, +} ObjectId; + +#define OBJECT_UNK_400 400 +#define OBJECT_UNK_401 401 +#define OBJECT_UNK_402 402 +#define OBJECT_UNK_403 403 +#define OBJECT_UNK_404 404 +#define OBJECT_UNK_405 405 +#define OBJECT_UNK_406 406 + +#define OBJECT_UNK_1000 1000 + +#endif diff --git a/include/sf64thread.h b/include/sf64thread.h new file mode 100644 index 00000000..1dc257d8 --- /dev/null +++ b/include/sf64thread.h @@ -0,0 +1,125 @@ +#ifndef SF64_THREAD +#define SF64_THREAD + +#include "libultra/ultra64.h" +#include "gfx.h" + +typedef enum { + GSTATE_NONE, + GSTATE_INIT, + GSTATE_TITLE, + GSTATE_MENU, + GSTATE_MAP, + GSTATE_STATE_5, + GSTATE_VS_INIT, + GSTATE_PLAY, + GSTATE_CREDITS, + GSTATE_BOOT = 100, + GSTATE_BOOT_WAIT, + GSTATE_SHOW_LOGO, + GSTATE_CHECK_SAVE, + GSTATE_LOGO_WAIT, + GSTATE_START, +} GameStates; + +typedef void (*TimerAction)(s32*, s32); + +typedef struct { + /* 0x00 */ u8 active; + /* 0x08 */ OSTimer timer; + /* 0x28 */ TimerAction action; + /* 0x2C */ s32* address; + /* 0x30 */ s32 value; +} TimerTask; // size = 0x38, 0x8 aligned + +typedef struct { + /* 0x000 */ OSThread thread; + /* 0x1B0 */ char stack[0x800]; + /* 0x9B0 */ OSMesgQueue msgQueue; + /* 0x9C8 */ OSMesg msg; + /* 0x9CC */ FrameBuffer* fb; + /* 0x9D0 */ u16 width; + /* 0x9D2 */ u16 height; +} FaultMgr; // size = 0x9D8, 0x8 aligned + +typedef enum { + SPTASK_STATE_NOT_STARTED, + SPTASK_STATE_RUNNING, + SPTASK_STATE_INTERRUPTED, + SPTASK_STATE_FINISHED, + SPTASK_STATE_FINISHED_DP +} SpTaskState; + +typedef struct { + /* 0x00 */ OSTask task; + /* 0x40 */ OSMesgQueue* msgQueue; + /* 0x44 */ OSMesg msg; + /* 0x48 */ SpTaskState state; +} SPTask; // size = 0x50, 0x8 aligned + +typedef struct { + /* 0x00000 */ SPTask task; + /* 0x00050 */ Vp viewports[0x10]; + /* 0x00150 */ Mtx mtx[0x480]; + /* 0x12150 */ Gfx unkDL1[0x180]; + /* 0x12D50 */ Gfx masterDL[0x1380]; + /* 0x1C950 */ Gfx unkDL2[0xD80]; + /* 0x23550 */ Lightsn lights[0x100]; +} GfxPool; // size = 0x2AD50, 0x8 aligned + +void Controller_Init(void); +void Controller_UpdateInput(void); +void Controller_ReadData(void); +void Save_ReadData(void); +void Save_WriteData(void); +void Controller_Rumble(void); + +s32 Timer_CreateTask(u64, TimerAction, s32*, s32); +void Timer_Increment(s32* address, s32 value); +void Timer_SetValue(s32* address, s32 value); +void Timer_CompleteTask(TimerTask*); +void Timer_Wait(u64); + +s32 Save_WriteEeprom(SaveFile*); +s32 Save_ReadEeprom(SaveFile*); + +void Fault_ThreadEntry(void*); +void func_80007FE4(FrameBuffer*, u16, u16); +void Fault_Init(void); + +typedef enum { + SI_READ_CONTROLLER = 10, + SI_READ_SAVE, + SI_WRITE_SAVE, + SI_RUMBLE, + SI_SAVE_FAILED, + SI_SAVE_SUCCESS, + SI_CONT_READ_DONE, +} SerialMesg; + +#define MSG_QUEUE_EMPTY -1 + +#define FAULT_MESG_BREAK 1 +#define FAULT_MESG_FAULT 2 + +#define TASK_MESG_1 1 +#define TASK_MESG_2 2 + +#define EVENT_MESG_SP 1 +#define EVENT_MESG_DP 2 +#define EVENT_MESG_VI 3 +#define EVENT_MESG_PRENMI 4 + +typedef enum { + THREAD_ID_SYSTEM, + THREAD_ID_IDLE, + THREAD_ID_FAULT, + THREAD_ID_MAIN, + THREAD_ID_4, + THREAD_ID_AUDIO, + THREAD_ID_GRAPHICS, + THREAD_ID_7, + THREAD_ID_SERIAL, +} ThreadID; + +#endif diff --git a/include/structs.h b/include/structs.h index af31e6ee..b8765d60 100644 --- a/include/structs.h +++ b/include/structs.h @@ -6,11 +6,6 @@ #define UNK_TYPE s32 -typedef struct { - Vec3f normal; - f32 dist; -} Plane; - typedef struct { s16 vtx[3]; s16 unk_06; @@ -34,21 +29,6 @@ typedef struct { Vec3f* mesh; } CollisionHeader2; // size = 0x24 -typedef void (*TimerAction)(s32*, s32); - -typedef struct { - /* 0x00 */ u8 active; - /* 0x08 */ OSTimer timer; - /* 0x28 */ TimerAction action; - /* 0x2C */ s32* address; - /* 0x30 */ s32 value; -} TimerTask; // size = 0x38, 0x8 aligned - -typedef union { - u16 data[240 * 320]; - u16 array[240][320]; -} FrameBuffer; // size = 0x25800 - typedef struct { /* bit 0 */ u8 unk_0 : 3; /* bit 3 */ u8 unk_3 : 1; @@ -70,10 +50,10 @@ typedef struct { typedef struct{ /* 0x00 */ Save_SubStruct_00 unk_00[16]; /* 0x10 */ char pad10[0x4]; - /* 0x14 */ u8 unk_14; - /* 0x15 */ u8 unk_15; - /* 0x16 */ u8 unk_16; - /* 0x17 */ u8 unk_17; + /* 0x14 */ u8 soundMode; + /* 0x15 */ u8 musicVolume; + /* 0x16 */ u8 voiceVolume; + /* 0x17 */ u8 sfxVolume; /* 0x18 */ u8 unk_18[10][3]; /* 0x36 */ u8 unk_36[10]; /* 0x40 */ u8 unk_40[10]; @@ -97,41 +77,6 @@ typedef struct { /* 0x100 */ Save backup; } SaveFile; // size = 0x200 -typedef struct { - /* 0x000 */ OSThread thread; - /* 0x1B0 */ char stack[0x800]; - /* 0x9B0 */ OSMesgQueue msgQueue; - /* 0x9C8 */ OSMesg msg; - /* 0x9CC */ FrameBuffer* fb; - /* 0x9D0 */ u16 width; - /* 0x9D2 */ u16 height; -} FaultMgr; // size = 0x9D8, 0x8 aligned - -typedef enum { - SPTASK_STATE_NOT_STARTED, - SPTASK_STATE_RUNNING, - SPTASK_STATE_INTERRUPTED, - SPTASK_STATE_FINISHED, - SPTASK_STATE_FINISHED_DP -} SpTaskState; - -typedef struct { - /* 0x00 */ OSTask task; - /* 0x40 */ OSMesgQueue* msgQueue; - /* 0x44 */ OSMesg msg; - /* 0x48 */ SpTaskState state; -} SPTask; // size = 0x50, 0x8 aligned - -typedef struct { - /* 0x00000 */ SPTask task; - /* 0x00050 */ Vp viewports[0x10]; - /* 0x00150 */ Mtx mtx[0x480]; - /* 0x12150 */ Gfx unkDL1[0x180]; - /* 0x12D50 */ Gfx masterDL[0x1380]; - /* 0x1C950 */ Gfx unkDL2[0xD80]; - /* 0x23550 */ Lightsn lights[0x100]; -} GfxPool; // size = 0x2AD50, 0x8 aligned - typedef struct { /* 0x0 */ u16 unk_0; /* 0x2 */ s8 unk_2; @@ -140,7 +85,31 @@ typedef struct { typedef struct { /* 0x00 */ u8 unk_00; - /* 0x01 */ u8 unk_01; + /* 0x01 */ char pad01[0x1]; + /* 0x02 */ u16 unk_02; + /* 0x04 */ Vec3f pos; + /* 0x10 */ f32 unk_10; + /* 0x14 */ char pad14[0x14]; +} UnkEntity28; // size = 0x28 + +typedef struct { + /* 0x00 */ u8 mode; + /* 0x02 */ u16 timer; + /* 0x04 */ Vec3f unk_04; + /* 0x10 */ Vec3f unk_10; + /* 0x1C */ f32 unk_1C; + /* 0x20 */ f32 unk_20; + /* 0x24 */ f32 unk_24; + /* 0x28 */ f32 unk_28; + /* 0x2C */ u8 unk_2C; // possibly a color struct + /* 0x2D */ u8 unk_2D; + /* 0x2E */ u8 unk_2E; + /* 0x2F */ u8 unk_2F; +} UnkEntity30; // size = 0x30 + +typedef struct { + /* 0x00 */ u8 rightState; + /* 0x01 */ u8 leftState; /* 0x04 */ f32 unk_04; /* 0x08 */ f32 unk_08; /* 0x0C */ f32 unk_0C; @@ -155,33 +124,12 @@ typedef struct { /* 0x30 */ f32 unk_30; /* 0x34 */ f32 unk_34; /* 0x38 */ f32 unk_38; -} UnkStruct_D_80161630; // size = 0x3C +} WingInfo; // size = 0x3C -typedef struct { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 unk_04; - /* 0x08 */ u16 unk_08; - /* 0x0A */ u16 unk_0A; - /* 0x0C */ s32 unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ s32 unk_14; - /* 0x18 */ s32 unk_18; - /* 0x1C */ s32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ s32 unk_2C; - /* 0x30 */ s32 unk_30; - /* 0x34 */ s32 unk_34; - /* 0x38 */ s32 unk_38; - /* 0x3C */ s32 unk_3C; - /* 0x40 */ s32 unk_40; - /* 0x44 */ char pad44[0x60]; -} UnkStruct_D_80161A68; // size = 0x44? - -typedef struct UnkStruct_D_80178280 { +typedef struct Player { /* 0x000 */ f32 unk_000; - /* 0x004 */ char pad4[8]; + /* 0x004 */ f32 unk_004; + /* 0x008 */ char pad8[4]; /* 0x00C */ f32 unk_00C; /* 0x010 */ char pad10[0x24]; /* 0x034 */ f32 unk_034; @@ -201,11 +149,11 @@ typedef struct UnkStruct_D_80178280 { /* 0x080 */ f32 unk_080; /* 0x084 */ f32 unk_084; /* 0x088 */ f32 unk_088; - /* 0x08C */ char pad8C[4]; - /* 0x090 */ f32 unk_090; - /* 0x094 */ f32 unk_094; + /* 0x08C */ Vec3f unk_08C; /* 0x098 */ f32 unk_098; - /* 0x09C */ char pad9C[0x10]; + /* 0x09C */ f32 unk_09C; + /* 0x0A0 */ f32 unk_0A0; + /* 0x0A4 */ char padA4[8]; /* 0x0AC */ f32 unk_0AC; /* 0x0B0 */ f32 unk_0B0; /* 0x0B4 */ f32 unk_0B4; @@ -214,7 +162,7 @@ typedef struct UnkStruct_D_80178280 { /* 0x0C0 */ Vec3f unk_0C0; /* 0x0CC */ char padCC[4]; /* 0x0D0 */ f32 unk_0D0; - /* 0x0D4 */ char padD4[4]; + /* 0x0D4 */ f32 unk_0D4; /* 0x0D8 */ Vec3f unk_0D8; /* 0x0E4 */ f32 unk_0E4; /* 0x0E8 */ f32 unk_0E8; @@ -224,7 +172,7 @@ typedef struct UnkStruct_D_80178280 { /* 0x0F8 */ f32 unk_0F8; /* 0x0FC */ char padFC[8]; /* 0x104 */ f32 unk_104; - /* 0x108 */ char pad108[4]; + /* 0x108 */ f32 unk_108; /* 0x10C */ f32 unk_10C; /* 0x110 */ f32 unk_110; /* 0x114 */ f32 unk_114; @@ -252,9 +200,10 @@ typedef struct UnkStruct_D_80178280 { /* 0x174 */ char pad174[8]; /* 0x17C */ f32 unk_17C; /* 0x180 */ f32 unk_180; - /* 0x184 */ char pad184[8]; + /* 0x184 */ f32 unk_184; + /* 0x188 */ f32 unk_188; /* 0x18C */ f32 unk_18C; - /* 0x190 */ char pad190[4]; + /* 0x190 */ f32 unk_190; /* 0x194 */ f32 unk_194; /* 0x198 */ char pad198[4]; /* 0x19C */ s32 unk_19C; @@ -266,7 +215,12 @@ typedef struct UnkStruct_D_80178280 { /* 0x1CC */ s32 unk_1CC; /* 0x1D0 */ s32 unk_1D0; /* 0x1D4 */ s32 unk_1D4; - /* 0x1D8 */ char pad1D8[0x18]; + /* 0x1D8 */ char pad1D8[4]; + /* 0x1DC */ s32 unk_1DC; + /* 0x1E0 */ s32 unk_1E0; + /* 0x1E4 */ s32 unk_1E4; + /* 0x1E8 */ s32 unk_1E8; + /* 0x1EC */ s32 unk_1EC; /* 0x1F0 */ s32 unk_1F0; /* 0x1F4 */ s32 unk_1F4; /* 0x1F8 */ s32 unk_1F8; @@ -289,13 +243,16 @@ typedef struct UnkStruct_D_80178280 { /* 0x244 */ char pad244[4]; /* 0x248 */ f32 unk_248; /* 0x24C */ f32 unk_24C; - /* 0x250 */ char pad250[0xC]; + /* 0x250 */ f32 unk_250; + /* 0x250 */ char pad254[8]; /* 0x25C */ f32 unk_25C; /* 0x260 */ char pad260[4]; - /* 0x264 */ s32 unk_264; - /* 0x268 */ s32 unk_268; - /* 0x26C */ s32 unk_26C; - /* 0x270 */ char pad270[0xC]; + /* 0x264 */ s32 health; + /* 0x268 */ s32 damage; + /* 0x26C */ s32 heal; + /* 0x270 */ s32 unk_270; + /* 0x274 */ char pad274[4]; + /* 0x278 */ s32 unk_278; /* 0x27C */ s32 unk_27C; /* 0x280 */ s32 unk_280; /* 0x284 */ s32 unk_284; @@ -304,311 +261,31 @@ typedef struct UnkStruct_D_80178280 { /* 0x2B4 */ s32 unk_2B4; /* 0x2B8 */ char pad2B8[0x4]; /* 0x2BC */ f32 unk_2BC; - /* 0x2C0 */ char pad2C0[8]; + /* 0x2C0 */ f32 unk_2C0; + /* 0x2C4 */ s32 unk_2C4; /* 0x2C8 */ Vec3f unk_2C8; /* 0x2D4 */ Vec3f unk_2D4; /* 0x2E0 */ Vec3f unk_2E0; /* 0x2EC */ Vec3f unk_2EC; /* 0x2F8 */ Vec3f jointTable[30]; - /* 0x460 */ Vec3f unk_460[2]; + /* 0x460 */ union { + Vec3f unk_460; + Vec3f unk_460_arr[1]; // probably fake + }; + /* 0x460 */ Vec3f unk_46C; /* 0x494 */ char pad478[4]; /* 0x47C */ Vec3f *unk_47C; /* 0x480 */ Vec3f *unk_480; /* 0x484 */ char pad484[4]; /* 0x488 */ f32 unk_488; - /* 0x48C */ char pad48C[4]; + /* 0x48C */ s8 unk_48C; /* 0x490 */ f32 unk_490; - /* 0x494 */ char pad494[4]; + /* 0x494 */ s32 unk_494; /* 0x498 */ s32 unk_498; - /* 0x49C */ UnkStruct_D_80161630 unk_49C; + /* 0x49C */ WingInfo wings; /* 0x4D8 */ f32 unk_4D8; /* 0x4DC */ f32 unk_4DC; -} UnkStruct_D_80178280; // size = 0x4E0 Might be Player - -typedef struct { - /* 0x00 */ f32 unk_0; - /* 0x04 */ s16 unk_4; - /* 0x06 */ s16 unk_6; - /* 0x08 */ s16 unk_8; - /* 0x0A */ s16 unk_A; - /* 0x0C */ s16 unk_C; - /* 0x0E */ s16 unk_E; - /* 0x10 */ s16 unk_10; -} ObjectInit; // size = 0x14 - -typedef struct { - /* 0x00 */ u8 status; - /* 0x02 */ u16 id; - /* 0x04 */ Vec3f pos; - /* 0x10 */ Vec3f rot; -} Object; // size = 0x1C - -typedef void (*ObjectFunc)(Object*); - -typedef struct { - /* 0x00 */ union { - ObjectFunc draw; - Gfx* dList; - }; - /* 0x00 */ u8 drawType; - /* 0x08 */ ObjectFunc action; // argument must have object type. - /* 0x0C */ f32* unk_0C; // some sort of script? - /* 0x10 */ f32 unk_10; // z coordinate of something - /* 0x14 */ s16 unk_14; // can be -1, 0, 1 - /* 0x16 */ s16 unk_16; // can be 0, 1, 2 - /* 0x18 */ u8 unk_18; // damage? - /* 0x19 */ u8 unk_19; // can be 0, 1, 2 - /* 0x1C */ f32 unk_1C; // y offset of something - /* 0x20 */ u8 unk_20; // increment for something -} ObjectStruct_1C; // size = 0x24 - -typedef struct { - /* 0x00 */ u8 unk_00; - /* 0x01 */ char pad01[0x1]; - /* 0x02 */ u16 unk_02; - /* 0x04 */ Vec3f pos; - /* 0x10 */ f32 unk_10; - /* 0x14 */ char pad14[0x14]; -} UnkStruct_D_80175A10; // size = 0x28 - -typedef struct { - /* 0x00 */ Object obj; - /* 0x1C */ char pad1C[0x1C]; - /* 0x38 */ Vec3f unk_38; - /* 0x44 */ char pad44[0x1C]; - /* 0x60 */ s32 unk_60; - /* 0x64 */ char pad64[0xC]; -} Object_70; // size = 0x70 - -typedef struct { - /* 0x00 */ Object obj; - /* 0x1C */ ObjectStruct_1C unk_1C; - /* 0x40 */ char unk40[0x8]; - /* 0x48 */ Vec3f unk_48; - /* 0x54 */ f32 unk_54; -} Object_58; // size = 0x58 - -typedef struct { - /* 0x00 */ u8 unk_00; - /* 0x02 */ u16 unk_02; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ u8 unk_2C; // possibly a color struct - /* 0x2D */ u8 unk_2D; - /* 0x2E */ u8 unk_2E; - /* 0x2F */ u8 unk_2F; -} UnkStruct_D_80174750; // size = 0x30 - -typedef struct { - /* 0x00 */ Object obj; - /* 0x1C */ ObjectStruct_1C unk_1C; - /* 0x40 */ s32 unk_40; - /* 0x44 */ s32 unk_44; - /* 0x48 */ s32 unk_48; - /* 0x4C */ s32 unk_4C; - /* 0x50 */ char pad50[0x10]; - /* 0x60 */ f32 unk_60; - /* 0x64 */ f32 unk_64; - /* 0x68 */ char pad68[8]; - /* 0x70 */ Vec3f unk_70; - /* 0x7C */ char pad7C[4]; -} Object_80; // size = 0x80 - -typedef struct { - /* 0x00 */ Object obj; - /* 0x1C */ ObjectStruct_1C unk_1C; - /* 0x40 */ s32 unk_40; - /* 0x44 */ char pad44[1]; - /* 0x45 */ u8 unk_45; // could be short loaded as u8 - /* 0x46 */ s8 unk_46; - /* 0x48 */ s32 unk_48; -} Object_4C; // size = 0x4C - -typedef struct { - /* 0x00 */ Object obj; - /* 0x1C */ ObjectStruct_1C unk_1C; - /* 0x40 */ s32 unk_40; - /* 0x44 */ s16 unk_44; - /* 0x46 */ u8 unk_46; - /* 0x48 */ u16 unk_48; - /* 0x4A */ u16 unk_4A; - /* 0x4C */ s8 unk_4C; - /* 0x4E */ s16 unk_4E; - /* 0x50 */ f32 unk_50; - /* 0x54 */ f32 unk_54; - /* 0x58 */ f32 unk_58; - /* 0x5C */ Vec3f unk_5C; - /* 0x68 */ f32 unk_68; -} Object_6C; // size 0x6C - -typedef struct { - /* 0x00 */ Object obj; - /* 0x1C */ ObjectStruct_1C unk_1C; - /* 0x40 */ s32 unk_40; - /* 0x44 */ s16 unk_44; - /* 0x46 */ s16 unk_46; - /* 0x48 */ s16 unk_48; - /* 0x4A */ s16 unk_4A; - /* 0x4C */ u8 unk_4C; - /* 0x4E */ s16 unk_4E; - /* 0x50 */ u16 unk_50; - /* 0x50 */ char pad50[0x2]; - /* 0x54 */ f32 unk_54; - /* 0x58 */ f32 unk_58; - /* 0x5C */ f32 unk_5C; - /* 0x60 */ Vec3f unk_60; - /* 0x6C */ f32 unk_6C; - /* 0x70 */ f32 unk_70; - /* 0x74 */ char pad74[0xC]; - /* 0x80 */ Vec3f unk_80; -} Object_8C; // size 0x8C - -typedef struct { - /* 0x000 */ Object obj; - /* 0x01C */ ObjectStruct_1C unk_01C; - /* 0x040 */ s32 unk_040; - /* 0x044 */ char unk_44[0xA]; - /* 0x04E */ s16 unk_04E; - /* 0x050 */ s16 unk_050; - /* 0x052 */ s16 unk_052; - /* 0x054 */ s16 unk_054; - /* 0x056 */ s16 unk_056; - /* 0x058 */ s16 unk_058; - /* 0x05A */ s16 unk_05A; - /* 0x05C */ s16 unk_05C; - /* 0x05E */ u8 unk_05E; - /* 0x05F */ char pad5F[3]; - /* 0x062 */ s8 unk_062; - /* 0x063 */ char pad63[5]; - /* 0x068 */ f32 unk_068; - /* 0x06C */ f32 unk_06C; - /* 0x070 */ f32 unk_070; - /* 0x074 */ f32 unk_074; - /* 0x078 */ char pad78[0xC]; - /* 0x084 */ f32 unk_084; - /* 0x088 */ char pad88[0x1E]; - /* 0x0A6 */ s16 unk_0A6; - /* 0x0A8 */ char padA8[0x1E]; - /* 0x0C6 */ u16 unk_0C6; - /* 0x0C8 */ char padC8[1]; - /* 0x0C9 */ u8 unk_0C9; - /* 0x0CA */ char padCA[6]; - /* 0x0D0 */ s16 unk_0D0; - /* 0x0D2 */ char padD2[0xA]; - /* 0x0DC */ f32 unk_0DC; - /* 0x0E0 */ f32 unk_0E0; - /* 0x0E4 */ f32 unk_0E4; - /* 0x0E8 */ char padE8[0x28]; - /* 0x110 */ f32 unk_110; - /* 0x114 */ f32 unk_114; - /* 0x118 */ char pad118[0x1F0]; - /* 0x308 */ Vec3f unk_308; - /* 0x314 */ char pad314[0xE4]; - /* 0x3F8 */ f32 unk_3F8; - /* 0x3FC */ Vec3f unk_3FC; -} Object_408; // size = 0x408 - -typedef struct { - /* 0x000 */ Object obj; - /* 0x01C */ ObjectStruct_1C unk_01C; - /* 0x040 */ s32 unk_040; - /* 0x044 */ u8 unk_044; - /* 0x046 */ s16 unk_046; - /* 0x048 */ s16 unk_048; - /* 0x04A */ s16 unk_04A; - /* 0x04C */ s16 unk_04C; - /* 0x04E */ s16 unk_04E; - /* 0x050 */ s32 unk_050; - /* 0x054 */ s32 unk_054; - /* 0x058 */ s32 unk_058; - /* 0x05C */ s32 unk_05C; - /* 0x060 */ s32 unk_060; - /* 0x064 */ s32 unk_064; - /* 0x068 */ s32 unk_068; - /* 0x06C */ s32 unk_06C; - /* 0x070 */ s32 unk_070; - /* 0x074 */ s32 unk_074; - /* 0x078 */ s32 unk_078; - /* 0x07C */ s32 unk_07C; - /* 0x080 */ s32 unk_080; - /* 0x084 */ char pad84[4]; - /* 0x088 */ s32 unk_088; - /* 0x08C */ s32 unk_08C; - /* 0x090 */ char pad90[8]; - /* 0x098 */ s32 unk_098; - /* 0x09C */ char pad9C[0x14]; - /* 0x0B0 */ s32 unk_0B0; - /* 0x0B4 */ s16 unk_0B4; - /* 0x0B6 */ s16 unk_0B6; - /* 0x0B8 */ s16 unk_0B8; - /* 0x0BA */ char pad0BA[0x2]; - /* 0x0BC */ u16 unk_0BC; - /* 0x0BC */ u16 unk_0BE; - /* 0x0C0 */ u16 unk_0C0; - /* 0x0C2 */ u16 unk_0C2; - /* 0x0C4 */ u16 unk_0C4; - /* 0x0C6 */ u16 unk_0C6; - /* 0x0C8 */ char padC8[1]; - /* 0x0C9 */ u8 unk_0C9; - /* 0x0C9 */ u8 unk_0CA[4]; - /* 0x0CE */ s16 unk_0CE; - /* 0x0D0 */ s8 unk_0D0; - /* 0x0D1 */ s16 unk_0D2; - /* 0x0D4 */ s16 unk_0D4; - /* 0x0D6 */ u16 unk_0D6; - /* 0x0D8 */ Vec3f unk_0D8; - /* 0x0E4 */ s16 unk_0E4; - /* 0x0E6 */ s16 unk_0E6; - /* 0x0E8 */ f32 unk_0E8; - /* 0x0EC */ f32 unk_0EC; - /* 0x0F0 */ f32 unk_0F0; - /* 0x0F4 */ f32 unk_0F4; - /* 0x0F8 */ f32 unk_0F8; // angle - /* 0x0FC */ f32 unk_0FC; - /* 0x100 */ Vec3f unk_100; // may be Vec3f - /* 0x10C */ f32 unk_10C; - /* 0x110 */ f32 unk_110; - /* 0x114 */ f32 unk_114; - /* 0x118 */ f32 unk_118; - /* 0x11C */ f32 unk_11C; - /* 0x120 */ f32 unk_120; - /* 0x124 */ Vec3f unk_124; - /* 0x130 */ f32 unk_130; - /* 0x134 */ f32 unk_134; - /* 0x138 */ f32 unk_138; - /* 0x13C */ f32 unk_13C; - /* 0x140 */ char pad140[4]; - /* 0x144 */ f32 unk_144; - /* 0x148 */ f32 unk_148; - /* 0x14C */ f32 unk_14C; - /* 0x150 */ f32 unk_150; - /* 0x154 */ f32 unk_154; - /* 0x158 */ f32 unk_158; - /* 0x15C */ char pad15C[4]; - /* 0x160 */ f32 unk_160; - /* 0x164 */ f32 unk_164; - /* 0x168 */ f32 unk_168; - /* 0x16C */ f32 unk_16C; - /* 0x170 */ f32 unk_170; - /* 0x174 */ char pad174[4]; - /* 0x178 */ f32 unk_178; - /* 0x17C */ f32 unk_17C; - /* 0x180 */ f32 unk_180; - /* 0x184 */ f32 unk_184; - /* 0x188 */ f32 unk_188; - /* 0x18C */ Vec3f unk_18C; // could be joint table - /* 0x198 */ char pad198[0x144]; - /* 0x2DC */ Vec3f unk_2DC; - /* 0x2E8 */ Vec3f unk_2E8; -} Object_2F4; // size = 0x2F4 +} Player; // size = 0x4E0 Might be Player typedef struct { /* 0x00 */ u8 unk_00; @@ -616,6 +293,6 @@ typedef struct { /* 0x10 */ f32 unk_10; /* 0x14 */ char pad14[0x4]; /* 0x18 */ u16 unk_18; -} UnkStruct_D_80176438; // size = 0x1C +} UnkEntity1C; // size = 0x1C #endif diff --git a/include/variables.h b/include/variables.h index 9d821f17..27005b1e 100644 --- a/include/variables.h +++ b/include/variables.h @@ -1,8 +1,13 @@ #ifndef VARIABLES_H #define VARIABLES_H +#include "libc/stdbool.h" +#include "sf64math.h" #include "structs.h" #include "gfx.h" +#include "sf64level.h" +#include "sf64thread.h" +#include "sf64object.h" extern u64 __rspboot_start[]; extern u64 __rspboot_end[]; @@ -123,10 +128,14 @@ extern OSMesg D_80156618[1]; extern OSMesg D_8015661C[1]; extern u16 D_800C9C3C[16]; +extern Vec3f D_800C9F2C; // could be f32[4]? +extern Object_2F4* D_800CA234; extern f32 D_800CBE70[]; extern f32 D_800CBE8C[]; extern f32 D_800CBEA8[]; extern f32 D_800CBEC4[]; +extern f32 D_800CBEE0[]; +extern f32 D_800CBEFC[]; extern f32 D_800CBF18[]; extern f32 D_800CBF34[]; extern f32 D_800CBF38[]; @@ -139,6 +148,10 @@ extern f32 D_800CBFE4[]; extern f32 D_800CC000[]; extern f32 D_800CC01C[]; extern f32 D_800CC038[]; +extern f32 D_800CC054[]; +extern f32 D_800CC070[]; +extern f32 D_800CC0D4[]; +extern f32 D_800CC0F0[]; extern ObjectStruct_1C D_800CC124[]; extern f32 D_800CF9B0[]; extern Gfx* D_800CFA54[]; @@ -157,6 +170,7 @@ extern Gfx* D_800CFC40[]; extern Gfx* D_800CFC50[]; extern Gfx* D_800CFC64[]; extern Gfx* D_800CFC7C[]; +extern f32* D_800CF964[]; extern f32 D_800CFCA0[]; extern Vec3f D_800CFCC0; // initializer in sf_5A240 extern f32 D_800CFCCC[]; @@ -174,6 +188,7 @@ extern f32 D_800CFE5C[]; extern Vec3f D_800CFEC4[6]; extern Vec3f D_800CFF0C[6]; extern u32 D_800CFF54[9]; +extern s32 D_800CFF80[4]; extern s32 D_800CFF90; extern s16 D_800CFF94[]; extern u8 D_800CFFB4[]; @@ -203,11 +218,11 @@ extern s32 D_800D2874[]; extern s32 D_800D2884[]; extern s32 D_800D2894[]; extern s32 D_800D28A4[]; -extern s32 D_800D28B4[]; +extern s32 sOverlaySetups[]; extern CollisionHeader D_800D2B38[]; extern CollisionHeader2 D_800D2CA0[]; extern u8 D_800D3180[0x1E]; // might be bigger? at least 0x21 -extern s32 D_800D4A70; +extern s32 sCurrentMsgPri; extern Save gDefaultSave; // sf_2EFE0 @@ -224,7 +239,7 @@ extern f32 D_8015F944; extern Vec3f D_8015F950; extern u8 D_8015F964; -// sf_43AC0 +// fox_43AC0 extern s32 D_801613A0; // fox_52730 @@ -240,16 +255,14 @@ extern f32 D_801615B8[4]; // fox_edisplay extern Vec3f D_801615D0; -extern Vec3f D_801615E0; -extern s32 D_801615EC; -extern Matrix D_801615F0; -extern UnkStruct_D_80161630 D_80161630; -extern s32 D_80161670[4]; -// fox_enmy1? +// fox_enmy1 +extern s32 D_80161670[4]; extern s32 D_80161680; extern u8 D_80161684; -// sf_6B3B0 + +// extern u8 temp_55[]; +// fox_6B3B0 extern s32 D_80161690; // sf_hud? @@ -274,15 +287,11 @@ extern f32 D_801617A4; extern f32 D_801617A8; extern f32 D_801617AC; extern s32 D_801617B0; -extern s32 D_801617B4; -extern s32 D_801617B8; +extern s32 gMedalStatus; +extern s32 gMedalFlashTimer; extern s32 D_80161810[]; extern s32 D_80161900[]; - -extern s32 D_80161910[0x10]; // part of sf_hud or fox_97F80? - -// fox_display -extern char D_801619A0[100]; +extern s32 D_80161910[0x10]; // could be in fox_97F80 // fox_A24B0 extern f32 D_80161A10; @@ -291,11 +300,11 @@ extern s32 D_80161A18[4]; extern s32 D_80161A28; extern u8 D_80161A2C; extern u16 D_80161A2E; -extern u16 D_80161A30; -extern u16 D_80161A32; +extern u16 gNextLevel; +extern u16 gNextGameState; extern u16 D_80161A34; -extern u16 D_80161A36; -extern u8 D_80161A38; +extern u16 gBgColor; +extern u8 gBlurAlpha; extern u8 D_80161A39; extern f32 D_80161A3C; extern f32 D_80161A40; @@ -308,41 +317,45 @@ extern s32 D_80161A5C; extern u16 D_80161A60; extern u16 D_80161A62; extern s32 D_80161A64; -extern UnkStruct_D_80161A68* D_80161A68; -extern s32 D_80161A70; +extern EnvSettings* sEnvSettings; +extern s32 D_80161A70; // Color32? extern s32 D_80161A74; extern s32 D_80161A78; +extern s32 D_80161A7C; +extern s32 D_80161A80; +extern s32 D_80161A84; extern s32 D_80161A88; extern s32 D_80161A8C; -extern u8 D_80161A90[]; -extern s32 D_80161A98; +extern u8 gGoldRingCount[]; +extern s32 gHitCount; extern s32 D_80161A9C; -extern s16 D_80161AA0[]; -extern s32 D_80161AA8[]; +extern s16 gLifeCount[]; +extern s32 gLaserStrength[]; extern s32 D_80161AB8; -extern Object_80 D_80161B00[50]; -extern Object_4C D_80163400[40]; -extern Object_2F4 D_80163FE0[60]; -extern Object_408 D_8016F110[4]; -extern Object_8C D_80170130[100]; -extern Object_6C D_801737E0[20]; -extern Object_70 D_80174050[16]; -extern UnkStruct_D_80174750 D_80174750[100]; -extern UnkStruct_D_80175A10 D_80175A10[65]; -extern UnkStruct_D_80176438 D_80176438[10]; +extern Object_80 gObjects80[50]; +extern Object_4C gObjects4C[40]; +extern Object_2F4 gObjects2F4[60]; +extern Object_408 gObjects408[4]; +extern Object_8C gObjects8C[100]; +extern Object_6C gObjects6C[20]; +extern Object_70 gObjects70[16]; +extern UnkEntity30 gUnkEntities30[100]; +extern UnkEntity28 gUnkEntities28[65]; +extern UnkEntity1C gUnkEntities1C[10]; extern s32 D_80176550[2]; extern f32 D_80176558[2][100]; extern f32 D_80176878[2][100]; extern f32 D_80176B98[2][100]; extern f32 D_801771D8[2][100]; extern f32 D_80176EB8[2][100]; -extern s32 D_801774F8; +extern s32 gOverlaySetup; extern f32 D_80177500[2][100]; -extern s32 D_80177820; +extern s32 gOverlayStage; extern s32 D_80177824; +extern u16 D_80177828; extern s32 D_8017782C; extern u8 D_80177830; -extern s32 D_80177834; +extern s32 gGameState; extern s32 D_80177838; extern s32 D_8017783C; extern s32 D_80177840; @@ -359,14 +372,15 @@ extern s32 D_80177898; extern s32 D_8017789C; extern s32 D_801778A0; extern s32 D_801778A4; -extern s32 D_801778A8; +extern s32 gCamCount; extern u8 D_801778AB; extern s32 D_801778AC; -extern s32 D_801778B0[]; +extern s32 D_801778B0[4]; extern s32 D_801778C8; extern s32 D_801778D0[]; extern s32 D_801778E8; extern u16 D_80177908[]; +extern s32 D_80177910[]; extern u16 D_80177928[]; extern s8 D_80177930; extern u16 D_80177938[]; @@ -387,7 +401,11 @@ extern s32 D_801779C8[]; extern Vec3f D_801779D8; extern Vec3f D_801779E8; extern bool gExpertMode; +extern s32 D_80177A10[10]; +extern f32 D_80177A48[10]; +extern s32 D_80177A70[4]; extern s32 D_80177A80; +extern s32 D_80177A88[4]; extern s8 D_80177A98; extern f32 D_80177AA0[]; extern u8 D_80177AB0; @@ -402,16 +420,16 @@ extern s32 D_80177B40; extern s32 D_80177B48; extern s32 D_80177B50[]; extern s32 D_80177B70[]; -extern u8 D_80177B8C; +extern u8 D_80177B8C; extern s32 D_80177B90[]; extern s32 D_80177BB0[]; extern u16 D_80177C30[]; extern s32 D_80177C50; -extern u8 D_80177C74; -extern s32 D_80177C80[]; +extern u8 gSoundMode; +extern s32 gVolumeSettings[3]; extern u16 D_80177C90; extern s32 D_80177C94; -extern u8 D_80177C98; +extern u8 gLevelType; extern s32 D_80177C9C; extern s32 D_80177CA0; extern s32 D_80177CA4; @@ -419,21 +437,22 @@ extern s32 D_80177CAC; extern f32 D_80177CB0; extern s32 D_80177CB4; extern s32 D_80177CBC; +extern f32 D_80177CC0; extern s32 D_80177CC4; extern f32 D_80177CC8; extern f32 D_80177D08; -extern s32 D_80177D10[]; +extern s32 gRightWingHealth[4]; extern f32 D_80177D20; -extern s32 D_80177D28[]; +extern s32 gLeftWingHealth[4]; extern f32 D_80177D38; -extern s32 D_80177D40[]; +extern s32 D_80177D40[4]; extern f32 D_80177D50; -extern s32 D_80177D58[]; +extern s32 D_80177D58[4]; extern f32 D_80177D68; -extern s32 D_80177D70[]; -extern s32 D_80177D88[]; -extern s32 D_80177DA0[]; -extern s32 D_80177DB0; +extern s32 D_80177D70[4]; +extern s32 D_80177D88[4]; +extern s32 gBombCount[4]; +extern s32 gFrameCount; extern s32 D_80177DC8; extern s32 D_80177E70; extern s32 D_80177E78; @@ -441,10 +460,14 @@ extern s32 D_80177E80; extern Vec3f D_80177E88; extern Vec3f D_80177E98[10]; extern Vec3f D_80177F10; +extern f32 D_80177F24[]; +extern f32 D_8017802C[]; extern s32 D_8017812C; -extern s32 D_80178234; +extern f32 D_80178134[]; +extern s32 gCurrentLevel; +extern u8 D_80178238[]; extern s32 D_8017827C; -extern UnkStruct_D_80178280* D_80178280; +extern Player* gPlayer; extern s32 D_80178284; extern f32* D_80178288; extern s32 D_8017828C; @@ -473,78 +496,86 @@ extern s32 D_801782FC; extern s32 D_80178300; extern u16* D_80178308; extern ObjectInit* D_80178310; -extern s32 D_80178320; //red -extern s32 D_80178328; //green -extern s32 D_80178330; //blue -extern s32 D_80178338; //alpha -extern s32 D_80178340; -extern s32 D_80178348; -extern s32 D_80178350; -extern s32 D_80178354; -extern s32 D_80178358; -extern s32 D_8017835C; -extern s32 D_80178360; +extern s32 gFogRed; +extern s32 gFogGreen; +extern s32 gFogBlue; +extern s32 gFogAlpha; +extern s32 D_80178340; // alpha something +extern s32 D_80178348; // red something +extern s32 D_80178350; // green something +extern s32 D_80178354; // blue something +extern s32 D_80178358; // alpha target +extern s32 D_8017835C; // alpha step +extern s32 D_80178360; // 2 lights second color extern s32 D_80178364; extern s32 D_80178368; -extern f32 D_8017836C; +extern f32 D_8017836C; // 2 lights second color brightness extern f32 D_80178370; extern f32 D_80178374; extern f32 D_80178378; -extern s32 D_80178380[]; -extern s32 D_80178390[]; -extern s32 D_801783A0[]; -extern s32 D_801783B0[]; -extern f32 D_801783D0; -extern f32 D_801783D4; -extern s32 D_801783D8; //near -extern s32 D_801783DC; //far +extern s32 D_80178380[]; // player alphas +extern s32 D_80178390[]; // player reds +extern s32 D_801783A0[]; // player greens +extern s32 D_801783B0[]; // player alphas +extern f32 D_801783D0; // something x translate +extern f32 D_801783D4; // something y translate +extern s32 gFogNear; //near +extern s32 gFogFar; //far extern s32 D_80178410; extern f32 D_80178420; extern f32 D_80178424; extern f32 D_80178428; extern f32 D_8017842C; extern f32 D_80178430; +extern f32 D_80178440; +extern f32 D_80178444; +extern f32 D_80178448; extern f32 D_8017847C; extern s32 D_80178480; extern s32 D_80178488; extern s32 D_801784A4; extern s32 D_801784AC; -extern f32 D_801784B8; +extern f32 D_801784B8; // effective Vec3f extern f32 D_801784BC; extern f32 D_801784C0; -extern f32 D_801784C4; +extern f32 D_801784C4; // effective Vec3f extern f32 D_801784C8; extern f32 D_801784CC; -extern f32 D_801784D0; +extern f32 D_801784D0; // effective Vec3f extern f32 D_801784D4; extern f32 D_801784D8; -extern s32 D_801784DC; -extern s32 D_801784E0; -extern s32 D_801784E4; -extern f32 D_801784F8; +extern s32 gLight1x; // Vec3i light direction +extern s32 gLight1y; +extern s32 gLight1z; +extern f32 D_801784E8; +extern f32 D_801784EC; // effective Vec3f? +extern f32 D_801784F0; +extern f32 D_801784F4; +extern f32 D_801784F8; // effective Vec3f extern f32 D_801784FC; extern f32 D_80178500; -extern s32 D_80178504; -extern s32 D_80178508; -extern s32 D_8017850C; -extern f32 D_80178520; +extern s32 gLight2x; // Vec3i light direction alternate +extern s32 gLight2y; +extern s32 gLight2z; +extern f32 D_80178520; // effective Vec3f extern f32 D_80178524; extern f32 D_80178528; +extern f32 D_80178538; extern f32 D_8017853C; extern s32 D_80178540; extern s32 D_80178544; -extern s32 D_80178548; -extern s32 D_8017854C; -extern s32 D_80178550; -extern s32 D_80178554; -extern s32 D_80178558; -extern s32 D_8017855C; -extern s32 D_80178564; -extern s32 D_80178568; -extern s32 D_8017856C; -extern s32 D_80178570; +extern s32 gLight1R; // Color32 light color 1 +extern s32 gLight1G; +extern s32 gLight1B; +extern s32 gAmbientR; // Color32 ambient color +extern s32 gAmbientG; +extern s32 gAmbientB; +extern s32 gLight2R; // Color32 light color 2 +extern s32 gLight2G; +extern s32 gLight2B; +extern s32 D_80178570; // Color32 light color 2 modifier? extern s32 D_80178574; -extern s32 D_80178578; +extern s32 D_80178578; // fox_rcp? extern u8 D_80178580[]; @@ -801,9 +832,9 @@ extern Gfx D_301E570[]; extern Gfx D_301F140[]; extern Gfx D_301FD20[]; extern Gfx D_302D240[]; -extern UnkStruct_D_80161A68 D_302DD70[]; -extern UnkStruct_D_80161A68 D_302DDB4[]; -extern UnkStruct_D_80161A68 D_302DDF8[]; +extern EnvSettings D_302DD70[]; +extern EnvSettings D_302DDB4[]; +extern EnvSettings D_302DDF8[]; extern ObjectInit D_302DE3C[]; extern ObjectInit D_302E0E4[]; extern ObjectInit D_302E170[]; @@ -817,10 +848,18 @@ extern f32 D_302EE80[]; extern f32 D_302EE9C[]; // ast_918430, ast_922730 +extern AnimationHeader D_4000080; +extern Limb* D_400014C[]; +extern AnimationHeader D_40001A4; +extern Limb* D_4000270[]; extern Gfx D_40018A0[]; extern Gfx D_4003BD0[]; +extern AnimationHeader D_40057AC; +extern Limb* D_40058B8[]; extern Gfx D_4007870[]; extern Gfx D_4007AF0[]; +extern AnimationHeader D_400A30C; +extern Limb* D_400A398[]; extern Gfx D_400B390[]; // ast_CD2410 @@ -853,13 +892,16 @@ extern Gfx D_500B600[]; * ast_B0AA00, ast_B1CA50, ast_B2CA50, ast_B612E0, ast_B84560, * ast_BB11D0, ast_BC23D0, ast_BFC510, ast_C48F40, ast_DDC010 */ + extern u16 D_6000000[]; extern u16 D_6000900[]; extern Gfx D_6000A80[]; extern u16 D_6000B60[]; extern Gfx D_6000E00[]; +extern Gfx D_6000E10[]; extern Gfx D_6001360[]; extern u16 D_6001820[]; +extern Gfx D_6001950[]; extern Gfx D_6001A60[]; extern u16 D_6001A80[]; extern u8 D_6001B80[]; @@ -875,6 +917,7 @@ extern Gfx D_60034D0[]; extern Gfx D_6003610[]; extern Gfx D_60036A0[]; extern u16 D_60038C0[]; +extern u16 D_60038F8[]; extern Gfx D_6004170[]; extern Gfx D_6004330[]; extern Vtx D_6004500[]; @@ -885,10 +928,13 @@ extern u16 D_6005700[]; extern Gfx D_6005780[]; extern Gfx D_6006140[]; extern Gfx D_6006310[]; +extern u16* D_600631C[]; +extern AnimationHeader D_600636C; extern f32 D_60064AC[]; extern f32 D_60064C8[]; extern f32 D_60064FC[]; extern f32 D_6006518[]; +extern Limb* D_6006558[]; extern f32 D_6006564[]; extern f32 D_60065B0[]; extern f32 D_60065FC[]; @@ -896,6 +942,7 @@ extern f32 D_6006648[]; extern f32 D_6006694[]; extern f32 D_60066E0_f32[]; extern Gfx D_60066E0_Gfx[]; +extern Gfx D_60066F0[]; extern f32 D_600672C[]; extern f32 D_6006778[]; extern f32 D_60067C4[]; @@ -929,12 +976,16 @@ extern Gfx D_6007CF0[]; extern Gfx D_6007D80[]; extern Gfx D_6007D90[]; extern Gfx D_6008370[]; +extern Gfx D_6008970[]; +extern Gfx D_6008AA0[]; extern f32 D_600924C[]; extern f32 D_60092E8[]; extern f32 D_6009388[]; extern Gfx D_60097E0[]; +extern u16* D_6009B34[]; extern f32 D_6009CC4[]; extern f32 D_6009CFC[]; +extern Gfx D_6009E30[]; extern Vtx D_6009ED0[]; extern Gfx D_6009F90[]; extern Gfx D_600A220[]; @@ -944,13 +995,19 @@ extern Gfx D_600B8B0[]; extern Gfx D_600BAF0[]; extern u16 D_600BEA0[]; extern Gfx D_600BF80[]; +extern Gfx D_600C130[]; extern u16 D_600C6A0[]; +extern Gfx D_600C740[]; extern Vtx D_600C780[]; +extern Gfx D_600CAA0[]; extern u16 D_600D5C0[]; extern Gfx D_600D730[]; +extern Gfx D_600DA10[]; extern Gfx D_600DBC0[]; extern u8 D_600DDC0[]; +extern Gfx D_600E0C0[]; extern u8 D_600E360[]; +extern AnimationHeader D_600E5EC; extern Gfx D_600E820[]; extern u8 D_600E980[]; extern Gfx D_600EC90[]; @@ -1000,12 +1057,15 @@ extern Gfx D_6012C00[]; extern Gfx D_60132B0[]; extern u8 D_6013470[]; extern Gfx D_60137B0[]; +extern AnimationHeader D_6013820; +extern Limb* D_601390C[]; extern Gfx D_6013960[]; extern Gfx D_6013B50[]; extern u8 D_6014140[]; extern Gfx D_60143E0[]; extern Gfx D_6014500[]; extern u16 D_6014510[]; +extern AnimationHeader D_6014658; extern Gfx D_6014670[]; extern u16 D_60147C0[]; extern u8 D_60147E0[]; @@ -1025,16 +1085,22 @@ extern f32 D_60166F4[]; extern f32 D_6016714[]; extern Gfx D_6018450[]; extern Gfx D_60188D0[]; +extern Gfx D_6018BF0[]; extern Gfx D_6018C00[]; // possible collision extern Gfx D_6018D40[]; extern Gfx D_6018E80[]; extern u16 D_6018F30[]; +extern Gfx D_6019730[]; extern u16 D_6019E50[]; +extern Gfx D_601A120[]; extern Gfx D_601A7A0[]; extern Gfx D_601A7D0[]; +extern Gfx D_601AD70[]; extern Gfx D_601AE40[]; extern Gfx D_601B0D0[]; +extern u16* D_601B1E4[]; extern u16 D_601B4B0[]; +extern f32 D_601B4C4[]; extern f32 D_601B4E0[]; extern f32 D_601B4FC[]; extern f32 D_601B518[]; @@ -1069,15 +1135,20 @@ extern Limb* D_601E9D0[]; extern Gfx D_601F1D0[]; extern Gfx D_601F500[]; extern Gfx D_601F5A0[]; +extern AnimationHeader D_601F874; +extern Limb* D_601F920[]; extern Gfx D_601FCB0[]; extern Gfx D_601FF80[]; extern Gfx D_60200E0[]; extern Gfx D_6020760[]; extern Gfx D_6020A30[]; extern Gfx D_6020B40[]; +extern u16* D_6020DD0[]; extern Gfx D_6020E60[]; extern u16 D_6020FB0[]; extern u16 D_6021ED0[]; +extern AnimationHeader D_602201C; +extern Limb* D_60220E8[]; extern Gfx D_60223C0[]; extern Gfx D_6022450[]; extern Gfx D_6022530[]; @@ -1101,10 +1172,13 @@ extern AnimationHeader D_6027320; extern u16 D_6027340[]; extern Limb* D_602742C[]; extern Gfx D_6027900[]; +extern u16* D_6027F50[]; extern f32 D_6028454[]; +extern u16* D_60289FC[]; extern AnimationHeader D_6029528; extern Limb* D_6029674[]; extern Gfx D_602A720[]; +extern u16* D_602AAC0[]; extern u16 D_602AC50[]; extern ObjectInit* D_602B148[]; extern Gfx D_602B4C0[]; @@ -1133,10 +1207,12 @@ extern Gfx D_602DCA0[]; extern Gfx D_602E080[]; extern Gfx D_602E380[]; extern Gfx D_602E570[]; -extern UnkStruct_D_80161A68 D_602E584[]; +extern EnvSettings D_602E584[]; extern Gfx D_602E7A0[]; extern Gfx D_602E9E0[]; extern ObjectInit* D_602F18C[]; +extern u16* D_602F3AC[]; +extern f32 D_602F638[]; extern f32 D_602F684[]; extern f32 D_602F6A0[]; extern f32 D_602F6EC[]; @@ -1148,8 +1224,10 @@ extern Gfx D_602F7C0[]; extern f32 D_602FA50[]; extern Gfx D_6030500[]; extern Gfx D_6030630[]; +extern u16* D_60308B8[]; extern f32 D_6030B10[]; extern ObjectInit D_6030B14[]; +extern f32 D_6030B14_f32[]; extern f32 D_6030BE0[]; extern f32 D_6030BFC[]; extern f32 D_6030C18[]; @@ -1174,13 +1252,16 @@ extern f32 D_6031500[]; extern f32 D_6031538[]; extern f32 D_6031554[]; extern f32 D_6031570[]; +extern u16* D_60320D0[]; extern Gfx D_60320E0[]; extern f32 D_6032328[]; +extern f32 D_6032408[]; extern f32 D_6032488[]; extern f32 D_60324EC[]; extern f32 D_6032550[]; extern Gfx D_6032580[]; extern Gfx D_6032BC0[]; +extern u16* D_6032E18[]; extern Gfx D_6033000[]; extern f32 D_603405C[]; extern f32 D_6034368[]; @@ -1238,7 +1319,9 @@ extern f32 D_603694C[]; extern f32 D_6036968[]; extern Gfx D_6036CD0[]; extern Gfx D_6037CF0[]; +extern u16* D_60381D8[]; extern ObjectInit D_603B074[]; +extern u16* D_603D9E8[]; extern f32 D_603DCA4[]; extern f32 D_603DD40[]; extern f32 D_603DDF0[]; @@ -1286,6 +1369,7 @@ extern Gfx D_604A9F0[]; extern Gfx D_605C230[]; // ast_9DD390, ast_A0E340, ast_BFA740, ast_CBFE70, ast_D27600 +extern Gfx D_7000000[]; extern u8 D_7000F10[]; extern u8 D_7001030[]; extern u8 D_7001270[]; @@ -1297,6 +1381,8 @@ extern Gfx D_7007350[]; extern Gfx D_700AB70[]; extern Gfx D_700BB10[]; extern Gfx D_700BE00[]; +extern AnimationHeader D_700CAF4; +extern Limb* D_700CB60[]; extern u16 D_700E9A0[]; extern u8 D_70118E0[]; extern u16 D_70123F8[]; @@ -1349,6 +1435,10 @@ extern Gfx D_8015550[]; extern Gfx D_8015DF0[]; // ast_9F4880, ast_AE60A0, ast_CDDCA0 +extern Gfx D_9002CF0[]; +extern Gfx D_9003330[]; +extern Gfx D_9003890[]; +extern Gfx D_9003DF0[]; extern Gfx D_9003F50[]; extern Gfx D_9005C80[]; extern Gfx D_900D180[]; @@ -1356,6 +1446,7 @@ extern Gfx D_900DD20[]; extern Gfx D_900F060[]; extern Gfx D_900F1D0[]; extern Gfx D_9010FD0[]; +extern Gfx D_9011200[]; extern Gfx D_901DA50[]; extern Gfx D_9023290[]; extern Gfx D_90234D0[]; @@ -1369,6 +1460,7 @@ extern Gfx D_A000000[]; // ast_CE9E70 extern Gfx D_C017440[]; extern ObjectInit* D_C0356A4[]; +extern u16* D_C037E3C[]; extern f32 D_C038A48[]; extern f32 D_C038B40[]; extern f32 D_C038B40[]; @@ -1390,8 +1482,10 @@ extern u16 D_D006B50[]; extern u16 D_D007A70[]; extern u16 D_D008990[]; extern Gfx D_D0098B0[]; +extern Gfx D_D009A40[]; extern Gfx D_D00B5C0[]; extern Gfx D_D00B720[]; +extern Gfx D_D00B880[]; // ast_92EC40 extern u16 D_E00E100[]; diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index b4d1392c..7cc456f4 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -1,6 +1,24 @@ D_800C90F0 = 0x800C90F0; __libm_qnan_f = 0x800C9570; D_1 = 0x1; //ignore:true +D_80120000 = 0x80120000;//ignore:true +D_80130001 = 0x80130001;//ignore:true +D_80000000 = 0x80000000;//ignore:true +D_80000001 = 0x80000001;//ignore:true +D_80000002 = 0x80000002;//ignore:true +D_80000003 = 0x80000003;//ignore:true +D_80000004 = 0x80000004;//ignore:true +D_80000005 = 0x80000005;//ignore:true +D_80000006 = 0x80000006;//ignore:true +D_80000007 = 0x80000007;//ignore:true +D_80000008 = 0x80000008;//ignore:true +D_80000009 = 0x80000009;//ignore:true +D_8000000A = 0x8000000A;//ignore:true +D_8000000B = 0x8000000B;//ignore:true +D_8000000C = 0x8000000C;//ignore:true +D_8000000D = 0x8000000D;//ignore:true +D_8000000E = 0x8000000E;//ignore:true +D_8000000F = 0x8000000F;//ignore:true D_800C45E0 = 0x800C45E0; @@ -12,31 +30,19 @@ gZBuffer = 0x80282000; gFrameBuffers = 0x8038F800; gDmaTable = 0x80178A70; //size:0x5A0 D_80178A70 = 0x80178A78; //ignore:true +D_80151650 = 0x80151650; //ignore:true -D_80161A18 = 0x80161A18;//size:0x10 D_801615D0 = 0x801615D0;//size:0xC D_801615E0 = 0x801615E0;//size:0xC +D_800CFF80 = 0x800CFF80;//size:0x10 D_80161578 = 0x80161578;//size:0x30 -D_80161AA8 = 0x80161AA8;//size:0x10 D_800CA23C = 0x800CA23C;//size:0x18 D_800CA26C = 0x800CA26C;//size:0x20 D_800CA260 = 0x800CA260;//size:0xC D_801613E0 = 0x801613E0;//size:0x18 D_800CC124 = 0x800CC124;//type:u8 - -D_80161B00 = 0x80161B00; //size:0x1900 -D_80163400 = 0x80163400; //size:0xBE0 -D_80163FE0 = 0x80163FE0; //size:0xB130 -D_8016F110 = 0x8016F110; //size:0x1020 -D_80170130 = 0x80170130; //size:0x36B0 -D_801737E0 = 0x801737E0; //size:0x870 -D_80174050 = 0x80174050; //size:0x700 -D_80174750 = 0x80174750; //size:0x12C0 -D_80175A10 = 0x80175A10; //size:0xA28 -D_80176438 = 0x80176438; //size:0x18 - -gExpertMode = 0x801779F8; +D_800C9E90 = 0x800C9E90;//size:0x70 D_800D3180 = 0x800D3180; // size:0x1E gSetupDLs = 0x800D31B0; // size:0x18C0 @@ -79,7 +85,6 @@ __pos_z = 0x8016199C;//type:f32 Save_Checksum = 0x800C2FB0; Save_Write = 0x800C3084; Save_Read = 0x800C3194; -gSaveFile = 0x80178870; //size:0x200 __rspboot_start = 0x80000450;//name_end:__rspboot_end __aspmain_start = 0x80000520;//name_end:__aspmain_end @@ -88,7 +93,6 @@ gF3dexData = 0x800C3DD0; sEFFA40_Overlay = 0x800CBD3C; -D_80177E88 = 0x80177E88; // size:0xC D_800CFA54 = 0x800CFA54; D_800D934C = 0x800D934C; // force_migration:True @@ -100,7 +104,6 @@ D_800D55E4_fake = 0x800D55E4; // force_migration:True D_800D8570 = 0x800D8570; // force_migration:True D_800D8594 = 0x800D8594; // force_migration:True D_800C93EC = 0x800C93EC; // force_migration:True -D_80177B90 = 0x80177B90; // force_migration:True D_DF4260_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_DF4260 D_E16C50_801C171C = 0x801C171C; // force_migration:True segment:ovl_E16C50 diff --git a/linker_scripts/us/symbol_addrs_engine.txt b/linker_scripts/us/symbol_addrs_engine.txt index e1836040..6de3cc34 100644 --- a/linker_scripts/us/symbol_addrs_engine.txt +++ b/linker_scripts/us/symbol_addrs_engine.txt @@ -1,3 +1,7 @@ +// fox_enmy1 +Object_Kill = 0x80060FBC; + +//fox_display Graphics_ClearPrintBuffer = 0x80099980; Graphics_Printf = 0x800999D8; Texture_Scroll = 0x80099A2C; @@ -45,6 +49,7 @@ Graphics_GetSmallTextWidth = 0x800A13EC; func_800A1540 = 0x800A1540; func_800A1558 = 0x800A1558; +// fox_rcp RCP_SetupDL = 0x800B8DD0; RCP_SetFog = 0x800B8E14; RCP_SetupDL_0 = 0x800b8f18; @@ -100,10 +105,30 @@ RCP_SetupDL_44 = 0x800BA5E0; RCP_SetupDL_50 = 0x800BA610; RCP_SetupDL_61 = 0x800BA640; -gTextCharTextures = 0x80179010; +// fox_radio +D_80178720 = 0x80178720; +D_80178724 = 0x80178724; +D_80178728 = 0x80178728; +D_8017872C = 0x8017872C; +D_80178730 = 0x80178730; +D_80178734 = 0x80178734; +D_80178738 = 0x80178738; +D_8017873C = 0x8017873C; +D_80178740 = 0x80178740; +D_80178744 = 0x80178744; +D_80178748 = 0x80178748; +sCurrentMsgPri = 0x800D4A70; +func_800BA760 = 0x800BA760; +func_800BA7BC = 0x800BA7BC; +func_800BA808 = 0x800BA808; +func_800BAAE8 = 0x800BAAE8; +func_800BB388 = 0x800BB388; +func_800BB5D0 = 0x800BB5D0; + +// fox_message +gTextCharTextures = 0x80179010; gMsgLookup = 0x80185CBC; -gDefaultSave = 0x800D4D10; Message_PtrFromId = 0x800C2830; Message_IdFromPtr = 0x800C2890; @@ -113,3 +138,315 @@ Message_DisplayChar = 0x800C295C; Message_DisplayText = 0x800C2AF0; Message_DisplayScrollingText = 0x800C2D3C; Message_IsPrintingChar = 0x800C2F30; + +// fox_save +gDefaultSave = 0x800D4D10; +gSaveFile = 0x80178870; //size:0x200 + +// fox_enmy1 +Object_80_Initialize = 0x80061364; +Object_4C_Initialize = 0x80061394; +Object_2F4_Initialize = 0x800613C4; +Object_408_Initialize = 0x80061404; +Object_6C_Initialize = 0x80061444; +Object_8C_Initialize = 0x80061474; + +// fox_A24B0 +D_80161A10 = 0x80161A10; +D_80161A14 = 0x80161A14; +D_80161A18 = 0x80161A18; //size:0x10 +D_80161A28 = 0x80161A28; +D_80161A2C = 0x80161A2C; +D_80161A2E = 0x80161A2E; +gNextLevel = 0x80161A30; +gNextGameState = 0x80161A32; +D_80161A34 = 0x80161A34; +gBgColor = 0x80161A36; +gBlurAlpha = 0x80161A38; +D_80161A39 = 0x80161A39; +D_80161A3C = 0x80161A3C; +D_80161A40 = 0x80161A40; +D_80161A44 = 0x80161A44; +D_800D2860 = 0x800D2860; +D_800D2870 = 0x800D2870; +D_800D2874 = 0x800D2874; +D_800D2884 = 0x800D2884; +D_800D2894 = 0x800D2894; +D_800D28A4 = 0x800D28A4; +sOverlaySetups = 0x800D28B4; + +Game_Initialize = 0x800A18B0; +Game_SetGameState = 0x800A1980; +func_800A1B6C = 0x800A1B6C; +func_800A1C14 = 0x800A1C14; +func_800A1E68 = 0x800A1E68; +func_800A1F44 = 0x800A1F44; +func_800A1FB0 = 0x800A1FB0; +func_800A24DC = 0x800A24DC; +func_800A25DC = 0x800A25DC; +func_800A26C0 = 0x800A26C0; +func_800A3608 = 0x800A3608; + +// sf_hud +gMedalFlashTimer = 0x801617B8; +gMedalStatus = 0x801617B4; + +// sf_A4B50 +D_80161A50 = 0x80161A50; +D_80161A54 = 0x80161A54; +D_80161A5C = 0x80161A5C; +D_80161A60 = 0x80161A60; +D_80161A62 = 0x80161A62; +D_80161A64 = 0x80161A64; +sEnvSettings = 0x80161A68; +D_80161A70 = 0x80161A70; +D_80161A74 = 0x80161A74; +D_80161A78 = 0x80161A78; +D_80161A7C = 0x80161A7C; +D_80161A80 = 0x80161A80; +D_80161A84 = 0x80161A84; +D_80161A88 = 0x80161A88; +D_80161A8C = 0x80161A8C; +gGoldRingCount = 0x80161A90; +gHitCount = 0x80161A98; +D_80161A9C = 0x80161A9C; +gLifeCount = 0x80161AA0; +gLaserStrength = 0x80161AA8;//size:0x10 +D_80161AB8 = 0x80161AB8; +gObjects80 = 0x80161B00; //size:0x1900 +gObjects4C = 0x80163400; //size:0xBE0 +gObjects2F4 = 0x80163FE0; //size:0xB130 +gObjects408 = 0x8016F110; //size:0x1020 +gObjects8C = 0x80170130; //size:0x36B0 +gObjects6C = 0x801737E0; //size:0x870 +gObjects70 = 0x80174050; //size:0x700 +gUnkEntities30 = 0x80174750; //size:0x12C0 +gUnkEntities28 = 0x80175A10; //size:0xA28 +gUnkEntities1C = 0x80176438; //size:0x18 +D_80176550 = 0x80176550; +D_80176558 = 0x80176558; +D_80176878 = 0x80176878; +D_80176B98 = 0x80176B98; +D_80176EB8 = 0x80176EB8; +D_801771D8 = 0x801771D8; +gOverlaySetup = 0x801774F8; +D_80177500 = 0x80177500; +gOverlayStage = 0x80177820; +D_80177824 = 0x80177824; +D_80177828 = 0x80177828; +D_8017782C = 0x8017782C; +D_80177830 = 0x80177830; +gGameState = 0x80177834; +D_80177838 = 0x80177838; +D_8017783C = 0x8017783C; +D_80177840 = 0x80177840; +D_80177848 = 0x80177848; +D_8017784C = 0x8017784C; +D_80177850 = 0x80177850; +D_80177854 = 0x80177854; +D_80177858 = 0x80177858; +D_80177868 = 0x80177868; +D_80177870 = 0x80177870; +D_80177880 = 0x80177880; +D_80177888 = 0x80177888; +D_80177898 = 0x80177898; +D_8017789C = 0x8017789C; +D_801778A0 = 0x801778A0; +D_801778A4 = 0x801778A4; +gCamCount = 0x801778A8; +D_801778AB = 0x801778AB; +D_801778AC = 0x801778AC; +D_801778B0 = 0x801778B0; +D_801778C8 = 0x801778C8; +D_801778D0 = 0x801778D0; +D_801778E8 = 0x801778E8; +D_80177908 = 0x80177908; +D_80177910 = 0x80177910; +D_80177928 = 0x80177928; +D_80177930 = 0x80177930; +D_80177938 = 0x80177938; +D_80177940 = 0x80177940; +D_80177948 = 0x80177948; +D_80177950 = 0x80177950; +D_80177958 = 0x80177958; +D_80177978 = 0x80177978; +D_8017797C = 0x8017797C; +D_80177980 = 0x80177980; +D_80177988 = 0x80177988; +D_80177990 = 0x80177990; +D_801779A0 = 0x801779A0; +D_801779A8 = 0x801779A8; +D_801779B8 = 0x801779B8; +D_801779C0 = 0x801779C0; +D_801779C8 = 0x801779C8; +D_801779D8 = 0x801779D8; +D_801779E8 = 0x801779E8; +gExpertMode = 0x801779F8; +D_80177A10 = 0x80177A10;//size:0x28 +D_80177A48 = 0x80177A48;//size:0x28 +D_80177A70 = 0x80177A70;//size:0x10 +D_80177A80 = 0x80177A80; +D_80177A88 = 0x80177A88;//size:0x10 +D_80177A98 = 0x80177A98; +D_80177AA0 = 0x80177AA0; +D_80177AB0 = 0x80177AB0; +D_80177AB8 = 0x80177AB8; +D_80177AC8 = 0x80177AC8; +D_80177AD0 = 0x80177AD0; +D_80177AE0 = 0x80177AE0; +D_80177AE8 = 0x80177AE8; +D_80177AF8 = 0x80177AF8; +D_80177B00 = 0x80177B00; +D_80177B40 = 0x80177B40; +D_80177B48 = 0x80177B48; +D_80177B50 = 0x80177B50; +D_80177B70 = 0x80177B70; +D_80177B8C = 0x80177B8C; +D_80177B90 = 0x80177B90; +D_80177BB0 = 0x80177BB0; +D_80177C30 = 0x80177C30; +D_80177C50 = 0x80177C50; +gSoundMode = 0x80177C74; +gVolumeSettings = 0x80177C80; +D_80177C90 = 0x80177C90; +D_80177C94 = 0x80177C94; +gLevelType = 0x80177C98; +D_80177C9C = 0x80177C9C; +D_80177CA0 = 0x80177CA0; +D_80177CA4 = 0x80177CA4; +D_80177CAC = 0x80177CAC; +D_80177CB0 = 0x80177CB0; +D_80177CB4 = 0x80177CB4; +D_80177CBC = 0x80177CBC; +D_80177CC4 = 0x80177CC4; +D_80177CC8 = 0x80177CC8; +D_80177D08 = 0x80177D08; +gRightWingHealth = 0x80177D10; +D_80177D20 = 0x80177D20; +gLeftWingHealth = 0x80177D28; +D_80177D38 = 0x80177D38; +D_80177D40 = 0x80177D40; +D_80177D50 = 0x80177D50; +D_80177D58 = 0x80177D58; +D_80177D68 = 0x80177D68; +D_80177D70 = 0x80177D70; +D_80177D88 = 0x80177D88; +gBombCount = 0x80177DA0; +gFrameCount = 0x80177DB0; +D_80177DC8 = 0x80177DC8; +D_80177E70 = 0x80177E70; +D_80177E78 = 0x80177E78; +D_80177E80 = 0x80177E80; +D_80177E88 = 0x80177E88; // size:0xC +D_80177E98 = 0x80177E98; +D_80177F10 = 0x80177F10; +D_8017812C = 0x8017812C; +gCurrentLevel = 0x80178234; +D_80178238 = 0x80178238;//size:4 type:u8 +D_8017827C = 0x8017827C; +gPlayer = 0x80178280; +D_80178284 = 0x80178284; +D_80178288 = 0x80178288; +D_8017828C = 0x8017828C; +D_80178290 = 0x80178290; +D_80178294 = 0x80178294; +D_80178298 = 0x80178298; +D_8017829C = 0x8017829C; +D_801782A4 = 0x801782A4; +D_801782AC = 0x801782AC; +D_801782B4 = 0x801782B4; +D_801782B8 = 0x801782B8; +D_801782BC = 0x801782BC; +D_801782C0 = 0x801782C0; +D_801782D0 = 0x801782D0; +D_801782D4 = 0x801782D4; +D_801782D8 = 0x801782D8; +D_801782E8 = 0x801782E8; +D_801782F8 = 0x801782F8; +D_801782FC = 0x801782FC; +D_80178300 = 0x80178300; +D_80178308 = 0x80178308; +D_80178310 = 0x80178310; +gFogRed = 0x80178320; +gFogGreen = 0x80178328; +gFogBlue = 0x80178330; +gFogAlpha = 0x80178338; +D_80178340 = 0x80178340; +D_80178348 = 0x80178348; +D_80178350 = 0x80178350; +D_80178354 = 0x80178354; +D_80178358 = 0x80178358; +D_8017835C = 0x8017835C; +D_80178360 = 0x80178360; +D_80178364 = 0x80178364; +D_80178368 = 0x80178368; +D_8017836C = 0x8017836C; +D_80178370 = 0x80178370; +D_80178374 = 0x80178374; +D_80178378 = 0x80178378; +D_80178380 = 0x80178380; +D_80178390 = 0x80178390; +D_801783A0 = 0x801783A0; +D_801783B0 = 0x801783B0; +D_801783D0 = 0x801783D0; +D_801783D4 = 0x801783D4; +gFogNear = 0x801783D8; +gFogFar = 0x801783DC; +D_80178410 = 0x80178410; +D_80178420 = 0x80178420; +D_80178424 = 0x80178424; +D_80178428 = 0x80178428; +D_8017842C = 0x8017842C; +D_80178430 = 0x80178430; +D_80178440 = 0x80178440; +D_80178444 = 0x80178444; +D_80178448 = 0x80178448; +D_8017847C = 0x8017847C; +D_80178480 = 0x80178480; +D_80178488 = 0x80178488; +D_801784A4 = 0x801784A4; +D_801784AC = 0x801784AC; +D_801784B8 = 0x801784B8; +D_801784BC = 0x801784BC; +D_801784C0 = 0x801784C0; +D_801784C4 = 0x801784C4; +D_801784C8 = 0x801784C8; +D_801784CC = 0x801784CC; +D_801784D0 = 0x801784D0; +D_801784D4 = 0x801784D4; +D_801784D8 = 0x801784D8; +gLight1x = 0x801784DC; +gLight1y = 0x801784E0; +gLight1z = 0x801784E4; +D_801784E8 = 0x801784E8; +D_801784EC = 0x801784EC; +D_801784F0 = 0x801784F0; +D_801784F4 = 0x801784F4; +D_801784F8 = 0x801784F8; +D_801784FC = 0x801784FC; +D_80178500 = 0x80178500; +gLight2x = 0x80178504; +gLight2y = 0x80178508; +gLight2z = 0x8017850C; +D_80178520 = 0x80178520; +D_80178524 = 0x80178524; +D_80178528 = 0x80178528; +D_80178538 = 0x80178538; +D_8017853C = 0x8017853C; +D_80178540 = 0x80178540; +D_80178544 = 0x80178544; +gLight1R = 0x80178548; +gLight1G = 0x8017854C; +gLight1B = 0x80178550; +gAmbientR = 0x80178554; +gAmbientG = 0x80178558; +gAmbientB = 0x8017855C; +gLight2R = 0x80178564; +gLight2G = 0x80178568; +gLight2B = 0x8017856C; +D_80178570 = 0x80178570; +D_80178574 = 0x80178574; +D_80178578 = 0x80178578; + +Play_GetMaxHealth = 0x800A3FC4; +Play_CheckMedalStatus = 0x800A3F50; diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index c0a5c3ec..43d8383f 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -401,6 +401,7 @@ D_600683C = 0x0600683C; D_6006858 = 0x06006858; D_6006890_f32 = 0x06006890; D_6006890_Gfx = 0x06006890; +D_6030B14_f32 = 0x6030B14; D_60068BC = 0x060068BC; D_60068F0 = 0x060068F0; D_6006A3C = 0x06006A3C; diff --git a/src/assets/ast_DE5D50.c b/src/assets/ast_DE5D50.c index 681a18e8..47d475b8 100644 --- a/src/assets/ast_DE5D50.c +++ b/src/assets/ast_DE5D50.c @@ -10,10 +10,10 @@ typedef enum { NP5, NP6, NP7, - NP8, - NP9, - NPA, - NPB, + PRI0, + PRI1, + PRI2, + PRI3, SPC, HSP, QSP, @@ -683,2039 +683,2039 @@ u16 gMsg_ID_1470[18] = { END, }; u16 gMsg_ID_2005[18] = { - NPA, _O, _p, _e, _n, SPC, _t, _h, _e, SPC, _w, _i, _n, _g, _s, PRD, NWL, + PRI2, _O, _p, _e, _n, SPC, _t, _h, _e, SPC, _w, _i, _n, _g, _s, PRD, NWL, END, }; u16 gMsg_ID_2010[34] = { - NPA, _C, _h, _e, _c, _k, SPC, _y, _o, _u, _r, SPC, NWL, + PRI2, _C, _h, _e, _c, _k, SPC, _y, _o, _u, _r, SPC, NWL, _G, DSH, _D, _i, _f, _f, _u, _s, _e, _r, SPC, _s, _y, _s, _t, _e, _m, EXM, NWL, END, }; u16 gMsg_ID_2020[26] = { - NPA, _F, _a, _l, _c, _o, SPC, _h, _e, _r, _e, PRD, SPC, NWL, + PRI2, _F, _a, _l, _c, _o, SPC, _h, _e, _r, _e, PRD, SPC, NWL, _I, APS, _m, SPC, _f, _i, _n, _e, PRD, NWL, END, }; u16 gMsg_ID_2030[34] = { - NPA, _T, _h, _i, _s, SPC, _i, _s, SPC, _P, _e, _p, _p, _y, PRD, SPC, NWL, + PRI2, _T, _h, _i, _s, SPC, _i, _s, SPC, _P, _e, _p, _p, _y, PRD, SPC, NWL, _A, _l, _l, SPC, _s, _y, _s, _t, _e, _m, _s, SPC, _g, _o, PRD, NWL, END, }; u16 gMsg_ID_2040[24] = { - NPA, _S, _l, _i, _p, _p, _y, SPC, _h, _e, _r, _e, PRD, SPC, NWL, + PRI2, _S, _l, _i, _p, _p, _y, SPC, _h, _e, _r, _e, PRD, SPC, NWL, _I, APS, _m, SPC, _O, _K, PRD, NWL, END, }; u16 gMsg_ID_2050[44] = { - NPA, _I, SPC, _s, _e, _e, SPC, APS, _e, _m, SPC, _u, _p, SPC, _a, _h, _e, _a, _d, EXM, NWL, + PRI2, _I, SPC, _s, _e, _e, SPC, APS, _e, _m, SPC, _u, _p, SPC, _a, _h, _e, _a, _d, EXM, NWL, _L, _e, _t, APS, _s, SPC, _r, _o, _c, _k, SPC, _a, _n, _d, SPC, _r, _o, _l, _l, EXM, NWL, END, }; u16 gMsg_ID_2055[36] = { - NP9, _W, _e, APS, _r, _e, SPC, _e, _n, _t, _e, _r, _i, _n, _g, NWL, + PRI1, _W, _e, APS, _r, _e, SPC, _e, _n, _t, _e, _r, _i, _n, _g, NWL, _C, _o, _r, _n, _e, _r, _i, _a, SPC, _C, _i, _t, _y, SPC, _n, _o, _w, EXM, NWL, END, }; u16 gMsg_ID_2058[22] = { - NP9, _T, _h, _i, _s, SPC, _i, _s, SPC, _h, _o, _r, _r, _i, _b, _l, _e, PRD, PRD, PRD, NWL, + PRI1, _T, _h, _i, _s, SPC, _i, _s, SPC, _h, _o, _r, _r, _i, _b, _l, _e, PRD, PRD, PRD, NWL, END, }; u16 gMsg_ID_2061[42] = { - NP9, _S, _l, _i, _p, _p, _y, CMA, SPC, _w, _a, _t, _c, _h, SPC, _o, _u, _t, EXM, SPC, NWL, + PRI1, _S, _l, _i, _p, _p, _y, CMA, SPC, _w, _a, _t, _c, _h, SPC, _o, _u, _t, EXM, SPC, NWL, _B, _o, _g, _e, _y, SPC, _o, _n, SPC, _y, _o, _u, _r, SPC, _t, _a, _i, _l, EXM, NWL, END, }; u16 gMsg_ID_2062[18] = { - NP9, _W, _h, _o, _a, EXM, SPC, _H, _e, _l, _p, SPC, _m, _e, EXM, NWL, + PRI1, _W, _h, _o, _a, EXM, SPC, _H, _e, _l, _p, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_2080[36] = { - NP9, _D, _o, _n, APS, _t, SPC, _b, _e, SPC, _d, _o, _i, _n, _g, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _b, _e, SPC, _d, _o, _i, _n, _g, NWL, _a, _n, _y, _t, _h, _i, _n, _g, SPC, _f, _o, _o, _l, _i, _s, _h, EXM, NWL, END, }; u16 gMsg_ID_2090[10] = { - NP9, _G, _o, _t, _c, _h, _a, EXM, NWL, + PRI1, _G, _o, _t, _c, _h, _a, EXM, NWL, END, }; u16 gMsg_ID_2095[18] = { - NP9, _B, _a, _c, _k, SPC, _o, _f, _f, CMA, SPC, _F, _o, _x, EXM, NWL, + PRI1, _B, _a, _c, _k, SPC, _o, _f, _f, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_2110[36] = { - NP9, _D, _o, SPC, _a, SPC, _b, _a, _r, _r, _e, _l, SPC, _r, _o, _l, _l, SPC, NWL, + PRI1, _D, _o, SPC, _a, SPC, _b, _a, _r, _r, _e, _l, SPC, _r, _o, _l, _l, SPC, NWL, LPR, _Z, SPC, _o, _r, SPC, _R, SPC, _t, _w, _i, _c, _e, RPR, EXM, NWL, END, }; u16 gMsg_ID_2115[38] = { - NP9, _Y, _o, _u, APS, _v, _e, SPC, _g, _o, _t, SPC, _a, _n, SPC, _e, _n, _e, _m, _y, SPC, NWL, + PRI1, _Y, _o, _u, APS, _v, _e, SPC, _g, _o, _t, SPC, _a, _n, SPC, _e, _n, _e, _m, _y, SPC, NWL, _o, _n, SPC, _y, _o, _u, _r, SPC, _t, _a, _i, _l, EXM, NWL, END, }; u16 gMsg_ID_2118[42] = { - NP9, _U, _s, _e, SPC, _t, _h, _e, SPC, _b, _r, _a, _k, _e, NWL, + PRI1, _U, _s, _e, SPC, _t, _h, _e, SPC, _b, _r, _a, _k, _e, NWL, LPR, _p, _r, _e, _s, _s, SPC, _t, _h, _e, SPC, _C, ADN, SPC, CDN, NWL, _B, _u, _t, _t, _o, _n, RPR, EXM, NWL, END, }; u16 gMsg_ID_2140[40] = { - NP9, _F, _o, _l, _l, _o, _w, SPC, _y, _o, _u, _r, SPC, NWL, + PRI1, _F, _o, _l, _l, _o, _w, SPC, _y, _o, _u, _r, SPC, NWL, _f, _a, _t, _h, _e, _r, APS, _s, SPC, _e, _x, _a, _m, _p, _l, _e, CMA, SPC, NWL, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_2165[46] = { - NP9, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _t, _h, _i, _s, SPC, _o, _n, _e, PRD, NWL, + PRI1, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _t, _h, _i, _s, SPC, _o, _n, _e, PRD, NWL, _G, _e, _t, SPC, _t, _h, _e, SPC, _o, _n, _e, SPC, _b, _e, _h, _i, _n, _d, NWL, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_2166[36] = { - NP9, _I, SPC, _c, _o, _u, _l, _d, SPC, _u, _s, _e, SPC, _s, _o, _m, _e, SPC, NWL, + PRI1, _I, SPC, _c, _o, _u, _l, _d, SPC, _u, _s, _e, SPC, _s, _o, _m, _e, SPC, NWL, _h, _e, _l, _p, SPC, _h, _e, _r, _e, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_2167[42] = { - NP9, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, SPC, _w, _r, _o, _n, _g, NWL, + PRI1, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, SPC, _w, _r, _o, _n, _g, NWL, _w, _i, _t, _h, SPC, _t, _h, _e, SPC, _G, DSH, _D, _i, _f, _f, _u, _s, _e, _r, EXM, NWL, END, }; u16 gMsg_ID_2180[30] = { - NP9, _P, _r, _e, _t, _t, _y, SPC, _s, _m, _o, _o, _t, _h, SPC, NWL, + PRI1, _P, _r, _e, _t, _t, _y, SPC, _s, _m, _o, _o, _t, _h, SPC, NWL, _f, _l, _y, _i, _n, _g, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_2181[18] = { - NP9, _F, _o, _l, _l, _o, _w, SPC, _m, _e, CMA, SPC, _F, _o, _x, EXM, NWL, + PRI1, _F, _o, _l, _l, _o, _w, SPC, _m, _e, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_2185[26] = { - NPA, _F, _a, _l, _c, _o, CMA, SPC, _w, _h, _e, _r, _e, SPC, _y, _a, SPC, NWL, + PRI2, _F, _a, _l, _c, _o, CMA, SPC, _w, _h, _e, _r, _e, SPC, _y, _a, SPC, NWL, _g, _o, _i, _n, _g, QST, NWL, END, }; u16 gMsg_ID_2188[38] = { - NPA, _I, SPC, _f, _o, _u, _n, _d, SPC, _t, _h, _e, SPC, _t, _a, _r, _g, _e, _t, EXM, NWL, + PRI2, _I, SPC, _f, _o, _u, _n, _d, SPC, _t, _h, _e, SPC, _t, _a, _r, _g, _e, _t, EXM, NWL, _T, _r, _y, SPC, _t, _o, SPC, _k, _e, _e, _p, SPC, _u, _p, PRD, NWL, END, }; u16 gMsg_ID_2200[26] = { - NPA, _E, _n, _e, _m, _y, SPC, _r, _o, _b, _o, _t, NWL, + PRI2, _E, _n, _e, _m, _y, SPC, _r, _o, _b, _o, _t, NWL, _d, _e, _a, _d, SPC, _a, _h, _e, _a, _d, PRD, NWL, END, }; u16 gMsg_ID_2210[12] = { - NP9, _L, _e, _t, APS, _s, SPC, _g, _o, EXM, NWL, + PRI1, _L, _e, _t, APS, _s, SPC, _g, _o, EXM, NWL, END, }; u16 gMsg_ID_2220[30] = { - NP9, _Y, _o, _u, SPC, _a, _n, _n, _o, _y, _i, _n, _g, SPC, NWL, + PRI1, _Y, _o, _u, SPC, _a, _n, _n, _o, _y, _i, _n, _g, SPC, NWL, _l, _i, _t, _t, _l, _e, SPC, _f, _l, _i, _e, _s, EXM, NWL, END, }; u16 gMsg_ID_2225[26] = { - NPA, _E, _n, _e, _m, _y, SPC, _s, _h, _i, _e, _l, _d, NWL, + PRI2, _E, _n, _e, _m, _y, SPC, _s, _h, _i, _e, _l, _d, NWL, _a, _n, _a, _l, _y, _z, _e, _d, PRD, NWL, END, }; u16 gMsg_ID_2230[20] = { - NPA, _A, _i, _m, SPC, _f, _o, _r, SPC, _h, _i, _s, SPC, _b, _a, _c, _k, EXM, NWL, + PRI2, _A, _i, _m, SPC, _f, _o, _r, SPC, _h, _i, _s, SPC, _b, _a, _c, _k, EXM, NWL, END, }; u16 gMsg_ID_2233[40] = { - NP9, _M, _o, _v, _e, SPC, _i, _t, CMA, SPC, _F, _o, _x, EXM, SPC, _H, _e, APS, _s, NWL, + PRI1, _M, _o, _v, _e, SPC, _i, _t, CMA, SPC, _F, _o, _x, EXM, SPC, _H, _e, APS, _s, NWL, _r, _i, _g, _h, _t, SPC, _b, _e, _h, _i, _n, _d, SPC, _y, _o, _u, EXM, NWL, END, }; u16 gMsg_ID_2282[38] = { - NP9, _Q, _u, _i, _t, SPC, _s, _c, _r, _e, _w, _i, _n, _g, NWL, + PRI1, _Q, _u, _i, _t, SPC, _s, _c, _r, _e, _w, _i, _n, _g, NWL, _a, _r, _o, _u, _n, _d, EXM, SPC, _D, _o, NWL, _s, _o, _m, _e, _t, _h, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_2240[28] = { - NPA, _A, _h, CMA, SPC, _s, _o, SPC, _t, _h, _i, _s, SPC, _i, _s, NWL, + PRI2, _A, _h, CMA, SPC, _s, _o, SPC, _t, _h, _i, _s, SPC, _i, _s, NWL, _S, _t, _a, _r, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_2250[26] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _t, _o, SPC, _c, _r, _u, _s, _h, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _t, _o, SPC, _c, _r, _u, _s, _h, NWL, _y, _o, _u, EXM, NWL, END, }; u16 gMsg_ID_2260[36] = { - NP9, _T, _h, _o, _s, _e, SPC, _w, _h, _o, SPC, _c, _r, _o, _s, _s, NWL, + PRI1, _T, _h, _o, _s, _e, SPC, _w, _h, _o, SPC, _c, _r, _o, _s, _s, NWL, _A, _n, _d, _r, _o, _s, _s, SPC, _w, _i, _l, _l, SPC, _d, _i, _e, EXM, NWL, END, }; u16 gMsg_ID_2263[36] = { - NP9, _S, _t, _o, _p, SPC, _m, _o, _v, _i, _n, _g, SPC, _s, _o, SPC, _I, SPC, NWL, + PRI1, _S, _t, _o, _p, SPC, _m, _o, _v, _i, _n, _g, SPC, _s, _o, SPC, _I, SPC, NWL, _c, _a, _n, SPC, _s, _q, _u, _a, _s, _h, SPC, _y, _o, _u, EXM, NWL, END, }; u16 gMsg_ID_2265[34] = { - NP9, _Y, _o, _u, SPC, _a, _r, _e, SPC, _s, _t, _a, _r, _t, _i, _n, _g, SPC, NWL, + PRI1, _Y, _o, _u, SPC, _a, _r, _e, SPC, _s, _t, _a, _r, _t, _i, _n, _g, SPC, NWL, _t, _o, SPC, _a, _n, _n, _o, _y, SPC, _m, _e, PRD, NWL, END, }; u16 gMsg_ID_2270[8] = { - NP9, _N, _o, EXM, EXM, EXM, NWL, + PRI1, _N, _o, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_2275[40] = { - NP9, _I, SPC, _w, _i, _l, _l, SPC, _n, _o, _t, SPC, _b, _e, NWL, + PRI1, _I, SPC, _w, _i, _l, _l, SPC, _n, _o, _t, SPC, _b, _e, NWL, _d, _e, _f, _e, _a, _t, _e, _d, SPC, _b, _y, SPC, _t, _h, _i, _s, NWL, _w, _o, _r, _m, EXM, NWL, END, }; u16 gMsg_ID_2280[34] = { - NPA, _M, _y, SPC, _e, _m, _p, _e, _r, _o, _r, PRD, PRD, PRD, NWL, + PRI2, _M, _y, SPC, _e, _m, _p, _e, _r, _o, _r, PRD, PRD, PRD, NWL, _I, APS, _v, _e, SPC, _f, _a, _i, _l, _e, _d, SPC, _y, _o, _u, EXM, NWL, END, }; u16 gMsg_ID_2290[30] = { - NP9, _A, _h, PRD, PRD, _s, _o, _m, _e, _o, _n, _e, NWL, + PRI1, _A, _h, PRD, PRD, _s, _o, _m, _e, _o, _n, _e, NWL, _w, _a, _n, _t, _s, SPC, _t, _o, SPC, _p, _l, _a, _y, EXM, NWL, END, }; u16 gMsg_ID_2291[30] = { - NP9, _D, _e, _p, _l, _o, _y, SPC, _a, _l, _l, SPC, _u, _n, _i, _t, _s, EXM, NWL, + PRI1, _D, _e, _p, _l, _o, _y, SPC, _a, _l, _l, SPC, _u, _n, _i, _t, _s, EXM, NWL, _C, _H, _A, _R, _G, _E, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_2292[30] = { - NPA, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _a, SPC, _p, _r, _e, _s, _e, _n, _t, NWL, + PRI2, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _a, SPC, _p, _r, _e, _s, _e, _n, _t, NWL, _f, _o, _r, SPC, _y, _a, EXM, NWL, END, }; u16 gMsg_ID_2293[8] = { - NP9, _G, _o, EXM, EXM, NWL, + PRI1, _G, _o, EXM, EXM, NWL, END, }; u16 gMsg_ID_2294[20] = { - NP9, _W, _h, _o, SPC, _a, _r, _e, SPC, _y, _o, _u, SPC, _g, _u, _y, _s, QST, NWL, + PRI1, _W, _h, _o, SPC, _a, _r, _e, SPC, _y, _o, _u, SPC, _g, _u, _y, _s, QST, NWL, END, }; u16 gMsg_ID_2295[18] = { - NP9, _W, _e, APS, _r, _e, SPC, _S, _t, _a, _r, SPC, _F, _o, _x, EXM, NWL, + PRI1, _W, _e, APS, _r, _e, SPC, _S, _t, _a, _r, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_2296[32] = { - NPA, _Y, _o, _u, APS, _l, _l, SPC, _n, _e, _v, _e, _r, SPC, NWL, + PRI2, _Y, _o, _u, APS, _l, _l, SPC, _n, _e, _v, _e, _r, SPC, NWL, _d, _e, _f, _e, _a, _t, SPC, _A, _n, _d, _r, _o, _s, _s, EXM, NWL, END, }; u16 gMsg_ID_2298[48] = { - NP9, _I, _n, _c, _o, _m, _i, _n, _g, SPC, _e, _n, _e, _m, _y, SPC, NWL, + PRI1, _I, _n, _c, _o, _m, _i, _n, _g, SPC, _e, _n, _e, _m, _y, SPC, NWL, _f, _r, _o, _m, SPC, _t, _h, _e, SPC, _r, _e, _a, _r, EXM, NWL, _D, _r, _o, _p, SPC, _a, _l, _t, _i, _t, _u, _d, _e, EXM, NWL, END, }; u16 gMsg_ID_2299[26] = { - NPA, _A, _i, _m, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _o, _p, _e, _n, NWL, + PRI2, _A, _i, _m, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _o, _p, _e, _n, NWL, _s, _p, _o, _t, EXM, NWL, END, }; u16 gMsg_ID_2300[44] = { - NP9, _Y, _o, _u, SPC, _d, _i, _d, SPC, _i, _t, EXM, SPC, _I, SPC, _w, _a, _s, NWL, + PRI1, _Y, _o, _u, SPC, _d, _i, _d, SPC, _i, _t, EXM, SPC, _I, SPC, _w, _a, _s, NWL, _w, _o, _r, _r, _i, _e, _d, SPC, _f, _o, _r, SPC, _a, SPC, NWL, _m, _o, _m, _e, _n, _t, PRD, NWL, END, }; u16 gMsg_ID_2305[16] = { - NP9, _T, _h, _e, _r, _e, SPC, _y, _a, SPC, _g, _o, EXM, NWL, + PRI1, _T, _h, _e, _r, _e, SPC, _y, _a, SPC, _g, _o, EXM, NWL, END, }; u16 gMsg_ID_2310[42] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _b, _e, _c, _o, _m, _i, _n, _g, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _b, _e, _c, _o, _m, _i, _n, _g, NWL, _m, _o, _r, _e, SPC, _l, _i, _k, _e, SPC, _y, _o, _u, _r, NWL, _f, _a, _t, _h, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_2320[38] = { - NP9, _I, APS, _m, SPC, _f, _i, _n, _e, PRD, SPC, _Y, _o, _u, SPC, _O, _K, SPC, NWL, + PRI1, _I, APS, _m, SPC, _f, _i, _n, _e, PRD, SPC, _Y, _o, _u, SPC, _O, _K, SPC, NWL, _o, _v, _e, _r, SPC, _t, _h, _e, _r, _e, CMA, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_2335[44] = { - NP9, _W, _e, APS, _r, _e, SPC, _h, _e, _a, _d, _i, _n, _g, SPC, _o, _u, _t, PRD, SPC, NWL, + PRI1, _W, _e, APS, _r, _e, SPC, _h, _e, _a, _d, _i, _n, _g, SPC, _o, _u, _t, PRD, SPC, NWL, _A, _l, _l, SPC, _a, _i, _r, _c, _r, _a, _f, _t, SPC, _r, _e, _p, _o, _r, _t, EXM, NWL, END, }; u16 gMsg_ID_2336[38] = { - NPA, _T, _h, _a, _n, _k, _s, CMA, SPC, _F, _o, _x, EXM, SPC, _I, NWL, + PRI2, _T, _h, _a, _n, _k, _s, CMA, SPC, _F, _o, _x, EXM, SPC, _I, NWL, _t, _h, _o, _u, _g, _h, _t, SPC, _t, _h, _e, _y, SPC, _h, _a, _d, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_2337[34] = { - NPA, _I, SPC, _g, _u, _e, _s, _s, SPC, _I, SPC, _s, _h, _o, _u, _l, _d, SPC, NWL, + PRI2, _I, SPC, _g, _u, _e, _s, _s, SPC, _I, SPC, _s, _h, _o, _u, _l, _d, SPC, NWL, _b, _e, SPC, _t, _h, _a, _n, _k, _f, _u, _l, PRD, NWL, END, }; u16 gMsg_ID_3005[36] = { - NP9, _T, _h, _i, _n, _g, _s, SPC, _a, _r, _e, SPC, _s, _t, _a, _r, _t, _i, _n, _g, SPC, NWL, + PRI1, _T, _h, _i, _n, _g, _s, SPC, _a, _r, _e, SPC, _s, _t, _a, _r, _t, _i, _n, _g, SPC, NWL, _t, _o, SPC, _h, _e, _a, _t, SPC, _u, _p, EXM, NWL, END, }; u16 gMsg_ID_3010[30] = { - NP9, _Q, _u, _i, _t, SPC, _d, _i, _n, _k, _i, _n, APS, NWL, + PRI1, _Q, _u, _i, _t, SPC, _d, _i, _n, _k, _i, _n, APS, NWL, _a, _r, _o, _u, _n, _d, CMA, SPC, _S, _l, _i, _p, EXM, NWL, END, }; u16 gMsg_ID_3015[36] = { - NPA, _W, _e, APS, _r, _e, SPC, _h, _e, _a, _d, _i, _n, APS, SPC, _i, _n, _t, _o, NWL, + PRI2, _W, _e, APS, _r, _e, SPC, _h, _e, _a, _d, _i, _n, APS, SPC, _i, _n, _t, _o, NWL, _t, _h, _e, SPC, _a, _s, _t, _e, _r, _o, _i, _d, _s, PRD, NWL, END, }; u16 gMsg_ID_3020[24] = { - NP9, _H, _e, _r, _e, SPC, _c, _o, _m, _e, _s, SPC, _a, SPC, _B, _I, _G, NWL, + PRI1, _H, _e, _r, _e, SPC, _c, _o, _m, _e, _s, SPC, _a, SPC, _B, _I, _G, NWL, _o, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_3025[26] = { - NP9, _I, _t, APS, _s, SPC, _q, _u, _i, _e, _t, PRD, NWL, + PRI1, _I, _t, APS, _s, SPC, _q, _u, _i, _e, _t, PRD, NWL, _T, _o, _o, SPC, _q, _u, _i, _e, _t, PRD, NWL, END, }; u16 gMsg_ID_3026[28] = { - NP9, _B, _e, SPC, _c, _a, _r, _e, _f, _u, _l, EXM, NWL, + PRI1, _B, _e, SPC, _c, _a, _r, _e, _f, _u, _l, EXM, NWL, _I, _t, APS, _s, SPC, _a, SPC, _t, _r, _a, _p, EXM, NWL, END, }; u16 gMsg_ID_3040[22] = { - NP9, _J, _u, _s, _t, SPC, _s, _h, _o, _o, _t, SPC, _i, _t, CMA, SPC, _F, _o, _x, EXM, NWL, + PRI1, _J, _u, _s, _t, SPC, _s, _h, _o, _o, _t, SPC, _i, _t, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_3041[30] = { - NP9, _D, _o, _n, APS, _t, SPC, _m, _e, _s, _s, SPC, _u, _p, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _m, _e, _s, _s, SPC, _u, _p, NWL, _t, _h, _a, _t, SPC, _A, _r, _w, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_3042[26] = { - NP9, _W, _h, _o, _a, EXM, SPC, _C, _a, _n, SPC, _y, _o, _u, SPC, NWL, + PRI1, _W, _h, _o, _a, EXM, SPC, _C, _a, _n, SPC, _y, _o, _u, SPC, NWL, _m, _a, _k, _e, SPC, _i, _t, QST, NWL, END, }; u16 gMsg_ID_3050[34] = { - NP9, _T, _h, _e, SPC, _e, _n, _e, _m, _y, APS, _s, SPC, _c, _o, _m, _i, _n, _g, NWL, + PRI1, _T, _h, _e, SPC, _e, _n, _e, _m, _y, APS, _s, SPC, _c, _o, _m, _i, _n, _g, NWL, _f, _r, _o, _m, SPC, _b, _e, _h, _i, _n, _d, PRD, NWL, END, }; u16 gMsg_ID_3100[42] = { - NP9, _I, SPC, _g, _u, _e, _s, _s, SPC, _i, _t, APS, _s, SPC, _y, _o, _u, _r, NWL, + PRI1, _I, SPC, _g, _u, _e, _s, _s, SPC, _i, _t, APS, _s, SPC, _y, _o, _u, _r, NWL, _t, _u, _r, _n, SPC, _t, _o, SPC, _b, _e, SPC, _t, _h, _a, _n, _k, _f, _u, _l, PRD, NWL, END, }; u16 gMsg_ID_3110[28] = { - NP9, _Y, _o, _u, SPC, _w, _a, _n, _t, SPC, _a, SPC, _p, _i, _e, _c, _e, NWL, + PRI1, _Y, _o, _u, SPC, _w, _a, _n, _t, SPC, _a, SPC, _p, _i, _e, _c, _e, NWL, _o, _f, SPC, _m, _e, QST, EXM, NWL, END, }; u16 gMsg_ID_3120[14] = { - NP9, _T, _a, _k, _e, SPC, _t, _h, _a, _t, EXM, NWL, + PRI1, _T, _a, _k, _e, SPC, _t, _h, _a, _t, EXM, NWL, END, }; u16 gMsg_ID_3300[40] = { - NPA, _I, SPC, _c, _a, _n, _n, _o, _t, SPC, _a, _l, _l, _o, _w, SPC, _y, _o, _u, NWL, + PRI2, _I, SPC, _c, _a, _n, _n, _o, _t, SPC, _a, _l, _l, _o, _w, SPC, _y, _o, _u, NWL, _t, _o, SPC, _g, _o, SPC, _a, _n, _y, SPC, _f, _u, _r, _t, _h, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_3310[30] = { - NP9, _L, _e, _t, APS, _s, SPC, _s, _e, _e, SPC, _w, _h, _a, _t, SPC, NWL, + PRI1, _L, _e, _t, APS, _s, SPC, _s, _e, _e, SPC, _w, _h, _a, _t, SPC, NWL, _y, _o, _u, APS, _v, _e, SPC, _g, _o, _t, PRD, NWL, END, }; u16 gMsg_ID_3315[40] = { - NP9, _T, _h, _a, _t, SPC, _s, _h, _i, _e, _l, _d, SPC, _i, _s, NWL, + PRI1, _T, _h, _a, _t, SPC, _s, _h, _i, _e, _l, _d, SPC, _i, _s, NWL, _a, _b, _s, _o, _r, _b, _i, _n, _g, SPC, _t, _h, _e, SPC, NWL, _l, _a, _s, _e, _r, EXM, NWL, END, }; u16 gMsg_ID_3320[28] = { - NP9, _I, APS, _v, _e, SPC, _u, _n, _d, _e, _r, _e, _s, _t, _i, _m, _a, _t, _e, _d, NWL, + PRI1, _I, APS, _v, _e, SPC, _u, _n, _d, _e, _r, _e, _s, _t, _i, _m, _a, _t, _e, _d, NWL, _y, _o, _u, PRD, NWL, END, }; u16 gMsg_ID_3321[18] = { - NP9, _H, _o, _w, SPC, _a, _b, _o, _u, _t, SPC, _t, _h, _i, _s, QST, NWL, + PRI1, _H, _o, _w, SPC, _a, _b, _o, _u, _t, SPC, _t, _h, _i, _s, QST, NWL, END, }; u16 gMsg_ID_3322[24] = { - NP9, _I, APS, _m, SPC, _n, _o, SPC, _m, _a, _t, _c, _h, NWL, + PRI1, _I, APS, _m, SPC, _n, _o, SPC, _m, _a, _t, _c, _h, NWL, _f, _o, _r, SPC, _y, _o, _u, PRD, NWL, END, }; u16 gMsg_ID_3330[18] = { - NP9, _I, SPC, _a, _d, _m, _i, _t, SPC, _d, _e, _f, _e, _a, _t, PRD, NWL, + PRI1, _I, SPC, _a, _d, _m, _i, _t, SPC, _d, _e, _f, _e, _a, _t, PRD, NWL, END, }; u16 gMsg_ID_3340[40] = { - NP9, _A, _r, _e, SPC, _y, _o, _u, SPC, _g, _o, _n, _n, _a, NWL, + PRI1, _A, _r, _e, SPC, _y, _o, _u, SPC, _g, _o, _n, _n, _a, NWL, _l, _i, _s, _t, _e, _n, SPC, _t, _o, SPC, _t, _h, _a, _t, NWL, _m, _o, _n, _k, _e, _y, QST, NWL, END, }; u16 gMsg_ID_3345[46] = { - NP9, _H, _a, SPC, _h, _a, EXM, SPC, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, NWL, + PRI1, _H, _a, SPC, _h, _a, EXM, SPC, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, NWL, _a, _s, SPC, _s, _t, _u, _p, _i, _d, SPC, _a, _s, SPC, _y, _o, _u, SPC, NWL, _l, _o, _o, _k, EXM, NWL, END, }; u16 gMsg_ID_3350[28] = { - NP9, _I, _f, SPC, _t, _h, _i, _s, SPC, _d, _o, _e, _s, SPC, NWL, + PRI1, _I, _f, SPC, _t, _h, _i, _s, SPC, _d, _o, _e, _s, SPC, NWL, _n, _o, _t, SPC, _w, _o, _r, _k, PRD, PRD, PRD, NWL, END, }; u16 gMsg_ID_3360[36] = { - NP9, _S, _o, _r, _r, _y, SPC, _t, _o, SPC, _j, _e, _t, CMA, SPC, _b, _u, _t, NWL, + PRI1, _S, _o, _r, _r, _y, SPC, _t, _o, SPC, _j, _e, _t, CMA, SPC, _b, _u, _t, NWL, _I, APS, _m, SPC, _i, _n, SPC, _a, SPC, _h, _u, _r, _r, _y, EXM, NWL, END, }; u16 gMsg_ID_3370[40] = { - NP9, _I, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, _l, _i, _e, _v, _e, SPC, _I, NWL, + PRI1, _I, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, _l, _i, _e, _v, _e, SPC, _I, NWL, _l, _o, _s, _t, SPC, _t, _o, SPC, _t, _h, _i, _s, SPC, _s, _c, _u, _m, EXM, EXM, NWL, END, }; u16 gMsg_ID_3371[38] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _m, _o, _r, _e, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _m, _o, _r, _e, NWL, _c, _u, _n, _n, _i, _n, _g, SPC, _t, _h, _a, _n, SPC, _I, NWL, _t, _h, _o, _u, _g, _h, _t, PRD, NWL, END, }; u16 gMsg_ID_4010[34] = { - NPA, _G, _i, _v, _e, SPC, _m, _e, SPC, _S, _l, _i, _p, _p, _y, APS, _s, NWL, + PRI2, _G, _i, _v, _e, SPC, _m, _e, SPC, _S, _l, _i, _p, _p, _y, APS, _s, NWL, _l, _o, _c, _a, _t, _i, _o, _n, CMA, SPC, _R, _O, _B, PRD, NWL, END, }; u16 gMsg_ID_4011[38] = { - NPA, _L, _i, _f, _e, SPC, _f, _o, _r, _m, SPC, _i, _n, _d, _i, _c, _a, _t, _e, _d, NWL, + PRI2, _L, _i, _f, _e, SPC, _f, _o, _r, _m, SPC, _i, _n, _d, _i, _c, _a, _t, _e, _d, NWL, _a, _t, SPC, _1, _2, SPC, _o, APS, _c, _l, _o, _c, _k, PRD, NWL, END, }; u16 gMsg_ID_4012[38] = { - NPA, _T, _h, _e, _r, _e, APS, _s, SPC, _r, _o, _c, _k, _y, SPC, NWL, + PRI2, _T, _h, _e, _r, _e, APS, _s, SPC, _r, _o, _c, _k, _y, SPC, NWL, _t, _e, _r, _r, _a, _i, _n, SPC, _d, _e, _a, _d, SPC, _a, _h, _e, _a, _d, EXM, NWL, END, }; u16 gMsg_ID_4013[40] = { - NPA, _A, SPC, _m, _a, _g, _n, _e, _t, _i, _c, SPC, _s, _t, _o, _r, _m, EXM, NWL, + PRI2, _A, SPC, _m, _a, _g, _n, _e, _t, _i, _c, SPC, _s, _t, _o, _r, _m, EXM, NWL, _W, _e, APS, _l, _l, SPC, _s, _e, _a, _r, _c, _h, SPC, _h, _e, _r, _e, PRD, NWL, END, }; u16 gMsg_ID_4020[38] = { - NPA, _I, SPC, _t, _h, _i, _n, _k, SPC, _y, _o, _u, SPC, _l, _o, _o, _k, NWL, + PRI2, _I, SPC, _t, _h, _i, _n, _k, SPC, _y, _o, _u, SPC, _l, _o, _o, _k, NWL, _b, _e, _t, _t, _e, _r, SPC, _i, _n, SPC, _a, SPC, _t, _a, _n, _k, PRD, NWL, END, }; u16 gMsg_ID_4021[38] = { - NPA, _H, _e, SPC, _c, _a, _n, SPC, _s, _u, _r, _e, SPC, _b, _e, NWL, + PRI2, _H, _e, SPC, _c, _a, _n, SPC, _s, _u, _r, _e, SPC, _b, _e, NWL, _a, SPC, _p, _a, _i, _n, SPC, _i, _n, SPC, _t, _h, _e, SPC, _n, _e, _c, _k, PRD, NWL, END, }; u16 gMsg_ID_4022[40] = { - NPA, _W, _h, _y, SPC, _d, _o, _n, APS, _t, SPC, _y, _o, _u, SPC, _c, _o, _m, _e, NWL, + PRI2, _W, _h, _y, SPC, _d, _o, _n, APS, _t, SPC, _y, _o, _u, SPC, _c, _o, _m, _e, NWL, _d, _o, _w, _n, SPC, _h, _e, _r, _e, CMA, SPC, _F, _a, _l, _c, _o, QST, NWL, END, }; u16 gMsg_ID_4023[18] = { - NPA, _I, APS, _l, _l, SPC, _p, _a, _s, _s, CMA, SPC, _F, _o, _x, PRD, NWL, + PRI2, _I, APS, _l, _l, SPC, _p, _a, _s, _s, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_4024[28] = { - NPA, _D, _o, _n, APS, _t, SPC, _g, _o, SPC, _t, _o, _o, SPC, _f, _a, _s, _t, CMA, NWL, + PRI2, _D, _o, _n, APS, _t, SPC, _g, _o, SPC, _t, _o, _o, SPC, _f, _a, _s, _t, CMA, NWL, _F, _a, _l, _c, _o, PRD, NWL, END, }; u16 gMsg_ID_4030[26] = { - NP9, _T, _r, _y, SPC, _h, _o, _v, _e, _r, _i, _n, _g, NWL, + PRI1, _T, _r, _y, SPC, _h, _o, _v, _e, _r, _i, _n, _g, NWL, LPR, _Z, SPC, _a, _n, _d, SPC, _R, RPR, PRD, NWL, END, }; u16 gMsg_ID_4031[38] = { - NP9, _E, _n, _e, _m, _y, SPC, _f, _i, _g, _h, _t, _e, _r, _s, NWL, + PRI1, _E, _n, _e, _m, _y, SPC, _f, _i, _g, _h, _t, _e, _r, _s, NWL, _c, _o, _m, _i, _n, APS, SPC, _a, _t, SPC, _y, _o, _u, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_4040[14] = { - NP9, _A, _r, _e, SPC, _y, _o, _u, SPC, _O, _K, QST, NWL, + PRI1, _A, _r, _e, SPC, _y, _o, _u, SPC, _O, _K, QST, NWL, END, }; u16 gMsg_ID_4050[24] = { - NP9, _D, _o, _n, APS, _t, SPC, _b, _e, SPC, _d, _e, _a, _d, CMA, SPC, _S, _l, _i, _p, PRD, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _b, _e, SPC, _d, _e, _a, _d, CMA, SPC, _S, _l, _i, _p, PRD, NWL, END, }; u16 gMsg_ID_4075[12] = { - NP9, _I, _n, _c, _o, _m, _i, _n, _g, EXM, NWL, + PRI1, _I, _n, _c, _o, _m, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_4080[46] = { - NP9, _Y, _o, _u, SPC, _O, _K, QST, SPC, _H, _o, _l, _d, NWL, + PRI1, _Y, _o, _u, SPC, _O, _K, QST, SPC, _H, _o, _l, _d, NWL, _t, _o, _g, _e, _t, _h, _e, _r, PRD, SPC, _J, _u, _s, _t, SPC, _a, NWL, _b, _i, _t, SPC, _f, _u, _r, _t, _h, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_4082[24] = { - NP9, _I, _s, SPC, _t, _h, _a, _t, SPC, _y, _o, _u, CMA, NWL, + PRI1, _I, _s, SPC, _t, _h, _a, _t, SPC, _y, _o, _u, CMA, NWL, _S, _l, _i, _p, _p, _y, QST, NWL, END, }; u16 gMsg_ID_4083[22] = { - NP9, _I, APS, _l, _l, SPC, _b, _e, SPC, _t, _h, _e, _r, _e, SPC, _s, _o, _o, _n, PRD, NWL, + PRI1, _I, APS, _l, _l, SPC, _b, _e, SPC, _t, _h, _e, _r, _e, SPC, _s, _o, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_4091[20] = { - NP9, _G, _o, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _c, _h, _e, _s, _t, EXM, NWL, + PRI1, _G, _o, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _c, _h, _e, _s, _t, EXM, NWL, END, }; u16 gMsg_ID_4092[42] = { - NPA, _D, _a, _t, _a, SPC, _a, _n, _a, _l, _y, _s, _i, _s, NWL, + PRI2, _D, _a, _t, _a, SPC, _a, _n, _a, _l, _y, _s, _i, _s, NWL, _c, _o, _m, _p, _l, _e, _t, _e, PRD, SPC, _H, _e, _r, _e, NWL, _i, _t, SPC, _c, _o, _m, _e, _s, PRD, NWL, END, }; u16 gMsg_ID_4093[16] = { - NP9, _D, _o, SPC, _s, _o, _m, _e, _t, _h, _i, _n, _g, EXM, NWL, + PRI1, _D, _o, SPC, _s, _o, _m, _e, _t, _h, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_4094[44] = { - NP9, _L, _e, _t, SPC, _m, _e, SPC, _g, _e, _t, SPC, _a, SPC, _p, _i, _e, _c, _e, NWL, + PRI1, _L, _e, _t, SPC, _m, _e, SPC, _g, _e, _t, SPC, _a, SPC, _p, _i, _e, _c, _e, NWL, _o, _f, SPC, _t, _h, _a, _t, SPC, _a, _c, _t, _i, _o, _n, CMA, SPC, NWL, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_4095[28] = { - NP9, _T, _a, _k, _e, SPC, _o, _u, _t, SPC, _h, _i, _s, SPC, NWL, + PRI1, _T, _a, _k, _e, SPC, _o, _u, _t, SPC, _h, _i, _s, SPC, NWL, _a, _r, _m, _s, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_4096[36] = { - NP9, _P, _i, _p, _e, SPC, _d, _o, _w, _n, CMA, SPC, _S, _l, _i, _p, _p, _y, EXM, NWL, + PRI1, _P, _i, _p, _e, SPC, _d, _o, _w, _n, CMA, SPC, _S, _l, _i, _p, _p, _y, EXM, NWL, _J, _u, _s, _t, SPC, _h, _o, _l, _d, SPC, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_4097[40] = { - NP9, _S, _l, _i, _p, _p, _y, CMA, SPC, _w, _h, _a, _t, SPC, _a, _r, _e, SPC, _y, _o, _u, NWL, + PRI1, _S, _l, _i, _p, _p, _y, CMA, SPC, _w, _h, _a, _t, SPC, _a, _r, _e, SPC, _y, _o, _u, NWL, _d, _o, _i, _n, _g, QST, SPC, _H, _u, _r, _r, _y, SPC, _u, _p, EXM, NWL, END, }; u16 gMsg_ID_4098[30] = { - NP9, _I, _t, APS, _s, SPC, _i, _m, _p, _o, _s, _s, _i, _b, _l, _e, SPC, NWL, + PRI1, _I, _t, APS, _s, SPC, _i, _m, _p, _o, _s, _s, _i, _b, _l, _e, SPC, NWL, _t, _h, _i, _s, SPC, _w, _a, _y, EXM, NWL, END, }; u16 gMsg_ID_4099[32] = { - NP9, _S, _u, _r, _e, SPC, _y, _o, _u, SPC, _c, _a, _n, NWL, + PRI1, _S, _u, _r, _e, SPC, _y, _o, _u, SPC, _c, _a, _n, NWL, _h, _a, _n, _d, _l, _e, SPC, _i, _t, CMA, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_4100[28] = { - NP9, _I, SPC, _t, _h, _o, _u, _g, _h, _t, SPC, _I, SPC, _w, _a, _s, SPC, _a, NWL, + PRI1, _I, SPC, _t, _h, _o, _u, _g, _h, _t, SPC, _I, SPC, _w, _a, _s, SPC, _a, NWL, _g, _o, _n, _e, _r, EXM, NWL, END, }; u16 gMsg_ID_4101[40] = { - NP9, _W, _e, APS, _r, _e, SPC, _a, _l, _w, _a, _y, _s, SPC, _s, _a, _v, _i, _n, APS, NWL, + PRI1, _W, _e, APS, _r, _e, SPC, _a, _l, _w, _a, _y, _s, SPC, _s, _a, _v, _i, _n, APS, NWL, _y, _o, _u, _r, SPC, _h, _i, _d, _e, CMA, SPC, _S, _l, _i, _p, PRD, NWL, END, }; u16 gMsg_ID_4102[38] = { - NP9, _I, APS, _m, SPC, _s, _u, _r, _e, SPC, _h, _e, APS, _s, SPC, NWL, + PRI1, _I, APS, _m, SPC, _s, _u, _r, _e, SPC, _h, _e, APS, _s, SPC, NWL, _l, _e, _a, _r, _n, _e, _d, SPC, _h, _i, _s, SPC, _l, _e, _s, _s, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_4103[42] = { - NP9, _W, _h, _e, _n, SPC, _w, _e, SPC, _g, _e, _t, SPC, _b, _a, _c, _k, CMA, NWL, + PRI1, _W, _h, _e, _n, SPC, _w, _e, SPC, _g, _e, _t, SPC, _b, _a, _c, _k, CMA, NWL, _w, _e, APS, _l, _l, SPC, _h, _e, _a, _d, SPC, _t, _o, SPC, _V, _e, _n, _o, _m, PRD, NWL, END, }; u16 gMsg_ID_4110[38] = { - NP9, _I, SPC, _m, _a, _d, _e, SPC, _i, _t, EXM, SPC, _I, APS, _l, _l, NWL, + PRI1, _I, SPC, _m, _a, _d, _e, SPC, _i, _t, EXM, SPC, _I, APS, _l, _l, NWL, _a, _n, _a, _l, _y, _z, _e, SPC, _r, _i, _g, _h, _t, SPC, _a, _w, _a, _y, PRD, NWL, END, }; u16 gMsg_ID_4111[10] = { - NP9, _F, _o, _x, EXM, EXM, EXM, EXM, NWL, + PRI1, _F, _o, _x, EXM, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_4112[30] = { - NP9, _I, SPC, _k, _n, _e, _w, SPC, _y, _o, _u, APS, _d, NWL, + PRI1, _I, SPC, _k, _n, _e, _w, SPC, _y, _o, _u, APS, _d, NWL, _c, _o, _m, _e, SPC, _h, _e, _l, _p, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_4113[26] = { - NP9, _D, _e, _p, _l, _o, _y, SPC, _t, _h, _e, NWL, + PRI1, _D, _e, _p, _l, _o, _y, SPC, _t, _h, _e, NWL, _L, _a, _n, _d, _m, _a, _s, _t, _e, _r, EXM, NWL, END, }; u16 gMsg_ID_5000[38] = { - NP9, _L, _e, _t, APS, _s, SPC, _t, _a, _k, _e, SPC, _o, _u, _t, SPC, _t, _h, _a, _t, SPC, NWL, + PRI1, _L, _e, _t, APS, _s, SPC, _t, _a, _k, _e, SPC, _o, _u, _t, SPC, _t, _h, _a, _t, SPC, NWL, _w, _e, _a, _p, _o, _n, CMA, SPC, _b, _o, _y, _s, PRD, NWL, END, }; u16 gMsg_ID_5010[28] = { - NP9, _L, _e, _t, APS, _s, SPC, _h, _a, _v, _e, SPC, _a, SPC, NWL, + PRI1, _L, _e, _t, APS, _s, SPC, _h, _a, _v, _e, SPC, _a, SPC, NWL, _l, _i, _t, _t, _l, _e, SPC, _f, _u, _n, EXM, NWL, END, }; u16 gMsg_ID_5060[44] = { - NP9, _E, _n, _e, _m, _y, SPC, _g, _r, _o, _u, _p, NWL, + PRI1, _E, _n, _e, _m, _y, SPC, _g, _r, _o, _u, _p, NWL, _b, _e, _h, _i, _n, _d, SPC, _u, _s, PRD, SPC, _M, _a, _n, NWL, _t, _h, _e, _y, APS, _r, _e, SPC, _f, _a, _s, _t, EXM, NWL, END, }; u16 gMsg_ID_5080[26] = { - NP9, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, NWL, + PRI1, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, NWL, _n, _o, _t, SPC, _r, _i, _g, _h, _t, PRD, NWL, END, }; u16 gMsg_ID_5100[36] = { - NP9, _W, _e, APS, _r, _e, SPC, _g, _e, _t, _t, _i, _n, APS, NWL, + PRI1, _W, _e, APS, _r, _e, SPC, _g, _e, _t, _t, _i, _n, APS, NWL, _c, _l, _o, _s, _e, SPC, _t, _o, SPC, _t, _h, _e, SPC, _b, _a, _s, _e, PRD, NWL, END, }; u16 gMsg_ID_5110[40] = { - NP9, _S, _o, _m, _e, _b, _o, _d, _y, SPC, _b, _e, _a, _t, SPC, _u, _s, NWL, + PRI1, _S, _o, _m, _e, _b, _o, _d, _y, SPC, _b, _e, _a, _t, SPC, _u, _s, NWL, _h, _e, _r, _e, PRD, SPC, _I, _t, APS, _s, SPC, _a, _l, _l, SPC, _g, _o, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_5130[28] = { - NP9, _W, _h, _a, _t, SPC, _t, _h, _e, SPC, _h, _e, _c, _k, SPC, NWL, + PRI1, _W, _h, _a, _t, SPC, _t, _h, _e, SPC, _h, _e, _c, _k, SPC, NWL, _i, _s, SPC, _t, _h, _a, _t, QST, EXM, NWL, END, }; u16 gMsg_ID_5220[44] = { - NP9, _I, SPC, _g, _o, _t, SPC, _t, _a, _g, _g, _e, _d, PRD, SPC, _M, _y, NWL, + PRI1, _I, SPC, _g, _o, _t, SPC, _t, _a, _g, _g, _e, _d, PRD, SPC, _M, _y, NWL, _e, _a, _r, _s, SPC, _a, _r, _e, SPC, _s, _t, _i, _l, _l, SPC, NWL, _r, _i, _n, _g, _i, _n, _g, PRD, NWL, END, }; u16 gMsg_ID_5230[16] = { - NP9, _T, _h, _a, _n, _k, _s, CMA, SPC, _F, _o, _x, PRD, NWL, + PRI1, _T, _h, _a, _n, _k, _s, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_5300[44] = { - NP9, _I, SPC, _c, _a, _n, APS, _t, SPC, _w, _a, _i, _t, SPC, _t, _o, SPC, _s, _e, _e, SPC, NWL, + PRI1, _I, SPC, _c, _a, _n, APS, _t, SPC, _w, _a, _i, _t, SPC, _t, _o, SPC, _s, _e, _e, SPC, NWL, _t, _h, _i, _s, SPC, _s, _e, _c, _r, _e, _t, SPC, _w, _e, _a, _p, _o, _n, EXM, NWL, END, }; u16 gMsg_ID_5310[40] = { - NP9, _I, SPC, _f, _o, _u, _n, _d, SPC, _t, _h, _e, SPC, _g, _a, _t, _e, PRD, NWL, + PRI1, _I, SPC, _f, _o, _u, _n, _d, SPC, _t, _h, _e, SPC, _g, _a, _t, _e, PRD, NWL, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _a, SPC, _w, _a, _r, _p, PRD, NWL, END, }; u16 gMsg_ID_5311[40] = { - NPA, _I, APS, _m, SPC, _g, _o, _n, _n, _a, SPC, _o, _p, _e, _n, SPC, _t, _h, _e, NWL, + PRI2, _I, APS, _m, SPC, _g, _o, _n, _n, _a, SPC, _o, _p, _e, _n, SPC, _t, _h, _e, NWL, _g, _a, _t, _e, PRD, SPC, _B, _a, _c, _k, SPC, _m, _e, SPC, _u, _p, EXM, NWL, END, }; u16 gMsg_ID_5312[20] = { - NPA, _B, _i, _l, _l, EXM, SPC, _Y, _o, _u, APS, _r, _e, SPC, _O, _K, EXM, NWL, + PRI2, _B, _i, _l, _l, EXM, SPC, _Y, _o, _u, APS, _r, _e, SPC, _O, _K, EXM, NWL, END, }; u16 gMsg_ID_5313[32] = { - NPA, _O, _f, SPC, _c, _o, _u, _r, _s, _e, EXM, SPC, NWL, + PRI2, _O, _f, SPC, _c, _o, _u, _r, _s, _e, EXM, SPC, NWL, _I, APS, _m, SPC, _h, _e, _r, _e, SPC, _t, _o, SPC, _h, _e, _l, _p, PRD, NWL, END, }; u16 gMsg_ID_5314[40] = { - NPA, _T, _a, _k, _e, SPC, _i, _t, SPC, _e, _a, _s, _y, CMA, SPC, _F, _o, _x, PRD, NWL, + PRI2, _T, _a, _k, _e, SPC, _i, _t, SPC, _e, _a, _s, _y, CMA, SPC, _F, _o, _x, PRD, NWL, _D, _o, _n, APS, _t, SPC, _l, _e, _t, SPC, _u, _s, SPC, _d, _o, _w, _n, PRD, NWL, END, }; u16 gMsg_ID_5350[30] = { - NP9, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, SPC, _n, _o, _t, NWL, + PRI1, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, SPC, _n, _o, _t, NWL, _r, _i, _g, _h, _t, SPC, _h, _e, _r, _e, PRD, NWL, END, }; u16 gMsg_ID_5360[26] = { - NP9, _W, _h, _o, SPC, _t, _o, _o, _k, SPC, _t, _h, _i, _s, SPC, _b, _a, _s, _e, NWL, + PRI1, _W, _h, _o, SPC, _t, _o, _o, _k, SPC, _t, _h, _i, _s, SPC, _b, _a, _s, _e, NWL, _o, _u, _t, QST, NWL, END, }; u16 gMsg_ID_5380[28] = { - NP9, _H, _u, _r, _r, _y, SPC, _u, _p, SPC, _o, _r, SPC, _y, _o, _u, APS, _r, _e, NWL, + PRI1, _H, _u, _r, _r, _y, SPC, _u, _p, SPC, _o, _r, SPC, _y, _o, _u, APS, _r, _e, NWL, _t, _o, _a, _s, _t, EXM, NWL, END, }; u16 gMsg_ID_5400[34] = { - NP9, _I, APS, _l, _l, SPC, _a, _t, _t, _a, _c, _k, SPC, _f, _r, _o, _m, SPC, NWL, + PRI1, _I, APS, _l, _l, SPC, _a, _t, _t, _a, _c, _k, SPC, _f, _r, _o, _m, SPC, NWL, _t, _h, _e, SPC, _o, _u, _t, _s, _i, _d, _e, PRD, NWL, END, }; u16 gMsg_ID_5410[34] = { - NP9, _I, _n, _t, _e, _r, _c, _e, _p, _t, _o, _r, SPC, _s, _y, _s, _t, _e, _m, NWL, + PRI1, _I, _n, _t, _e, _r, _c, _e, _p, _t, _o, _r, SPC, _s, _y, _s, _t, _e, _m, NWL, _d, _e, _a, _d, SPC, _a, _h, _e, _a, _d, PRD, NWL, END, }; u16 gMsg_ID_5420[22] = { - NP9, _T, _h, _e, _y, APS, _r, _e, SPC, _e, _v, _e, _r, _y, _w, _h, _e, _r, _e, EXM, NWL, + PRI1, _T, _h, _e, _y, APS, _r, _e, SPC, _e, _v, _e, _r, _y, _w, _h, _e, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_5430[32] = { - NP9, _W, _h, _e, _r, _e, SPC, _i, _s, SPC, _t, _h, _e, SPC, NWL, + PRI1, _W, _h, _e, _r, _e, SPC, _i, _s, SPC, _t, _h, _e, SPC, NWL, _s, _e, _c, _r, _e, _t, SPC, _w, _e, _a, _p, _o, _n, QST, NWL, END, }; u16 gMsg_ID_5460[38] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _a, _h, _e, _a, _d, PRD, SPC, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _a, _h, _e, _a, _d, PRD, SPC, NWL, _B, _a, _c, _k, SPC, _m, _e, SPC, _u, _p, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_5470[40] = { - NP9, _W, _h, _a, _t, SPC, _t, _h, _e, SPC, _h, _e, _c, _k, QST, SPC, _F, _o, _x, CMA, NWL, + PRI1, _W, _h, _a, _t, SPC, _t, _h, _e, SPC, _h, _e, _c, _k, QST, SPC, _F, _o, _x, CMA, NWL, _l, _o, _o, _k, SPC, _b, _e, _h, _i, _n, _d, SPC, _y, _o, _u, EXM, NWL, END, }; u16 gMsg_ID_5473[34] = { - NP9, _S, _o, SPC, _t, _h, _i, _s, SPC, _i, _s, SPC, _t, _h, _e, SPC, NWL, + PRI1, _S, _o, SPC, _t, _h, _i, _s, SPC, _i, _s, SPC, _t, _h, _e, SPC, NWL, _s, _e, _c, _r, _e, _t, SPC, _w, _e, _a, _p, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_5474[28] = { - NP9, _D, _e, _s, _t, _r, _o, _y, SPC, _w, _h, _a, _t, QST, NWL, + PRI1, _D, _e, _s, _t, _r, _o, _y, SPC, _w, _h, _a, _t, QST, NWL, _H, _e, APS, _s, SPC, _c, _r, _a, _z, _y, PRD, NWL, END, }; u16 gMsg_ID_5475[22] = { - NP9, _L, _e, _t, SPC, _m, _e, SPC, _h, _a, _n, _d, _l, _e, SPC, _t, _h, _i, _s, PRD, NWL, + PRI1, _L, _e, _t, SPC, _m, _e, SPC, _h, _a, _n, _d, _l, _e, SPC, _t, _h, _i, _s, PRD, NWL, END, }; u16 gMsg_ID_5492[20] = { - NP9, _D, _e, _s, _t, _r, _o, _y, PRD, NWL, + PRI1, _D, _e, _s, _t, _r, _o, _y, PRD, NWL, _D, _e, _s, _t, _r, _o, _y, PRD, NWL, END, }; u16 gMsg_ID_5493[32] = { - NP9, _I, SPC, _w, _i, _l, _l, SPC, _t, _e, _r, _m, _i, _n, _a, _t, _e, NWL, + PRI1, _I, SPC, _w, _i, _l, _l, SPC, _t, _e, _r, _m, _i, _n, _a, _t, _e, NWL, _a, _l, _l, SPC, _e, _n, _e, _m, _i, _e, _s, PRD, NWL, END, }; u16 gMsg_ID_5494[20] = { - NP9, _Y, _o, _u, SPC, _a, _r, _e, SPC, _a, _n, SPC, _e, _n, _e, _m, _y, PRD, NWL, + PRI1, _Y, _o, _u, SPC, _a, _r, _e, SPC, _a, _n, SPC, _e, _n, _e, _m, _y, PRD, NWL, END, }; u16 gMsg_ID_5495[26] = { - NP9, _W, _h, _e, _r, _e, SPC, _i, _s, SPC, _t, _h, _e, SPC, NWL, + PRI1, _W, _h, _e, _r, _e, SPC, _i, _s, SPC, _t, _h, _e, SPC, NWL, _c, _r, _e, _a, _t, _o, _r, QST, EXM, NWL, END, }; u16 gMsg_ID_5496[20] = { - NP9, _W, _h, _a, _t, APS, _s, SPC, _h, _e, SPC, _s, _a, _y, _i, _n, _g, QST, NWL, + PRI1, _W, _h, _a, _t, APS, _s, SPC, _h, _e, SPC, _s, _a, _y, _i, _n, _g, QST, NWL, END, }; u16 gMsg_ID_5497[22] = { - NP9, _T, _h, _e, SPC, _v, _i, _e, _w, SPC, _i, _s, SPC, _c, _l, _e, _a, _r, PRD, NWL, + PRI1, _T, _h, _e, SPC, _v, _i, _e, _w, SPC, _i, _s, SPC, _c, _l, _e, _a, _r, PRD, NWL, END, }; u16 gMsg_ID_5498[22] = { - NP9, _W, _h, _e, _r, _e, SPC, _i, _s, SPC, _t, _h, _e, SPC, _e, _n, _e, _m, _y, QST, NWL, + PRI1, _W, _h, _e, _r, _e, SPC, _i, _s, SPC, _t, _h, _e, SPC, _e, _n, _e, _m, _y, QST, NWL, END, }; u16 gMsg_ID_5499[22] = { - NP9, _I, SPC, _m, _u, _s, _t, SPC, _b, _e, SPC, _c, _o, _m, _p, _l, _e, _t, _e, PRD, NWL, + PRI1, _I, SPC, _m, _u, _s, _t, SPC, _b, _e, SPC, _c, _o, _m, _p, _l, _e, _t, _e, PRD, NWL, END, }; u16 gMsg_ID_5500[44] = { - NP9, _R, _O, _B, CMA, SPC, _c, _a, _n, SPC, _y, _o, _u, SPC, NWL, + PRI1, _R, _O, _B, CMA, SPC, _c, _a, _n, SPC, _y, _o, _u, SPC, NWL, _c, _o, _n, _f, _i, _r, _m, SPC, _S, _l, _i, _p, _p, _y, APS, _s, NWL, _l, _o, _c, _a, _t, _i, _o, _n, QST, NWL, END, }; u16 gMsg_ID_5501[30] = { - NP9, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _h, _e, APS, _s, NWL, + PRI1, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _h, _e, APS, _s, NWL, _o, _n, SPC, _T, _i, _t, _a, _n, _i, _a, PRD, NWL, END, }; u16 gMsg_ID_5502[34] = { - NP9, _S, _l, _i, _p, _p, _y, SPC, _c, _a, _n, SPC, _b, _e, SPC, _s, _u, _c, _h, NWL, + PRI1, _S, _l, _i, _p, _p, _y, SPC, _c, _a, _n, SPC, _b, _e, SPC, _s, _u, _c, _h, NWL, _a, SPC, _h, _e, _a, _d, _a, _c, _h, _e, PRD, NWL, END, }; u16 gMsg_ID_5503[40] = { - NP9, _D, _i, _s, _t, _r, _e, _s, _s, SPC, _s, _i, _g, _n, _a, _l, NWL, + PRI1, _D, _i, _s, _t, _r, _e, _s, _s, SPC, _s, _i, _g, _n, _a, _l, NWL, _c, _o, _m, _i, _n, _g, SPC, _f, _r, _o, _m, SPC, _T, _i, _t, _a, _n, _i, _a, PRD, NWL, END, }; u16 gMsg_ID_5504[24] = { - NP9, _Y, _E, _A, _H, EXM, SPC, NWL, + PRI1, _Y, _E, _A, _H, EXM, SPC, NWL, _J, _u, _s, _t, SPC, _o, _n, _e, SPC, _m, _o, _r, _e, PRD, NWL, END, }; u16 gMsg_ID_5505[30] = { - NP9, _S, _l, _i, _p, _p, _y, EXM, SPC, _I, _s, SPC, NWL, + PRI1, _S, _l, _i, _p, _p, _y, EXM, SPC, _I, _s, SPC, NWL, _e, _v, _e, _r, _y, _t, _h, _i, _n, _g, SPC, _O, _K, QST, NWL, END, }; u16 gMsg_ID_5506[26] = { - NP9, _Y, _e, _a, _h, SPC, _y, _e, _a, _h, PRD, NWL, + PRI1, _Y, _e, _a, _h, SPC, _y, _e, _a, _h, PRD, NWL, _N, _o, SPC, _p, _r, _o, _b, _l, _e, _m, PRD, NWL, END, }; u16 gMsg_ID_6010[40] = { - NP9, _L, _e, _t, APS, _s, SPC, _s, _n, _e, _a, _k, SPC, _i, _n, SPC, _l, _o, _w, NWL, + PRI1, _L, _e, _t, APS, _s, SPC, _s, _n, _e, _a, _k, SPC, _i, _n, SPC, _l, _o, _w, NWL, _a, _n, _d, SPC, _s, _u, _r, _p, _r, _i, _s, _e, SPC, _t, _h, _e, _m, EXM, NWL, END, }; u16 gMsg_ID_6011[18] = { - NP9, _T, _H, _I, _S, SPC, _i, _s, SPC, _Z, _o, _n, _e, _s, _s, QST, NWL, + PRI1, _T, _H, _I, _S, SPC, _i, _s, SPC, _Z, _o, _n, _e, _s, _s, QST, NWL, END, }; u16 gMsg_ID_6012[16] = { - NP9, _W, _h, _a, _t, SPC, _a, SPC, _d, _u, _m, _p, EXM, NWL, + PRI1, _W, _h, _a, _t, SPC, _a, SPC, _d, _u, _m, _p, EXM, NWL, END, }; u16 gMsg_ID_6013[34] = { - NP9, _I, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, _l, _i, _e, _v, _e, SPC, NWL, + PRI1, _I, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, _l, _i, _e, _v, _e, SPC, NWL, _t, _h, _e, _y, SPC, _d, _i, _d, SPC, _t, _h, _i, _s, EXM, NWL, END, }; u16 gMsg_ID_6014[22] = { - NP9, _I, SPC, _h, _e, _a, _r, SPC, _y, _a, CMA, SPC, _S, _l, _i, _p, _p, _y, PRD, NWL, + PRI1, _I, SPC, _h, _e, _a, _r, SPC, _y, _a, CMA, SPC, _S, _l, _i, _p, _p, _y, PRD, NWL, END, }; u16 gMsg_ID_6020[34] = { - NPA, _W, _a, _t, _c, _h, SPC, _o, _u, _t, SPC, _f, _o, _r, SPC, _t, _h, _e, NWL, + PRI2, _W, _a, _t, _c, _h, SPC, _o, _u, _t, SPC, _f, _o, _r, SPC, _t, _h, _e, NWL, _s, _e, _a, _r, _c, _h, SPC, _l, _i, _g, _h, _t, EXM, NWL, END, }; u16 gMsg_ID_6021[28] = { - NPA, _L, _e, _t, APS, _s, SPC, _t, _a, _k, _e, SPC, APS, _e, _m, SPC, NWL, + PRI2, _L, _e, _t, APS, _s, SPC, _t, _a, _k, _e, SPC, APS, _e, _m, SPC, NWL, _a, _l, _l, SPC, _o, _u, _t, EXM, NWL, END, }; u16 gMsg_ID_6024[32] = { - NPA, _U, _h, SPC, _o, _h, PRD, SPC, _H, _a, _v, _e, SPC, _w, _e, NWL, + PRI2, _U, _h, SPC, _o, _h, PRD, SPC, _H, _a, _v, _e, SPC, _w, _e, NWL, _b, _e, _e, _n, SPC, _s, _p, _o, _t, _t, _e, _d, QST, NWL, END, }; u16 gMsg_ID_6025[36] = { - NPA, _W, _e, APS, _r, _e, SPC, _c, _l, _o, _s, _i, _n, _g, SPC, _i, _n, NWL, + PRI2, _W, _e, APS, _r, _e, SPC, _c, _l, _o, _s, _i, _n, _g, SPC, _i, _n, NWL, _o, _n, SPC, _t, _h, _e, _m, CMA, SPC, _F, _a, _l, _c, _o, EXM, NWL, END, }; u16 gMsg_ID_6026[34] = { - NPA, _K, _a, _t, _t, QST, EXM, SPC, _W, _h, _a, _t, SPC, _a, _r, _e, NWL, + PRI2, _K, _a, _t, _t, QST, EXM, SPC, _W, _h, _a, _t, SPC, _a, _r, _e, NWL, _y, _o, _u, SPC, _d, _o, _i, _n, _g, SPC, _h, _e, _r, _e, QST, NWL, END, }; u16 gMsg_ID_6027[36] = { - NPA, _I, _s, SPC, _t, _h, _a, _t, SPC, _a, _n, _y, SPC, _w, _a, _y, NWL, + PRI2, _I, _s, SPC, _t, _h, _a, _t, SPC, _a, _n, _y, SPC, _w, _a, _y, NWL, _t, _o, SPC, _g, _r, _e, _e, _t, SPC, _a, SPC, _g, _i, _r, _l, QST, NWL, END, }; u16 gMsg_ID_6028[14] = { - NP9, _H, _e, _r, _e, SPC, _I, SPC, _g, _o, EXM, NWL, + PRI1, _H, _e, _r, _e, SPC, _I, SPC, _g, _o, EXM, NWL, END, }; u16 gMsg_ID_6029[48] = { - NP9, _T, _a, _k, _e, SPC, _t, _h, _e, SPC, _r, _i, _g, _h, _t, SPC, NWL, + PRI1, _T, _a, _k, _e, SPC, _t, _h, _e, SPC, _r, _i, _g, _h, _t, SPC, NWL, _l, _i, _g, _h, _t, CMA, SPC, _b, _o, _y, PRD, SPC, _I, SPC, _h, _a, _v, _e, NWL, _t, _h, _e, SPC, _l, _e, _f, _t, PRD, NWL, END, }; u16 gMsg_ID_6036[16] = { - NP9, _E, _n, _e, _m, _y, SPC, _t, _a, _n, _k, _e, _r, EXM, NWL, + PRI1, _E, _n, _e, _m, _y, SPC, _t, _a, _n, _k, _e, _r, EXM, NWL, END, }; u16 gMsg_ID_6038[28] = { - NP9, _A, _i, _m, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, NWL, + PRI1, _A, _i, _m, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, NWL, _r, _u, _d, _d, _e, _r, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_6041[32] = { - NP9, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _s, _o, _m, _e, _b, _o, _d, _y, NWL, + PRI1, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _s, _o, _m, _e, _b, _o, _d, _y, NWL, _o, _n, SPC, _m, _y, SPC, _t, _a, _i, _l, EXM, NWL, END, }; u16 gMsg_ID_6042[42] = { - NP9, _M, _e, _s, _s, SPC, _w, _i, _t, _h, SPC, _m, _e, SPC, _a, _n, _d, NWL, + PRI1, _M, _e, _s, _s, SPC, _w, _i, _t, _h, SPC, _m, _e, SPC, _a, _n, _d, NWL, _y, _o, _u, APS, _l, _l, SPC, _g, _e, _t, SPC, NWL, _s, _c, _r, _a, _t, _c, _h, _e, _d, EXM, NWL, END, }; u16 gMsg_ID_6045[42] = { - NP9, _E, _n, _e, _m, _y, SPC, _f, _i, _g, _h, _t, _e, _r, _s, NWL, + PRI1, _E, _n, _e, _m, _y, SPC, _f, _i, _g, _h, _t, _e, _r, _s, NWL, _s, _p, _o, _t, _t, _e, _d, EXM, SPC, _T, _a, _k, _e, SPC, APS, _e, _m, SPC, NWL, _d, _o, _w, _n, EXM, NWL, END, }; u16 gMsg_ID_6050[26] = { - NP9, _T, _h, _e, _s, _e, SPC, _g, _u, _y, _s, SPC, NWL, + PRI1, _T, _h, _e, _s, _e, SPC, _g, _u, _y, _s, SPC, NWL, _d, _o, _n, APS, _t, SPC, _q, _u, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_6051[10] = { - NP9, _S, _h, _o, _o, _t, EXM, NWL, + PRI1, _S, _h, _o, _o, _t, EXM, NWL, END, }; u16 gMsg_ID_6055[20] = { - NP9, _W, _h, _o, _a, EXM, SPC, _W, _a, _t, _c, _h, SPC, _o, _u, _t, EXM, NWL, + PRI1, _W, _h, _o, _a, EXM, SPC, _W, _a, _t, _c, _h, SPC, _o, _u, _t, EXM, NWL, END, }; u16 gMsg_ID_6066[34] = { - NP9, _B, _e, SPC, _c, _a, _r, _e, _f, _u, _l, EXM, NWL, + PRI1, _B, _e, SPC, _c, _a, _r, _e, _f, _u, _l, EXM, NWL, _I, _t, SPC, _m, _i, _g, _h, _t, SPC, _b, _e, SPC, _a, SPC, _t, _r, _a, _p, EXM, NWL, END, }; u16 gMsg_ID_6067[36] = { - NP9, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, SPC, _c, _o, _m, _i, _n, _g, NWL, + PRI1, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, SPC, _c, _o, _m, _i, _n, _g, NWL, _f, _r, _o, _m, SPC, _t, _h, _e, SPC, _s, _e, _a, EXM, NWL, END, }; u16 gMsg_ID_6068[20] = { - NP9, _A, _r, SPC, _h, _a, SPC, _h, _a, SPC, _h, _a, SPC, _h, _a, _r, EXM, NWL, + PRI1, _A, _r, SPC, _h, _a, SPC, _h, _a, SPC, _h, _a, SPC, _h, _a, _r, EXM, NWL, END, }; u16 gMsg_ID_6069[32] = { - NP9, _D, _i, _s, _r, _e, _s, _p, _e, _c, _t, _f, _u, _l, NWL, + PRI1, _D, _i, _s, _r, _e, _s, _p, _e, _c, _t, _f, _u, _l, NWL, _l, _i, _t, _t, _l, _e, SPC, _w, _h, _e, _l, _p, _s, EXM, NWL, END, }; u16 gMsg_ID_6071[30] = { - NP9, _I, APS, _l, _l, SPC, _t, _e, _a, _c, _h, SPC, _y, _e, SPC, _s, _o, _m, _e, NWL, + PRI1, _I, APS, _l, _l, SPC, _t, _e, _a, _c, _h, SPC, _y, _e, SPC, _s, _o, _m, _e, NWL, _r, _e, _s, _p, _e, _c, _t, EXM, NWL, END, }; u16 gMsg_ID_6072[30] = { - NP9, _A, _l, _l, SPC, _s, _e, _c, _t, _i, _o, _n, _s, SPC, _r, _e, _a, _d, _y, PRD, NWL, + PRI1, _A, _l, _l, SPC, _s, _e, _c, _t, _i, _o, _n, _s, SPC, _r, _e, _a, _d, _y, PRD, NWL, _E, _n, _g, _a, _g, _e, EXM, NWL, END, }; u16 gMsg_ID_6073[22] = { - NP9, _P, _r, _e, _p, _a, _r, _e, SPC, _t, _o, SPC, _s, _u, _r, _f, _a, _c, _e, EXM, NWL, + PRI1, _P, _r, _e, _p, _a, _r, _e, SPC, _t, _o, SPC, _s, _u, _r, _f, _a, _c, _e, EXM, NWL, END, }; u16 gMsg_ID_6074[34] = { - NP9, _A, _d, _j, _u, _s, _t, SPC, _1, _0, SPC, _d, _e, _g, _r, _e, _e, _s, NWL, + PRI1, _A, _d, _j, _u, _s, _t, SPC, _1, _0, SPC, _d, _e, _g, _r, _e, _e, _s, NWL, _r, _i, _g, _h, _t, EXM, SPC, _F, _I, _R, _E, EXM, NWL, END, }; u16 gMsg_ID_6075[36] = { - NP9, _P, _r, _e, _s, _s, _u, _r, _e, CMA, SPC, _a, _n, _g, _l, _e, SPC, _O, _K, PRD, NWL, + PRI1, _P, _r, _e, _s, _s, _u, _r, _e, CMA, SPC, _a, _n, _g, _l, _e, SPC, _O, _K, PRD, NWL, _F, _i, _r, _e, SPC, _t, _o, _r, _p, _e, _d, _o, EXM, NWL, END, }; u16 gMsg_ID_6076[32] = { - NP9, _A, _a, _a, _r, _g, _h, EXM, SPC, NWL, + PRI1, _A, _a, _a, _r, _g, _h, EXM, SPC, NWL, _D, _r, _o, _p, SPC, _t, _h, _e, SPC, _c, _r, _a, _n, _e, SPC, _n, _o, _w, EXM, NWL, END, }; u16 gMsg_ID_6077[40] = { - NP9, _I, SPC, _c, _a, _n, APS, _t, SPC, _s, _e, _e, SPC, NWL, + PRI1, _I, SPC, _c, _a, _n, APS, _t, SPC, _s, _e, _e, SPC, NWL, _a, _n, _y, _t, _h, _i, _n, _g, PRD, PRD, PRD, NWL, _F, _i, _r, _e, SPC, _a, _n, _y, _w, _a, _y, EXM, NWL, END, }; u16 gMsg_ID_6078[14] = { - NP9, _F, _i, _r, _e, EXM, SPC, _F, _i, _r, _e, EXM, NWL, + PRI1, _F, _i, _r, _e, EXM, SPC, _F, _i, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_6079[16] = { - NPA, _A, _r, _r, _g, _g, _g, _h, _h, _h, EXM, EXM, EXM, NWL, + PRI2, _A, _r, _r, _g, _g, _g, _h, _h, _h, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_6080[40] = { - NP9, _H, _i, _s, SPC, _a, _r, _m, _o, _r, SPC, _i, _s, SPC, _t, _o, _u, _g, _h, EXM, NWL, + PRI1, _H, _i, _s, SPC, _a, _r, _m, _o, _r, SPC, _i, _s, SPC, _t, _o, _u, _g, _h, EXM, NWL, _U, _s, _e, SPC, _b, _o, _m, _b, _s, SPC, _w, _i, _s, _e, _l, _y, EXM, NWL, END, }; u16 gMsg_ID_6081[34] = { - NP9, _D, _e, _s, _t, _r, _o, _y, SPC, _t, _h, _e, SPC, _t, _w, _o, NWL, + PRI1, _D, _e, _s, _t, _r, _o, _y, SPC, _t, _h, _e, SPC, _t, _w, _o, NWL, _e, _x, _h, _a, _u, _s, _t, SPC, _p, _i, _p, _e, _s, EXM, NWL, END, }; u16 gMsg_ID_6082[28] = { - NP9, _Q, _u, _i, _c, _k, CMA, SPC, _d, _e, _s, _t, _r, _o, _y, SPC, _t, _h, _e, NWL, + PRI1, _Q, _u, _i, _c, _k, CMA, SPC, _d, _e, _s, _t, _r, _o, _y, SPC, _t, _h, _e, NWL, _c, _r, _a, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_6090[14] = { - NP9, _O, _h, SPC, _S, _H, _O, _O, _T, EXM, EXM, NWL, + PRI1, _O, _h, SPC, _S, _H, _O, _O, _T, EXM, EXM, NWL, END, }; u16 gMsg_ID_6100[40] = { - NP9, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _w, _e, APS, _r, _e, NWL, + PRI1, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _w, _e, APS, _r, _e, NWL, _h, _e, _a, _d, _i, _n, APS, SPC, _f, _o, _r, SPC, _M, _a, _c, _b, _e, _t, _h, PRD, NWL, END, }; u16 gMsg_ID_6101[26] = { - NP9, _K, _a, _t, _t, CMA, SPC, _w, _h, _e, _r, _e, APS, _d, SPC, _y, _o, _u, SPC, NWL, + PRI1, _K, _a, _t, _t, CMA, SPC, _w, _h, _e, _r, _e, APS, _d, SPC, _y, _o, _u, SPC, NWL, _g, _o, QST, NWL, END, }; u16 gMsg_ID_7005[28] = { - NP9, _C, _a, _i, _m, _a, _n, SPC, _h, _e, _r, _e, PRD, NWL, + PRI1, _C, _a, _i, _m, _a, _n, SPC, _h, _e, _r, _e, PRD, NWL, _N, _o, SPC, _p, _r, _o, _b, _l, _e, _m, _s, PRD, NWL, END, }; u16 gMsg_ID_7006[36] = { - NP9, _D, _o, SPC, _y, _o, _u, SPC, _c, _o, _p, _y, QST, NWL, + PRI1, _D, _o, SPC, _y, _o, _u, SPC, _c, _o, _p, _y, QST, NWL, _E, _m, _e, _r, _g, _e, _n, _c, _y, NWL, _m, _a, _n, _e, _u, _v, _e, _r, _s, EXM, NWL, END, }; u16 gMsg_ID_7011[30] = { - NP9, _T, _o, _o, SPC, _l, _a, _t, _e, EXM, SPC, NWL, + PRI1, _T, _o, _o, SPC, _l, _a, _t, _e, EXM, SPC, NWL, _G, _a, _m, _e, SPC, _o, _v, _e, _r, CMA, SPC, _p, _a, _l, EXM, NWL, END, }; u16 gMsg_ID_7012[36] = { - NP9, _E, _n, _t, _e, _r, _i, _n, _g, SPC, _V, _e, _n, _o, _m, SPC, _a, _i, _r, NWL, + PRI1, _E, _n, _t, _e, _r, _i, _n, _g, SPC, _V, _e, _n, _o, _m, SPC, _a, _i, _r, NWL, _d, _e, _f, _e, _n, _s, _e, SPC, _z, _o, _n, _e, PRD, NWL, END, }; u16 gMsg_ID_7013[24] = { - NP9, _E, _v, _e, _r, _y, _b, _o, _d, _y, SPC, _s, _t, _a, _y, NWL, + PRI1, _E, _v, _e, _r, _y, _b, _o, _d, _y, SPC, _s, _t, _a, _y, NWL, _a, _l, _e, _r, _t, EXM, NWL, END, }; u16 gMsg_ID_7014[22] = { - NP9, _S, _p, _a, _c, _e, SPC, _m, _i, _n, _e, _s, SPC, _a, _h, _e, _a, _d, EXM, NWL, + PRI1, _S, _p, _a, _c, _e, SPC, _m, _i, _n, _e, _s, SPC, _a, _h, _e, _a, _d, EXM, NWL, END, }; u16 gMsg_ID_7020[36] = { - NP9, _H, _o, _l, _d, SPC, _s, _t, _i, _l, _l, SPC, _a, _n, _d, SPC, _l, _e, _t, NWL, + PRI1, _H, _o, _l, _d, SPC, _s, _t, _i, _l, _l, SPC, _a, _n, _d, SPC, _l, _e, _t, NWL, _m, _e, SPC, _s, _h, _o, _o, _t, SPC, _y, _o, _u, EXM, NWL, END, }; u16 gMsg_ID_7043[40] = { - NP9, _W, _e, APS, _r, _e, SPC, _g, _o, _n, _n, _a, SPC, _b, _r, _e, _a, _k, NWL, + PRI1, _W, _e, APS, _r, _e, SPC, _g, _o, _n, _n, _a, SPC, _b, _r, _e, _a, _k, NWL, _t, _h, _r, _o, _u, _g, _h, SPC, _t, _h, _a, _t, SPC, _f, _l, _e, _e, _t, PRD, NWL, END, }; u16 gMsg_ID_7050[26] = { - NP9, _I, _n, _c, _o, _m, _i, _n, _g, SPC, _e, _n, _e, _m, _y, NWL, + PRI1, _I, _n, _c, _o, _m, _i, _n, _g, SPC, _e, _n, _e, _m, _y, NWL, _m, _i, _s, _s, _i, _l, _e, EXM, NWL, END, }; u16 gMsg_ID_7051[38] = { - NP9, _S, _h, _o, _o, _t, SPC, APS, _e, _m, SPC, _d, _o, _w, _n, EXM, NWL, + PRI1, _S, _h, _o, _o, _t, SPC, APS, _e, _m, SPC, _d, _o, _w, _n, EXM, NWL, _W, _e, APS, _r, _e, SPC, _b, _e, _i, _n, _g, SPC, _m, _a, _r, _k, _e, _d, EXM, NWL, END, }; u16 gMsg_ID_7052[18] = { - NP9, _D, _i, _d, SPC, _w, _e, SPC, _g, _e, _t, SPC, APS, _e, _m, QST, NWL, + PRI1, _D, _i, _d, SPC, _w, _e, SPC, _g, _e, _t, SPC, APS, _e, _m, QST, NWL, END, }; u16 gMsg_ID_7053[16] = { - NP9, _N, _o, _t, SPC, _y, _e, _t, CMA, SPC, _s, _i, _r, EXM, NWL, + PRI1, _N, _o, _t, SPC, _y, _e, _t, CMA, SPC, _s, _i, _r, EXM, NWL, END, }; u16 gMsg_ID_7054[28] = { - NPA, _G, _r, _e, _a, _t, SPC, _F, _o, _x, SPC, _w, _i, _l, _l, NWL, + PRI2, _G, _r, _e, _a, _t, SPC, _F, _o, _x, SPC, _w, _i, _l, _l, NWL, _c, _o, _v, _e, _r, SPC, _y, _o, _u, PRD, NWL, END, }; u16 gMsg_ID_7061[38] = { - NP9, _E, _n, _e, _m, _y, SPC, _a, _h, _e, _a, _d, PRD, SPC, _T, _h, _i, _s, NWL, + PRI1, _E, _n, _e, _m, _y, SPC, _a, _h, _e, _a, _d, PRD, SPC, _T, _h, _i, _s, NWL, _o, _n, _e, APS, _s, SPC, _d, _i, _f, _f, _e, _r, _e, _n, _t, PRD, NWL, END, }; u16 gMsg_ID_7064[36] = { - NP9, _C, _r, _u, _d, EXM, SPC, _W, _e, SPC, _w, _e, _r, _e, SPC, _S, _O, NWL, + PRI1, _C, _r, _u, _d, EXM, SPC, _W, _e, SPC, _w, _e, _r, _e, SPC, _S, _O, NWL, _c, _l, _o, _s, _e, SPC, _t, _o, SPC, _V, _e, _n, _o, _m, PRD, NWL, END, }; u16 gMsg_ID_7065[40] = { - NP9, _B, _o, _g, _e, _y, SPC, _b, _e, _h, _i, _n, _d, SPC, _m, _e, PRD, SPC, NWL, + PRI1, _B, _o, _g, _e, _y, SPC, _b, _e, _h, _i, _n, _d, SPC, _m, _e, PRD, SPC, NWL, _A, _m, SPC, _I, SPC, _g, _e, _t, _t, _i, _n, APS, SPC, _s, _l, _o, _w, QST, NWL, END, }; u16 gMsg_ID_7066[40] = { - NP9, _T, _h, _e, _y, APS, _r, _e, SPC, _o, _n, SPC, _m, _e, EXM, SPC, _I, APS, _m, NWL, + PRI1, _T, _h, _e, _y, APS, _r, _e, SPC, _o, _n, SPC, _m, _e, EXM, SPC, _I, APS, _m, NWL, _g, _e, _t, _t, _i, _n, APS, SPC, _c, _a, _r, _e, _l, _e, _s, _s, EXM, NWL, END, }; u16 gMsg_ID_7070[24] = { - NP9, _V, _e, _n, _o, _m, APS, _s, SPC, _r, _i, _g, _h, _t, SPC, _t, _h, _e, _r, _e, EXM, NWL, + PRI1, _V, _e, _n, _o, _m, APS, _s, SPC, _r, _i, _g, _h, _t, SPC, _t, _h, _e, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_7083[42] = { - NP9, _S, _h, _o, _o, _t, SPC, _t, _h, _e, SPC, _t, _e, _n, _t, _a, _c, _l, _e, _s, SPC, NWL, + PRI1, _S, _h, _o, _o, _t, SPC, _t, _h, _e, SPC, _t, _e, _n, _t, _a, _c, _l, _e, _s, SPC, NWL, _t, _o, SPC, _o, _p, _e, _n, SPC, _t, _h, _e, SPC, _c, _o, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_7084[34] = { - NP9, _D, _e, _s, _t, _r, _o, _y, SPC, _a, _l, _l, SPC, _t, _h, _r, _e, _e, NWL, + PRI1, _D, _e, _s, _t, _r, _o, _y, SPC, _a, _l, _l, SPC, _t, _h, _r, _e, _e, NWL, _e, _n, _e, _r, _g, _y, SPC, _b, _a, _l, _l, _s, PRD, NWL, END, }; u16 gMsg_ID_7085[24] = { - NP9, _Y, _E, _A, _H, EXM, SPC, NWL, + PRI1, _Y, _E, _A, _H, EXM, SPC, NWL, _I, _t, APS, _s, SPC, _w, _o, _r, _k, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_7086[14] = { - NP9, _Y, _e, _a, _h, EXM, SPC, _Y, _e, _a, _h, EXM, NWL, + PRI1, _Y, _e, _a, _h, EXM, SPC, _Y, _e, _a, _h, EXM, NWL, END, }; u16 gMsg_ID_7087[38] = { - NP9, _T, _h, _e, SPC, _s, _h, _i, _e, _l, _d, SPC, _i, _s, SPC, _g, _o, _n, _e, EXM, NWL, + PRI1, _T, _h, _e, SPC, _s, _h, _i, _e, _l, _d, SPC, _i, _s, SPC, _g, _o, _n, _e, EXM, NWL, _S, _h, _o, _o, _t, SPC, _t, _h, _e, SPC, _c, _o, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_7093[44] = { - NP9, _H, _o, _l, _d, SPC, _o, _n, EXM, SPC, _W, _e, APS, _r, _e, NWL, + PRI1, _H, _o, _l, _d, SPC, _o, _n, EXM, SPC, _W, _e, APS, _r, _e, NWL, _e, _n, _t, _e, _r, _i, _n, _g, SPC, _V, _e, _n, _o, _m, NWL, _a, _i, _r, SPC, _s, _p, _a, _c, _e, PRD, NWL, END, }; u16 gMsg_ID_7094[38] = { - NP9, _F, _i, _r, _e, EXM, SPC, _F, _i, _r, _e, EXM, NWL, + PRI1, _F, _i, _r, _e, EXM, SPC, _F, _i, _r, _e, EXM, NWL, _D, _o, _n, APS, _t, SPC, _l, _e, _t, SPC, _t, _h, _e, _m, NWL, _t, _h, _r, _o, _u, _g, _h, EXM, NWL, END, }; u16 gMsg_ID_7095[42] = { - NP9, _T, _h, _e, _y, APS, _v, _e, SPC, _b, _r, _o, _k, _e, _n, NWL, + PRI1, _T, _h, _e, _y, APS, _v, _e, SPC, _b, _r, _o, _k, _e, _n, NWL, _t, _h, _r, _o, _u, _g, _h, SPC, _t, _h, _e, SPC, _f, _i, _r, _s, _t, SPC, NWL, _l, _i, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_7096[36] = { - NP9, _T, _h, _e, _y, APS, _r, _e, SPC, _t, _h, _r, _o, _u, _g, _h, NWL, + PRI1, _T, _h, _e, _y, APS, _r, _e, SPC, _t, _h, _r, _o, _u, _g, _h, NWL, _t, _h, _e, SPC, _s, _e, _c, _o, _n, _d, SPC, _l, _i, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_7097[24] = { - NP9, _T, _h, _e, _s, _e, SPC, _g, _u, _y, _s, SPC, _a, _r, _e, NWL, + PRI1, _T, _h, _e, _s, _e, SPC, _g, _u, _y, _s, SPC, _a, _r, _e, NWL, _c, _r, _a, _z, _y, EXM, NWL, END, }; u16 gMsg_ID_7098[24] = { - NPA, _D, _a, _n, _g, EXM, SPC, _D, _E, _P, _L, _O, _Y, NWL, + PRI2, _D, _a, _n, _g, EXM, SPC, _D, _E, _P, _L, _O, _Y, NWL, _I, _T, SPC, _N, _O, _W, EXM, NWL, END, }; u16 gMsg_ID_7099[36] = { - NP9, _T, _h, _e, SPC, _l, _a, _s, _t, SPC, _l, _i, _n, _e, SPC, _h, _a, _s, NWL, + PRI1, _T, _h, _e, SPC, _l, _a, _s, _t, SPC, _l, _i, _n, _e, SPC, _h, _a, _s, NWL, _b, _e, _e, _n, SPC, _b, _r, _e, _a, _c, _h, _e, _d, EXM, NWL, END, }; u16 gMsg_ID_7100[14] = { - NP9, _A, _l, _l, SPC, _r, _i, _g, _h, _t, EXM, NWL, + PRI1, _A, _l, _l, SPC, _r, _i, _g, _h, _t, EXM, NWL, END, }; u16 gMsg_ID_8010[36] = { - NP9, _D, _o, _n, APS, _t, SPC, _r, _e, _l, _a, _x, PRD, SPC, _W, _e, APS, _r, _e, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _r, _e, _l, _a, _x, PRD, SPC, _W, _e, APS, _r, _e, NWL, _n, _o, _t, SPC, _d, _o, _n, _e, SPC, _y, _e, _t, PRD, NWL, END, }; u16 gMsg_ID_8020[40] = { - NP9, _T, _i, _m, _e, SPC, _t, _o, SPC, _s, _h, _o, _w, SPC, _t, _h, _e, NWL, + PRI1, _T, _i, _m, _e, SPC, _t, _o, SPC, _s, _h, _o, _w, SPC, _t, _h, _e, NWL, _m, _o, _n, _k, _e, _y, _s, SPC, _w, _h, _o, APS, _s, SPC, _b, _o, _s, _s, EXM, NWL, END, }; u16 gMsg_ID_8030[42] = { - NP9, _T, _h, _i, _s, SPC, _b, _r, _i, _n, _g, _s, SPC, _b, _a, _c, _k, NWL, + PRI1, _T, _h, _i, _s, SPC, _b, _r, _i, _n, _g, _s, SPC, _b, _a, _c, _k, NWL, _m, _e, _m, _o, _r, _i, _e, _s, SPC, _o, _f, SPC, _y, _o, _u, _r, SPC, NWL, _d, _a, _d, PRD, NWL, END, }; u16 gMsg_ID_8040[28] = { - NP9, _Y, _o, _u, APS, _l, _l, SPC, _b, _e, SPC, _s, _o, _r, _r, _y, CMA, SPC, NWL, + PRI1, _Y, _o, _u, APS, _l, _l, SPC, _b, _e, SPC, _s, _o, _r, _r, _y, CMA, SPC, NWL, _p, _u, _n, _k, _s, EXM, NWL, END, }; u16 gMsg_ID_8045[32] = { - NP9, _T, _h, _e, _s, _e, SPC, _g, _u, _y, _s, SPC, _j, _u, _s, _t, NWL, + PRI1, _T, _h, _e, _s, _e, SPC, _g, _u, _y, _s, SPC, _j, _u, _s, _t, NWL, _k, _e, _e, _p, SPC, _c, _o, _m, _i, _n, _g, PRD, NWL, END, }; u16 gMsg_ID_8050[24] = { - NP9, _D, _o, _n, APS, _t, SPC, _g, _o, SPC, _d, _y, _i, _n, APS, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _g, _o, SPC, _d, _y, _i, _n, APS, NWL, _o, _n, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_8060[22] = { - NP9, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _t, _h, _e, SPC, _l, _e, _f, _t, PRD, NWL, + PRI1, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _t, _h, _e, SPC, _l, _e, _f, _t, PRD, NWL, END, }; u16 gMsg_ID_8070[22] = { - NP9, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _r, _i, _g, _h, _t, PRD, NWL, + PRI1, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _r, _i, _g, _h, _t, PRD, NWL, END, }; u16 gMsg_ID_8080[28] = { - NPA, _I, APS, _m, SPC, _b, _e, _a, _t, _e, _n, SPC, _u, _p, NWL, + PRI2, _I, APS, _m, SPC, _b, _e, _a, _t, _e, _n, SPC, _u, _p, NWL, _p, _r, _e, _t, _t, _y, SPC, _b, _a, _d, PRD, NWL, END, }; u16 gMsg_ID_8100[30] = { - NP9, _J, _e, _e, _z, SPC, _L, _a, _w, _e, _e, _z, EXM, NWL, + PRI1, _J, _e, _e, _z, SPC, _L, _a, _w, _e, _e, _z, EXM, NWL, _W, _h, _a, _t, SPC, _i, _s, SPC, _t, _h, _a, _t, QST, EXM, NWL, END, }; u16 gMsg_ID_8110[36] = { - NP9, _T, _h, _a, _t, SPC, _t, _e, _m, _p, _l, _e, SPC, _g, _i, _v, _e, _s, NWL, + PRI1, _T, _h, _a, _t, SPC, _t, _e, _m, _p, _l, _e, SPC, _g, _i, _v, _e, _s, NWL, _m, _e, SPC, _t, _h, _e, SPC, _c, _r, _e, _e, _p, _s, PRD, NWL, END, }; u16 gMsg_ID_8120[38] = { - NP9, _W, _h, _a, _t, APS, _s, SPC, _g, _o, _i, _n, _g, SPC, _o, _n, QST, NWL, + PRI1, _W, _h, _a, _t, APS, _s, SPC, _g, _o, _i, _n, _g, SPC, _o, _n, QST, NWL, _H, _e, APS, _s, SPC, _r, _u, _n, _n, _i, _n, APS, SPC, _a, _w, _a, _y, EXM, NWL, END, }; u16 gMsg_ID_8130[14] = { - NP9, _S, _t, _a, _y, SPC, _a, _l, _e, _r, _t, EXM, NWL, + PRI1, _S, _t, _a, _y, SPC, _a, _l, _e, _r, _t, EXM, NWL, END, }; u16 gMsg_ID_8140[30] = { - NP9, _D, _o, _n, APS, _t, SPC, _g, _e, _t, SPC, _t, _o, _o, SPC, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _g, _e, _t, SPC, _t, _o, _o, SPC, NWL, _c, _l, _o, _s, _e, CMA, SPC, _F, _o, _x, EXM, EXM, NWL, END, }; u16 gMsg_ID_8205[32] = { - NP9, _I, _t, APS, _s, SPC, _a, _l, _l, SPC, _c, _o, _m, _i, _n, APS, NWL, + PRI1, _I, _t, APS, _s, SPC, _a, _l, _l, SPC, _c, _o, _m, _i, _n, APS, NWL, _d, _o, _w, _n, SPC, _t, _o, SPC, _t, _h, _i, _s, PRD, NWL, END, }; u16 gMsg_ID_8210[44] = { - NP9, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _a, SPC, _B, _A, _D, NWL, + PRI1, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _a, SPC, _B, _A, _D, NWL, _f, _e, _e, _l, _i, _n, _g, SPC, _a, _b, _o, _u, _t, SPC, _t, _h, _i, _s, CMA, SPC, NWL, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_8215[30] = { - NP9, _I, APS, _l, _l, SPC, _g, _o, SPC, _i, _t, SPC, _a, _l, _o, _n, _e, NWL, + PRI1, _I, APS, _l, _l, SPC, _g, _o, SPC, _i, _t, SPC, _a, _l, _o, _n, _e, NWL, _f, _r, _o, _m, SPC, _h, _e, _r, _e, PRD, NWL, END, }; u16 gMsg_ID_8220[8] = { - NP9, _F, _o, _x, EXM, EXM, NWL, + PRI1, _F, _o, _x, EXM, EXM, NWL, END, }; u16 gMsg_ID_8230[8] = { - NP9, _F, _o, _x, EXM, EXM, NWL, + PRI1, _F, _o, _x, EXM, EXM, NWL, END, }; u16 gMsg_ID_8240[8] = { - NP9, _F, _o, _x, EXM, EXM, NWL, + PRI1, _F, _o, _x, EXM, EXM, NWL, END, }; u16 gMsg_ID_8250[40] = { - NP9, _I, APS, _v, _e, SPC, _b, _e, _e, _n, SPC, _w, _a, _i, _t, _i, _n, _g, NWL, + PRI1, _I, APS, _v, _e, SPC, _b, _e, _e, _n, SPC, _w, _a, _i, _t, _i, _n, _g, NWL, _f, _o, _r, SPC, _y, _o, _u, CMA, SPC, _S, _t, _a, _r, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_8255[38] = { - NP9, _Y, _o, _u, SPC, _k, _n, _o, _w, SPC, _t, _h, _a, _t, SPC, _I, NWL, + PRI1, _Y, _o, _u, SPC, _k, _n, _o, _w, SPC, _t, _h, _a, _t, SPC, _I, NWL, _c, _o, _n, _t, _r, _o, _l, SPC, _t, _h, _e, SPC, _g, _a, _l, _a, _x, _y, PRD, NWL, END, }; u16 gMsg_ID_8260[36] = { - NP9, _I, _t, APS, _s, SPC, _f, _o, _o, _l, _i, _s, _h, SPC, _t, _o, SPC, NWL, + PRI1, _I, _t, APS, _s, SPC, _f, _o, _o, _l, _i, _s, _h, SPC, _t, _o, SPC, NWL, _c, _o, _m, _e, SPC, _a, _g, _a, _i, _n, _s, _t, SPC, _m, _e, PRD, NWL, END, }; u16 gMsg_ID_8265[38] = { - NP9, _Y, _o, _u, SPC, _w, _i, _l, _l, SPC, _d, _i, _e, SPC, _j, _u, _s, _t, NWL, + PRI1, _Y, _o, _u, SPC, _w, _i, _l, _l, SPC, _d, _i, _e, SPC, _j, _u, _s, _t, NWL, _l, _i, _k, _e, SPC, _y, _o, _u, _r, SPC, _f, _a, _t, _h, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_8300[22] = { - NP9, _F, _o, _x, EXM, EXM, SPC, NWL, + PRI1, _F, _o, _x, EXM, EXM, SPC, NWL, _A, _r, _e, SPC, _y, _o, _u, SPC, _O, _K, QST, NWL, END, }; u16 gMsg_ID_8310[22] = { - NP9, _Y, _E, _S, EXM, EXM, SPC, NWL, + PRI1, _Y, _E, _S, EXM, EXM, SPC, NWL, _Y, _o, _u, SPC, _d, _i, _d, SPC, _i, _t, EXM, EXM, NWL, END, }; u16 gMsg_ID_8320[40] = { - NP9, _O, _K, CMA, SPC, _I, APS, _l, _l, SPC, _a, _d, _m, _i, _t, SPC, _i, _t, PRD, NWL, + PRI1, _O, _K, CMA, SPC, _I, APS, _l, _l, SPC, _a, _d, _m, _i, _t, SPC, _i, _t, PRD, NWL, _Y, _o, _u, SPC, _d, _i, _d, SPC, _g, _o, _o, _d, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_9000[30] = { - NP9, _S, _p, _l, _i, _t, SPC, _u, _p, SPC, _a, _n, _d, SPC, _t, _a, _k, _e, NWL, + PRI1, _S, _p, _l, _i, _t, SPC, _u, _p, SPC, _a, _n, _d, SPC, _t, _a, _k, _e, NWL, _i, _t, SPC, _t, _o, SPC, _e, _m, EXM, NWL, END, }; u16 gMsg_ID_9010[40] = { - NPA, _W, _h, _y, SPC, _a, _r, _e, SPC, _s, _h, _i, _p, _s, NWL, + PRI2, _W, _h, _y, SPC, _a, _r, _e, SPC, _s, _h, _i, _p, _s, NWL, _c, _o, _m, _i, _n, _g, SPC, _o, _u, _t, SPC, _o, _f, SPC, _t, _h, _e, NWL, _b, _a, _s, _e, QST, NWL, END, }; u16 gMsg_ID_9100[32] = { - NP9, _S, _h, _o, _o, _t, EXM, SPC, _H, _e, APS, _s, SPC, _r, _i, _g, _h, _t, NWL, + PRI1, _S, _h, _o, _o, _t, EXM, SPC, _H, _e, APS, _s, SPC, _r, _i, _g, _h, _t, NWL, _b, _e, _h, _i, _n, _d, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_9110[28] = { - NP9, _F, _o, _x, CMA, SPC, _g, _e, _t, SPC, _t, _h, _i, _s, SPC, _g, _u, _y, NWL, + PRI1, _F, _o, _x, CMA, SPC, _g, _e, _t, SPC, _t, _h, _i, _s, SPC, _g, _u, _y, NWL, _o, _f, _f, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_9120[40] = { - NP9, _T, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, SPC, _t, _h, _e, NWL, + PRI1, _T, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, SPC, _t, _h, _e, NWL, _g, _u, _y, SPC, _b, _e, _h, _i, _n, _d, SPC, _m, _e, CMA, SPC, NWL, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_9130[28] = { - NP9, _I, SPC, _c, _a, _n, APS, _t, SPC, _s, _h, _a, _k, _e, SPC, NWL, + PRI1, _I, SPC, _c, _a, _n, APS, _t, SPC, _s, _h, _a, _k, _e, SPC, NWL, _t, _h, _i, _s, SPC, _g, _u, _y, EXM, NWL, END, }; u16 gMsg_ID_9140[42] = { - NP9, _T, _h, _i, _s, SPC, _i, _s, SPC, _r, _e, _a, _l, _l, _y, NWL, + PRI1, _T, _h, _i, _s, SPC, _i, _s, SPC, _r, _e, _a, _l, _l, _y, NWL, _s, _t, _a, _r, _t, _i, _n, _g, SPC, _t, _o, SPC, _t, _i, _c, _k, NWL, _m, _e, SPC, _o, _f, _f, EXM, NWL, END, }; u16 gMsg_ID_9150[34] = { - NP9, _W, _h, _a, _t, APS, _s, SPC, _t, _a, _k, _i, _n, _g, SPC, _y, _o, _u, NWL, + PRI1, _W, _h, _a, _t, APS, _s, SPC, _t, _a, _k, _i, _n, _g, SPC, _y, _o, _u, NWL, _s, _o, SPC, _l, _o, _n, _g, CMA, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_9151[18] = { - NP9, _D, _a, _n, _g, CMA, SPC, _I, APS, _m, SPC, _h, _i, _t, EXM, NWL, + PRI1, _D, _a, _n, _g, CMA, SPC, _I, APS, _m, SPC, _h, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_9152[18] = { - NP9, _A, _h, _h, _h, EXM, EXM, SPC, _I, APS, _m, SPC, _h, _i, _t, EXM, NWL, + PRI1, _A, _h, _h, _h, EXM, EXM, SPC, _I, APS, _m, SPC, _h, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_9153[24] = { - NP9, _S, _h, _o, _o, _t, EXM, SPC, NWL, + PRI1, _S, _h, _o, _o, _t, EXM, SPC, NWL, _T, _h, _e, _y, SPC, _g, _o, _t, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_9160[44] = { - NP9, _G, _e, _e, CMA, SPC, _I, APS, _v, _e, SPC, _b, _e, _e, _n, SPC, NWL, + PRI1, _G, _e, _e, CMA, SPC, _I, APS, _v, _e, SPC, _b, _e, _e, _n, SPC, NWL, _s, _a, _v, _e, _d, SPC, _b, _y, SPC, _F, _o, _x, PRD, NWL, _H, _o, _w, SPC, _s, _w, _e, _l, _l, PRD, NWL, END, }; u16 gMsg_ID_9170[28] = { - NP9, _H, _o, _o, EXM, SPC, _T, _h, _a, _t, SPC, _w, _a, _s, NWL, + PRI1, _H, _o, _o, EXM, SPC, _T, _h, _a, _t, SPC, _w, _a, _s, NWL, _T, _O, _O, SPC, _c, _l, _o, _s, _e, PRD, NWL, END, }; u16 gMsg_ID_9180[40] = { - NP9, _Y, _o, _u, _r, SPC, _f, _a, _t, _h, _e, _r, SPC, _h, _e, _l, _p, _e, _d, NWL, + PRI1, _Y, _o, _u, _r, SPC, _f, _a, _t, _h, _e, _r, SPC, _h, _e, _l, _p, _e, _d, NWL, _m, _e, SPC, _l, _i, _k, _e, SPC, _t, _h, _a, _t, CMA, SPC, _t, _o, _o, PRD, NWL, END, }; u16 gMsg_ID_9190[30] = { - NP9, _T, _i, _m, _e, SPC, _f, _o, _r, SPC, _a, SPC, _l, _i, _t, _t, _l, _e, SPC, NWL, + PRI1, _T, _i, _m, _e, SPC, _f, _o, _r, SPC, _a, SPC, _l, _i, _t, _t, _l, _e, SPC, NWL, _p, _a, _y, _b, _a, _c, _k, EXM, NWL, END, }; u16 gMsg_ID_9200[38] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, _g, _e, _t, _t, _i, _n, APS, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, _g, _e, _t, _t, _i, _n, APS, NWL, _a, _w, _a, _y, SPC, _t, _h, _a, _t, SPC, _e, _a, _s, _y, EXM, NWL, END, }; u16 gMsg_ID_9210[36] = { - NP9, _I, SPC, _w, _o, _n, APS, _t, SPC, _l, _e, _t, SPC, _y, _o, _u, SPC, _g, _e, _t, NWL, + PRI1, _I, SPC, _w, _o, _n, APS, _t, SPC, _l, _e, _t, SPC, _y, _o, _u, SPC, _g, _e, _t, NWL, _a, _w, _a, _y, SPC, _f, _r, _o, _m, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_9211[26] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _d, _e, _a, _d, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _d, _e, _a, _d, NWL, _m, _e, _a, _t, CMA, SPC, _p, _a, _l, EXM, NWL, END, }; u16 gMsg_ID_9212[20] = { - NP9, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _y, _o, _u, SPC, _n, _o, _w, EXM, NWL, + PRI1, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _y, _o, _u, SPC, _n, _o, _w, EXM, NWL, END, }; u16 gMsg_ID_9213[16] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _m, _i, _n, _e, EXM, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _m, _i, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_9220[22] = { - NP9, _S, _c, _r, _a, _t, _c, _h, SPC, _o, _n, _e, SPC, _b, _o, _g, _e, _y, EXM, NWL, + PRI1, _S, _c, _r, _a, _t, _c, _h, SPC, _o, _n, _e, SPC, _b, _o, _g, _e, _y, EXM, NWL, END, }; u16 gMsg_ID_9230[14] = { - NP9, _I, SPC, _g, _o, _t, SPC, _o, _n, _e, EXM, NWL, + PRI1, _I, SPC, _g, _o, _t, SPC, _o, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_9240[20] = { - NP9, _T, _h, _e, _r, _e, APS, _s, SPC, _o, _n, _e, SPC, _d, _o, _w, _n, EXM, NWL, + PRI1, _T, _h, _e, _r, _e, APS, _s, SPC, _o, _n, _e, SPC, _d, _o, _w, _n, EXM, NWL, END, }; u16 gMsg_ID_9250[36] = { - NPA, _C, _a, _n, APS, _t, SPC, _l, _e, _t, SPC, _y, _o, _u, SPC, _d, _o, SPC, NWL, + PRI2, _C, _a, _n, APS, _t, SPC, _l, _e, _t, SPC, _y, _o, _u, SPC, _d, _o, SPC, NWL, _t, _h, _a, _t, CMA, SPC, _S, _t, _a, _r, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_9260[44] = { - NPA, _A, _n, _d, _r, _o, _s, _s, SPC, _h, _a, _s, SPC, _o, _r, _d, _e, _r, _e, _d, NWL, + PRI2, _A, _n, _d, _r, _o, _s, _s, SPC, _h, _a, _s, SPC, _o, _r, _d, _e, _r, _e, _d, NWL, _u, _s, SPC, _t, _o, SPC, _t, _a, _k, _e, SPC, _y, _o, _u, SPC, _d, _o, _w, _n, PRD, NWL, END, }; u16 gMsg_ID_9270[46] = { - NPA, _W, _e, APS, _r, _e, SPC, _g, _e, _t, _t, _i, _n, APS, SPC, _p, _a, _i, _d, NWL, + PRI2, _W, _e, APS, _r, _e, SPC, _g, _e, _t, _t, _i, _n, APS, SPC, _p, _a, _i, _d, NWL, _a, SPC, _l, _o, _t, SPC, _o, _f, SPC, _c, _a, _s, _h, SPC, _f, _o, _r, SPC, NWL, _t, _h, _i, _s, PRD, NWL, END, }; u16 gMsg_ID_9275[28] = { - NPA, _P, _e, _p, _p, _y, EXM, SPC, _L, _o, _n, _g, SPC, _t, _i, _m, _e, NWL, + PRI2, _P, _e, _p, _p, _y, EXM, SPC, _L, _o, _n, _g, SPC, _t, _i, _m, _e, NWL, _n, _o, SPC, _s, _e, _e, EXM, NWL, END, }; u16 gMsg_ID_9280[30] = { - NPA, _A, _n, _d, _r, _o, _s, _s, APS, SPC, _e, _n, _e, _m, _y, SPC, _i, _s, NWL, + PRI2, _A, _n, _d, _r, _o, _s, _s, APS, SPC, _e, _n, _e, _m, _y, SPC, _i, _s, NWL, _m, _y, SPC, _e, _n, _e, _m, _y, PRD, NWL, END, }; u16 gMsg_ID_9285[40] = { - NP9, _J, _u, _s, _t, SPC, _w, _h, _a, _t, SPC, _I, SPC, _n, _e, _e, _d, SPC, NWL, + PRI1, _J, _u, _s, _t, SPC, _w, _h, _a, _t, SPC, _I, SPC, _n, _e, _e, _d, SPC, NWL, _t, _o, SPC, _s, _e, _e, PRD, SPC, _S, _t, _a, _r, SPC, _W, _o, _l, _f, PRD, NWL, END, }; u16 gMsg_ID_9289[40] = { - NPA, _Y, _o, _u, APS, _l, _l, SPC, _b, _e, SPC, _s, _e, _e, _i, _n, _g, NWL, + PRI2, _Y, _o, _u, APS, _l, _l, SPC, _b, _e, SPC, _s, _e, _e, _i, _n, _g, NWL, _y, _o, _u, _r, SPC, _d, _a, _d, SPC, _s, _o, _o, _n, CMA, SPC, NWL, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_9290[44] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _i, _n, SPC, _m, _y, SPC, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _i, _n, SPC, _m, _y, SPC, NWL, _s, _i, _g, _h, _t, _s, EXM, SPC, _Y, _o, _u, APS, _r, _e, NWL, _g, _o, _i, _n, _g, SPC, _d, _o, _w, _n, EXM, NWL, END, }; u16 gMsg_ID_9300[36] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, _a, _s, SPC, _t, _o, _u, _g, _h, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, _a, _s, SPC, _t, _o, _u, _g, _h, NWL, _a, _s, SPC, _I, SPC, _t, _h, _o, _u, _g, _h, _t, PRD, NWL, END, }; u16 gMsg_ID_9310[34] = { - NP9, _T, _h, _a, _t, SPC, _r, _e, _w, _a, _r, _d, APS, _s, SPC, _a, _s, NWL, + PRI1, _T, _h, _a, _t, SPC, _r, _e, _w, _a, _r, _d, APS, _s, SPC, _a, _s, NWL, _g, _o, _o, _d, SPC, _a, _s, SPC, _m, _i, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_9320[32] = { - NP9, _B, _o, _w, SPC, _b, _e, _f, _o, _r, _e, SPC, _t, _h, _e, NWL, + PRI1, _B, _o, _w, SPC, _b, _e, _f, _o, _r, _e, SPC, _t, _h, _e, NWL, _g, _r, _e, _a, _t, SPC, _A, _n, _d, _r, _o, _s, _s, EXM, NWL, END, }; u16 gMsg_ID_9322[24] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, _s, _o, SPC, _t, _o, _u, _g, _h, EXM, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, _s, _o, SPC, _t, _o, _u, _g, _h, EXM, NWL, END, }; u16 gMsg_ID_9323[40] = { - NP9, _A, _n, _n, _o, _y, _i, _n, _g, SPC, _b, _i, _r, _d, EXM, SPC, NWL, + PRI1, _A, _n, _n, _o, _y, _i, _n, _g, SPC, _b, _i, _r, _d, EXM, SPC, NWL, _I, SPC, _a, _m, SPC, _t, _h, _e, SPC, _g, _r, _e, _a, _t, SPC, _L, _e, _o, _n, EXM, NWL, END, }; u16 gMsg_ID_9324[36] = { - NP9, _I, APS, _l, _l, SPC, _d, _o, SPC, _y, _o, _u, SPC, _f, _a, _s, _t, CMA, NWL, + PRI1, _I, APS, _l, _l, SPC, _d, _o, SPC, _y, _o, _u, SPC, _f, _a, _s, _t, CMA, NWL, _P, _e, _p, _p, _y, SPC, _o, _l, _d, SPC, _p, _a, _l, PRD, NWL, END, }; u16 gMsg_ID_9325[30] = { - NP9, _S, _t, _i, _c, _k, SPC, _t, _o, SPC, _t, _h, _e, SPC, _p, _o, _n, _d, CMA, NWL, + PRI1, _S, _t, _i, _c, _k, SPC, _t, _o, SPC, _t, _h, _e, SPC, _p, _o, _n, _d, CMA, NWL, _F, _r, _o, _g, _g, _i, _e, PRD, NWL, END, }; u16 gMsg_ID_9330[42] = { - NP9, _I, SPC, _w, _i, _l, _l, SPC, _n, _o, _t, SPC, _b, _e, NWL, + PRI1, _I, SPC, _w, _i, _l, _l, SPC, _n, _o, _t, SPC, _b, _e, NWL, _d, _e, _f, _e, _a, _t, _e, _d, SPC, _b, _y, SPC, _t, _h, _i, _s, SPC, NWL, _t, _r, _a, _s, _h, EXM, NWL, END, }; u16 gMsg_ID_9340[28] = { - NP9, _S, _h, _o, _o, _t, SPC, _m, _e, SPC, _d, _o, _w, _n, NWL, + PRI1, _S, _h, _o, _o, _t, SPC, _m, _e, SPC, _d, _o, _w, _n, NWL, _i, _f, SPC, _y, _o, _u, SPC, _c, _a, _n, EXM, NWL, END, }; u16 gMsg_ID_9350[34] = { - NP9, _C, _o, _m, _e, SPC, _o, _n, CMA, SPC, _l, _i, _t, _t, _l, _e, SPC, _m, _a, _n, EXM, NWL, + PRI1, _C, _o, _m, _e, SPC, _o, _n, CMA, SPC, _l, _i, _t, _t, _l, _e, SPC, _m, _a, _n, EXM, NWL, _S, _h, _o, _o, _t, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_9360[26] = { - NP9, _I, APS, _m, SPC, _n, _o, _t, SPC, _a, _f, _r, _a, _i, _d, SPC, _o, _f, SPC, NWL, + PRI1, _I, APS, _m, SPC, _n, _o, _t, SPC, _a, _f, _r, _a, _i, _d, SPC, _o, _f, SPC, NWL, _Y, _O, _U, EXM, NWL, END, }; u16 gMsg_ID_9365[20] = { - NP9, _I, PRD, PRD, PRD, _c, _a, _n, APS, _t, PRD, PRD, PRD, _l, _o, _s, _e, EXM, NWL, + PRI1, _I, PRD, PRD, PRD, _c, _a, _n, APS, _t, PRD, PRD, PRD, _l, _o, _s, _e, EXM, NWL, END, }; u16 gMsg_ID_9366[28] = { - NP9, _T, _h, _i, _s, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, NWL, + PRI1, _T, _h, _i, _s, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, NWL, _h, _a, _p, _p, _e, _n, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_9367[38] = { - NP9, _M, _y, SPC, _b, _e, _a, _u, _t, _i, _f, _u, _l, SPC, _r, _e, _w, _a, _r, _d, EXM, NWL, + PRI1, _M, _y, SPC, _b, _e, _a, _u, _t, _i, _f, _u, _l, SPC, _r, _e, _w, _a, _r, _d, EXM, NWL, _A, _a, _a, _r, _r, _r, _g, _g, _g, _h, _h, _h, EXM, NWL, END, }; u16 gMsg_ID_9368[18] = { - NP9, _U, _n, _c, _l, _e, SPC, _A, _n, _d, _r, _o, _s, _s, EXM, NWL, + PRI1, _U, _n, _c, _l, _e, SPC, _A, _n, _d, _r, _o, _s, _s, EXM, NWL, END, }; u16 gMsg_ID_9369[18] = { - NP9, _W, _h, _a, _t, SPC, _t, _h, _e, SPC, _h, _e, _c, _k, QST, EXM, NWL, + PRI1, _W, _h, _a, _t, SPC, _t, _h, _e, SPC, _h, _e, _c, _k, QST, EXM, NWL, END, }; u16 gMsg_ID_9375[40] = { - NPA, _A, SPC, _b, _o, _m, _b, SPC, _h, _a, _s, SPC, _b, _e, _e, _n, NWL, + PRI2, _A, SPC, _b, _o, _m, _b, SPC, _h, _a, _s, SPC, _b, _e, _e, _n, NWL, _p, _l, _a, _n, _t, _e, _d, SPC, _a, _t, SPC, _t, _h, _e, SPC, _b, _a, _s, _e, PRD, NWL, END, }; u16 gMsg_ID_9380[36] = { - NPA, _G, _e, _e, _z, EXM, SPC, _C, _a, _n, SPC, _a, _n, _y, _o, _n, _e, NWL, + PRI2, _G, _e, _e, _z, EXM, SPC, _C, _a, _n, SPC, _a, _n, _y, _o, _n, _e, NWL, _t, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, SPC, _i, _t, QST, NWL, END, }; u16 gMsg_ID_9385[40] = { - NPA, _L, _e, _t, APS, _s, SPC, _t, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, NWL, + PRI2, _L, _e, _t, APS, _s, SPC, _t, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, NWL, _t, _h, _e, _s, _e, SPC, _g, _u, _y, _s, SPC, _f, _i, _r, _s, _t, PRD, NWL, END, }; u16 gMsg_ID_9390[36] = { - NPA, _D, _a, _n, _g, _e, _r, PRD, SPC, _O, _n, _e, SPC, _m, _i, _n, _u, _t, _e, NWL, + PRI2, _D, _a, _n, _g, _e, _r, PRD, SPC, _O, _n, _e, SPC, _m, _i, _n, _u, _t, _e, NWL, _t, _o, SPC, _e, _x, _p, _l, _o, _s, _i, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_9395[28] = { - NPA, _3, _0, SPC, _s, _e, _c, _o, _n, _d, _s, SPC, _t, _o, NWL, + PRI2, _3, _0, SPC, _s, _e, _c, _o, _n, _d, _s, SPC, _t, _o, NWL, _e, _x, _p, _l, _o, _s, _i, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_9400[28] = { - NPA, _1, _5, SPC, _s, _e, _c, _o, _n, _d, _s, SPC, _t, _o, NWL, + PRI2, _1, _5, SPC, _s, _e, _c, _o, _n, _d, _s, SPC, _t, _o, NWL, _e, _x, _p, _l, _o, _s, _i, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_9405[30] = { - NPA, _B, _o, _m, _b, SPC, _e, _x, _p, _l, _o, _d, _i, _n, _g, PRD, NWL, + PRI2, _B, _o, _m, _b, SPC, _e, _x, _p, _l, _o, _d, _i, _n, _g, PRD, NWL, _K, _e, _e, _p, SPC, _c, _l, _e, _a, _r, PRD, NWL, END, }; u16 gMsg_ID_9411[34] = { - NPA, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, NWL, + PRI2, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, NWL, _t, _h, _e, SPC, _b, _o, _m, _b, SPC, _n, _o, _w, PRD, NWL, END, }; u16 gMsg_ID_9420[42] = { - NP9, _E, _m, _e, _r, _g, _e, _n, _c, _y, NWL, + PRI1, _E, _m, _e, _r, _g, _e, _n, _c, _y, NWL, _m, _a, _n, _e, _u, _v, _e, _r, _s, EXM, SPC, NWL, _G, _e, _t, SPC, _o, _u, _t, SPC, _o, _f, SPC, _t, _h, _e, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_9425[22] = { - NP9, _T, _h, _e, _y, SPC, _a, _l, _m, _o, _s, _t, SPC, _g, _o, _t, SPC, _u, _s, EXM, NWL, + PRI1, _T, _h, _e, _y, SPC, _a, _l, _m, _o, _s, _t, SPC, _g, _o, _t, SPC, _u, _s, EXM, NWL, END, }; u16 gMsg_ID_9426[38] = { - NP9, _I, APS, _m, SPC, _n, _o, _t, SPC, _t, _o, _o, SPC, _c, _r, _a, _z, _y, NWL, + PRI1, _I, APS, _m, SPC, _n, _o, _t, SPC, _t, _o, _o, SPC, _c, _r, _a, _z, _y, NWL, _a, _b, _o, _u, _t, SPC, _t, _h, _o, _s, _e, SPC, _g, _u, _y, _s, PRD, NWL, END, }; u16 gMsg_ID_9427[24] = { - NP9, _S, _o, SPC, _t, _h, _a, _t, APS, _s, SPC, _S, _t, _a, _r, SPC, _W, _o, _l, _f, QST, NWL, + PRI1, _S, _o, SPC, _t, _h, _a, _t, APS, _s, SPC, _S, _t, _a, _r, SPC, _W, _o, _l, _f, QST, NWL, END, }; u16 gMsg_ID_9428[20] = { - NP9, _H, _e, _y, CMA, SPC, _w, _e, SPC, _m, _a, _d, _e, SPC, _i, _t, EXM, NWL, + PRI1, _H, _e, _y, CMA, SPC, _w, _e, SPC, _m, _a, _d, _e, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_9429[22] = { - NP9, _F, _o, _x, CMA, SPC, _t, _a, _k, _e, SPC, _i, _t, SPC, _e, _a, _s, _y, EXM, NWL, + PRI1, _F, _o, _x, CMA, SPC, _t, _a, _k, _e, SPC, _i, _t, SPC, _e, _a, _s, _y, EXM, NWL, END, }; u16 gMsg_ID_9430[30] = { - NP9, _T, _h, _a, _t, SPC, _w, _a, _s, SPC, _a, SPC, _c, _l, _o, _s, _e, NWL, + PRI1, _T, _h, _a, _t, SPC, _w, _a, _s, SPC, _a, SPC, _c, _l, _o, _s, _e, NWL, _c, _a, _l, _l, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_9431[38] = { - NP9, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _w, _e, SPC, _w, _i, _n, NWL, + PRI1, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _w, _e, SPC, _w, _i, _n, NWL, _t, _o, _d, _a, _y, CMA, SPC, _S, _t, _a, _r, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_9432[30] = { - NP9, _C, _l, _o, _s, _e, CMA, SPC, _b, _u, _t, SPC, _n, _o, SPC, _c, _i, _g, _a, _r, EXM, NWL, + PRI1, _C, _l, _o, _s, _e, CMA, SPC, _b, _u, _t, SPC, _n, _o, SPC, _c, _i, _g, _a, _r, EXM, NWL, _H, _A, SPC, _H, _A, EXM, NWL, END, }; u16 gMsg_ID_9433[40] = { - NP9, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _t, _w, _o, SPC, _w, _o, _r, _d, _s, NWL, + PRI1, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _t, _w, _o, SPC, _w, _o, _r, _d, _s, NWL, _f, _o, _r, SPC, _y, _o, _u, CLN, SPC, _L, _O, DSH, _S, _E, _R, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_9434[26] = { - NP9, _S, _c, _o, _r, _e, SPC, _o, _n, _e, SPC, _f, _o, _r, SPC, NWL, + PRI1, _S, _c, _o, _r, _e, SPC, _o, _n, _e, SPC, _f, _o, _r, SPC, NWL, _A, _n, _d, _r, _o, _s, _s, EXM, NWL, END, }; u16 gMsg_ID_9436[22] = { - NPA, _I, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _l, _a, _s, _t, SPC, _o, _n, _e, EXM, NWL, + PRI2, _I, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _l, _a, _s, _t, SPC, _o, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_9437[22] = { - NPA, _I, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _l, _a, _s, _t, SPC, _o, _n, _e, EXM, NWL, + PRI2, _I, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _l, _a, _s, _t, SPC, _o, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_9438[22] = { - NPA, _I, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _l, _a, _s, _t, SPC, _o, _n, _e, EXM, NWL, + PRI2, _I, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _l, _a, _s, _t, SPC, _o, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_10010[38] = { - NP9, _K, _e, _e, _p, SPC, _a, _n, SPC, _e, _y, _e, SPC, _o, _n, SPC, _y, _o, _u, _r, SPC, NWL, + PRI1, _K, _e, _e, _p, SPC, _a, _n, SPC, _e, _y, _e, SPC, _o, _n, SPC, _y, _o, _u, _r, SPC, NWL, _s, _h, _i, _e, _l, _d, SPC, _g, _a, _u, _g, _e, PRD, NWL, END, }; u16 gMsg_ID_10020[32] = { - NP9, _T, _h, _e, SPC, _A, _r, _w, _i, _n, _g, SPC, _m, _i, _g, _h, _t, NWL, + PRI1, _T, _h, _e, SPC, _A, _r, _w, _i, _n, _g, SPC, _m, _i, _g, _h, _t, NWL, _n, _o, _t, SPC, _m, _a, _k, _e, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_10040[20] = { - NP9, _B, _r, _a, _c, _e, SPC, _y, _o, _u, _r, _s, _e, _l, _v, _e, _s, EXM, NWL, + PRI1, _B, _r, _a, _c, _e, SPC, _y, _o, _u, _r, _s, _e, _l, _v, _e, _s, EXM, NWL, END, }; u16 gMsg_ID_10050[20] = { - NP9, _S, _h, _o, _o, _t, SPC, _t, _h, _e, SPC, _r, _o, _c, _k, _s, EXM, NWL, + PRI1, _S, _h, _o, _o, _t, SPC, _t, _h, _e, SPC, _r, _o, _c, _k, _s, EXM, NWL, END, }; u16 gMsg_ID_10060[54] = { - NP9, _T, _h, _i, _s, SPC, _b, _a, _b, _y, SPC, _c, _a, _n, SPC, _t, _a, _k, _e, NWL, + PRI1, _T, _h, _i, _s, SPC, _b, _a, _b, _y, SPC, _c, _a, _n, SPC, _t, _a, _k, _e, NWL, _t, _e, _m, _p, _e, _r, _a, _t, _u, _r, _e, _s, SPC, _u, _p, SPC, _t, _o, NWL, _9, _0, _0, _0, SPC, _d, _e, _g, _r, _e, _e, _s, PRD, NWL, END, }; u16 gMsg_ID_10070[36] = { - NP9, _T, _e, _m, _p, _e, _r, _a, _t, _u, _r, _e, SPC, _i, _s, NWL, + PRI1, _T, _e, _m, _p, _e, _r, _a, _t, _u, _r, _e, SPC, _i, _s, NWL, _6, _0, _0, _0, SPC, _a, _n, _d, SPC, _c, _l, _i, _m, _b, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_10080[28] = { - NP9, _I, _t, APS, _s, SPC, _n, _o, _w, SPC, _a, _t, SPC, _8, _0, _0, _0, EXM, SPC, NWL, + PRI1, _I, _t, APS, _s, SPC, _n, _o, _w, SPC, _a, _t, SPC, _8, _0, _0, _0, EXM, SPC, NWL, _O, _h, SPC, _n, _o, EXM, NWL, END, }; u16 gMsg_ID_10200[44] = { - NPA, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _y, _o, _u, SPC, NWL, + PRI2, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _y, _o, _u, SPC, NWL, _c, _o, _u, _l, _d, SPC, _u, _s, _e, SPC, _s, _o, _m, _e, NWL, _h, _e, _l, _p, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_10210[10] = { - NPA, _B, _i, _l, _l, QST, EXM, NWL, + PRI2, _B, _i, _l, _l, QST, EXM, NWL, END, }; u16 gMsg_ID_10220[38] = { - NP9, _D, _o, _n, APS, _t, SPC, _g, _e, _t, SPC, _t, _o, _o, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _g, _e, _t, SPC, _t, _o, _o, NWL, _e, _x, _c, _i, _t, _e, _d, PRD, SPC, _H, _e, _r, _e, SPC, _w, _e, SPC, _g, _o, EXM, NWL, END, }; u16 gMsg_ID_10230[26] = { - NPA, _W, _a, _t, _c, _h, SPC, _y, _o, _u, _r, _s, _e, _l, _f, CMA, NWL, + PRI2, _W, _a, _t, _c, _h, SPC, _y, _o, _u, _r, _s, _e, _l, _f, CMA, NWL, _F, _o, _x, PRD, PRD, PRD, NWL, END, }; u16 gMsg_ID_10255[32] = { - NP9, _T, _h, _e, _y, APS, _r, _e, SPC, _a, _t, _t, _a, _c, _k, _i, _n, _g, SPC, NWL, + PRI1, _T, _h, _e, _y, APS, _r, _e, SPC, _a, _t, _t, _a, _c, _k, _i, _n, _g, SPC, NWL, _i, _n, SPC, _g, _r, _o, _u, _p, _s, EXM, NWL, END, }; u16 gMsg_ID_10300[36] = { - NP9, _T, _H, _I, _S, SPC, _i, _s, SPC, _t, _h, _e, SPC, _e, _n, _e, _m, _y, APS, _s, NWL, + PRI1, _T, _H, _I, _S, SPC, _i, _s, SPC, _t, _h, _e, SPC, _e, _n, _e, _m, _y, APS, _s, NWL, _b, _i, _o, DSH, _w, _e, _a, _p, _o, _n, QST, EXM, NWL, END, }; u16 gMsg_ID_10310[30] = { - NP9, _A, _n, _d, _r, _o, _s, _s, SPC, _i, _s, SPC, _a, _n, NWL, + PRI1, _A, _n, _d, _r, _o, _s, _s, SPC, _i, _s, SPC, _a, _n, NWL, _i, _n, _s, _a, _n, _e, SPC, _f, _o, _o, _l, EXM, NWL, END, }; u16 gMsg_ID_10320[38] = { - NP9, _M, _a, _y, _b, _e, SPC, _i, _t, APS, _s, SPC, _a, _n, SPC, _a, _r, _m, PRD, NWL, + PRI1, _M, _a, _y, _b, _e, SPC, _i, _t, APS, _s, SPC, _a, _n, SPC, _a, _r, _m, PRD, NWL, _A, _i, _m, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _a, _r, _m, EXM, NWL, END, }; u16 gMsg_ID_10321[32] = { - NP9, _I, SPC, _a, _i, _n, APS, _t, SPC, _y, _o, _u, _r, SPC, _b, _u, _d, _d, _y, EXM, NWL, + PRI1, _I, SPC, _a, _i, _n, APS, _t, SPC, _y, _o, _u, _r, SPC, _b, _u, _d, _d, _y, EXM, NWL, _G, _o, SPC, _a, _w, _a, _y, EXM, NWL, END, }; u16 gMsg_ID_10322[38] = { - NP9, _G, _o, _o, _d, SPC, _r, _i, _d, _d, _a, _n, _c, _e, PRD, SPC, _I, NWL, + PRI1, _G, _o, _o, _d, SPC, _r, _i, _d, _d, _a, _n, _c, _e, PRD, SPC, _I, NWL, _a, _l, _m, _o, _s, _t, SPC, _g, _o, _t, SPC, _b, _u, _r, _n, _e, _d, EXM, NWL, END, }; u16 gMsg_ID_10323[42] = { - NP9, _I, _t, APS, _s, SPC, _t, _o, _o, SPC, _h, _o, _t, EXM, SPC, _I, SPC, NWL, + PRI1, _I, _t, APS, _s, SPC, _t, _o, _o, SPC, _h, _o, _t, EXM, SPC, _I, SPC, NWL, _c, _a, _n, APS, _t, SPC, _t, _a, _k, _e, SPC, _i, _t, NWL, _a, _n, _y, _m, _o, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_10324[48] = { - NP9, _D, _o, _n, APS, _t, SPC, _f, _l, _y, SPC, _t, _o, _o, SPC, _l, _o, _w, EXM, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _f, _l, _y, SPC, _t, _o, _o, SPC, _l, _o, _w, EXM, NWL, _Y, _o, _u, _r, SPC, _s, _h, _i, _p, SPC, _c, _a, _n, APS, _t, SPC, NWL, _t, _a, _k, _e, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_11010[34] = { - NP9, _O, _K, SPC, _g, _u, _y, _s, CMA, SPC, _d, _e, _s, _t, _r, _o, _y, NWL, + PRI1, _O, _K, SPC, _g, _u, _y, _s, CMA, SPC, _d, _e, _s, _t, _r, _o, _y, NWL, _a, _l, _l, SPC, _b, _a, _r, _r, _i, _e, _r, _s, PRD, NWL, END, }; u16 gMsg_ID_11020[34] = { - NP9, _A, _i, _m, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _s, _i, _x, NWL, + PRI1, _A, _i, _m, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _s, _i, _x, NWL, _e, _n, _e, _r, _g, _y, SPC, _t, _o, _w, _e, _r, _s, PRD, NWL, END, }; u16 gMsg_ID_11030[24] = { - NP9, _I, APS, _l, _l, SPC, _c, _o, _v, _e, _r, SPC, _y, _o, _u, CMA, SPC, NWL, + PRI1, _I, APS, _l, _l, SPC, _c, _o, _v, _e, _r, SPC, _y, _o, _u, CMA, SPC, NWL, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_11040[24] = { - NP9, _Y, _o, _u, _r, SPC, _c, _a, _r, _c, _a, _s, _s, SPC, _i, _s, NWL, + PRI1, _Y, _o, _u, _r, SPC, _c, _a, _r, _c, _a, _s, _s, SPC, _i, _s, NWL, _m, _i, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_11050[42] = { - NPA, _H, _e, _y, EXM, SPC, _T, _h, _e, SPC, _f, _o, _r, _c, _e, SPC, NWL, + PRI2, _H, _e, _y, EXM, SPC, _T, _h, _e, SPC, _f, _o, _r, _c, _e, SPC, NWL, _f, _i, _e, _l, _d, SPC, _i, _s, SPC, NWL, _d, _i, _s, _a, _p, _p, _e, _a, _r, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_11060[32] = { - NP9, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _w, _e, APS, _v, _e, NWL, + PRI1, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _w, _e, APS, _v, _e, NWL, _g, _o, _t, SPC, _c, _o, _m, _p, _a, _n, _y, PRD, NWL, END, }; u16 gMsg_ID_11100[32] = { - NPA, _P, _l, _a, _y, SPC, _t, _i, _m, _e, SPC, _i, _s, SPC, _o, _v, _e, _r, CMA, NWL, + PRI2, _P, _l, _a, _y, SPC, _t, _i, _m, _e, SPC, _i, _s, SPC, _o, _v, _e, _r, CMA, NWL, _S, _t, _a, _r, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_11110[42] = { - NPA, _I, SPC, _t, _h, _i, _n, _k, SPC, _I, APS, _l, _l, SPC, NWL, + PRI2, _I, SPC, _t, _h, _i, _n, _k, SPC, _I, APS, _l, _l, SPC, NWL, _t, _o, _r, _t, _u, _r, _e, SPC, _y, _o, _u, SPC, _f, _o, _r, SPC, NWL, _a, _w, _h, _i, _l, _e, EXM, NWL, END, }; u16 gMsg_ID_11120[44] = { - NPA, _D, _a, _d, _d, _y, SPC, _s, _c, _r, _e, _a, _m, _e, _d, NWL, + PRI2, _D, _a, _d, _d, _y, SPC, _s, _c, _r, _e, _a, _m, _e, _d, NWL, _R, _E, _A, _L, SPC, _g, _o, _o, _d, SPC, _b, _e, _f, _o, _r, _e, NWL, _h, _e, SPC, _d, _i, _e, _d, EXM, NWL, END, }; u16 gMsg_ID_11130[34] = { - NPA, _Y, _o, _u, APS, _l, _l, SPC, _b, _e, SPC, _s, _o, _r, _r, _y, NWL, + PRI2, _Y, _o, _u, APS, _l, _l, SPC, _b, _e, SPC, _s, _o, _r, _r, _y, NWL, _y, _o, _u, SPC, _c, _r, _o, _s, _s, _e, _d, SPC, _u, _s, EXM, NWL, END, }; u16 gMsg_ID_11150[30] = { - NPA, _G, _o, _o, _d, PRD, SPC, _I, SPC, _s, _e, _e, SPC, _t, _h, _e, NWL, + PRI2, _G, _o, _o, _d, PRD, SPC, _I, SPC, _s, _e, _e, SPC, _t, _h, _e, NWL, _e, _n, _e, _m, _y, SPC, _c, _o, _r, _e, PRD, NWL, END, }; u16 gMsg_ID_11160[32] = { - NPA, _D, _e, _s, _t, _r, _o, _y, SPC, _t, _h, _e, NWL, + PRI2, _D, _e, _s, _t, _r, _o, _y, SPC, _t, _h, _e, NWL, _s, _a, _t, _e, _l, _l, _i, _t, _e, APS, _s, SPC, _c, _o, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_11200[24] = { - NP9, _V, _e, _n, _o, _m, CMA, SPC, _h, _e, _r, _e, SPC, _w, _e, SPC, _c, _o, _m, _e, PRD, NWL, + PRI1, _V, _e, _n, _o, _m, CMA, SPC, _h, _e, _r, _e, SPC, _w, _e, SPC, _c, _o, _m, _e, PRD, NWL, END, }; u16 gMsg_ID_11210[34] = { - NP9, _T, _h, _o, _s, _e, SPC, _s, _h, _i, _p, _s, SPC, _a, _r, _e, NWL, + PRI1, _T, _h, _o, _s, _e, SPC, _s, _h, _i, _p, _s, SPC, _a, _r, _e, NWL, _s, _h, _i, _e, _l, _d, _e, _d, CMA, SPC, _t, _o, _o, EXM, NWL, END, }; u16 gMsg_ID_11220[38] = { - NP9, _Y, _o, _u, SPC, _a, _r, _e, SPC, _N, _O, _T, SPC, _t, _a, _k, _i, _n, _g, NWL, + PRI1, _Y, _o, _u, SPC, _a, _r, _e, SPC, _N, _O, _T, SPC, _t, _a, _k, _i, _n, _g, NWL, _h, _i, _m, SPC, _d, _o, _w, _n, SPC, _t, _o, _d, _a, _y, PRD, NWL, END, }; u16 gMsg_ID_11230[32] = { - NP9, _W, _h, _a, _t, APS, _s, SPC, _t, _a, _k, _i, _n, _g, SPC, _s, _o, SPC, NWL, + PRI1, _W, _h, _a, _t, APS, _s, SPC, _t, _a, _k, _i, _n, _g, SPC, _s, _o, SPC, NWL, _l, _o, _n, _g, CMA, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_11240[22] = { - NP9, _T, _h, _e, _y, SPC, _d, _o, _n, APS, _t, SPC, _g, _i, _v, _e, SPC, _u, _p, PRD, NWL, + PRI1, _T, _h, _e, _y, SPC, _d, _o, _n, APS, _t, SPC, _g, _i, _v, _e, SPC, _u, _p, PRD, NWL, END, }; u16 gMsg_ID_11241[30] = { - NP9, _S, _t, _a, _r, SPC, _W, _o, _l, _f, SPC, _a, _g, _a, _i, _n, QST, EXM, NWL, + PRI1, _S, _t, _a, _r, SPC, _W, _o, _l, _f, SPC, _a, _g, _a, _i, _n, QST, EXM, NWL, _W, _h, _y, SPC, _n, _o, _w, QST, NWL, END, }; u16 gMsg_ID_14020[30] = { - NP9, _L, _e, _t, APS, _s, SPC, _b, _a, _c, _k, SPC, _u, _p, NWL, + PRI1, _L, _e, _t, APS, _s, SPC, _b, _a, _c, _k, SPC, _u, _p, NWL, _t, _h, _e, SPC, _s, _q, _u, _a, _d, _r, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_14030[38] = { - NP9, _S, _o, _m, _e, _b, _o, _d, _y, APS, _s, SPC, _g, _o, _n, _n, _a, NWL, + PRI1, _S, _o, _m, _e, _b, _o, _d, _y, APS, _s, SPC, _g, _o, _n, _n, _a, NWL, _p, _a, _y, SPC, _f, _o, _r, SPC, _a, _l, _l, SPC, _t, _h, _i, _s, PRD, NWL, END, }; u16 gMsg_ID_14040[32] = { - NP9, _D, _o, _n, APS, _t, SPC, _l, _e, _t, SPC, _a, _n, _y, SPC, _o, _f, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _l, _e, _t, SPC, _a, _n, _y, SPC, _o, _f, NWL, APS, _e, _m, SPC, _t, _h, _r, _o, _u, _g, _h, EXM, NWL, END, }; u16 gMsg_ID_14045[44] = { - NP9, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, SPC, _w, _r, _o, _n, _g, PRD, NWL, + PRI1, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, SPC, _w, _r, _o, _n, _g, PRD, NWL, _I, SPC, _d, _o, _n, APS, _t, SPC, _s, _e, _e, SPC, NWL, _a, _n, _y, _t, _h, _i, _n, _g, PRD, NWL, END, }; u16 gMsg_ID_14050[44] = { - NP9, _H, _o, _l, _d, SPC, APS, _e, _m, EXM, SPC, _T, _h, _e, _y, APS, _r, _e, NWL, + PRI1, _H, _o, _l, _d, SPC, APS, _e, _m, EXM, SPC, _T, _h, _e, _y, APS, _r, _e, NWL, _t, _r, _y, _i, _n, _g, SPC, _t, _o, SPC, _g, _e, _t, SPC, NWL, _t, _h, _r, _o, _u, _g, _h, EXM, NWL, END, }; u16 gMsg_ID_14060[42] = { - NPA, _F, _o, _x, CMA, SPC, _y, _o, _u, APS, _r, _e, SPC, NWL, + PRI2, _F, _o, _x, CMA, SPC, _y, _o, _u, APS, _r, _e, SPC, NWL, _s, _u, _p, _p, _o, _s, _e, _d, SPC, _t, _o, NWL, _s, _h, _o, _o, _t, SPC, APS, _e, _m, SPC, _a, _l, _l, EXM, NWL, END, }; u16 gMsg_ID_14070[32] = { - NPA, _G, _o, _o, _d, SPC, _j, _o, _b, EXM, SPC, NWL, + PRI2, _G, _o, _o, _d, SPC, _j, _o, _b, EXM, SPC, NWL, _K, _e, _e, _p, SPC, _u, _p, SPC, _t, _h, _e, SPC, _p, _a, _c, _e, EXM, NWL, END, }; u16 gMsg_ID_14080[32] = { - NP9, _I, _s, SPC, _t, _h, _a, _t, SPC, _t, _h, _e, SPC, _b, _e, _s, _t, NWL, + PRI1, _I, _s, SPC, _t, _h, _a, _t, SPC, _t, _h, _e, SPC, _b, _e, _s, _t, NWL, _y, _o, _u, SPC, _c, _a, _n, SPC, _d, _o, QST, NWL, END, }; u16 gMsg_ID_14100[34] = { - NPA, _Y, _o, _u, APS, _r, _e, SPC, _b, _e, _c, _o, _m, _i, _n, _g, SPC, _a, NWL, + PRI2, _Y, _o, _u, APS, _r, _e, SPC, _b, _e, _c, _o, _m, _i, _n, _g, SPC, _a, NWL, _b, _e, _t, _t, _e, _r, SPC, _p, _i, _l, _o, _t, PRD, NWL, END, }; u16 gMsg_ID_14110[38] = { - NP9, _S, _u, _r, _p, _r, _i, _s, _e, SPC, _a, _t, _t, _a, _c, _k, NWL, + PRI1, _S, _u, _r, _p, _r, _i, _s, _e, SPC, _a, _t, _t, _a, _c, _k, NWL, _c, _o, _m, _i, _n, _g, SPC, _f, _r, _o, _m, SPC, _a, _b, _o, _v, _e, EXM, NWL, END, }; u16 gMsg_ID_14120[38] = { - NP9, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, NWL, + PRI1, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, NWL, _e, _v, _e, _r, _y, _t, _h, _i, _n, _g, SPC, _b, _e, _l, _o, _w, PRD, NWL, END, }; u16 gMsg_ID_14130[30] = { - NP9, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _e, _v, _e, _r, _y, _t, _h, _i, _n, _g, NWL, + PRI1, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _e, _v, _e, _r, _y, _t, _h, _i, _n, _g, NWL, _a, _b, _o, _v, _e, PRD, NWL, END, }; u16 gMsg_ID_14140[46] = { - NP9, _A, _h, SPC, _h, _a, EXM, SPC, _T, _h, _o, _u, _g, _h, _t, SPC, _y, _o, _u, NWL, + PRI1, _A, _h, SPC, _h, _a, EXM, SPC, _T, _h, _o, _u, _g, _h, _t, SPC, _y, _o, _u, NWL, _c, _o, _u, _l, _d, SPC, _h, _i, _d, _e, SPC, _f, _r, _o, _m, SPC, _m, _e, CMA, SPC, NWL, _e, _h, QST, NWL, END, }; u16 gMsg_ID_14150[30] = { - NP9, _E, _s, _c, _a, _p, _i, _n, _g, QST, SPC, _I, SPC, _d, _o, _n, APS, _t, NWL, + PRI1, _E, _s, _c, _a, _p, _i, _n, _g, QST, SPC, _I, SPC, _d, _o, _n, APS, _t, NWL, _t, _h, _i, _n, _k, SPC, _s, _o, EXM, NWL, END, }; u16 gMsg_ID_14160[24] = { - NP9, _H, _e, _y, EXM, SPC, NWL, + PRI1, _H, _e, _y, EXM, SPC, NWL, _L, _e, _a, _v, _e, SPC, _m, _e, SPC, _a, _l, _o, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_14170[32] = { - NP9, _T, _a, _k, _e, SPC, APS, _e, _m, SPC, _d, _o, _w, _n, SPC, _w, _i, _t, _h, SPC, NWL, + PRI1, _T, _a, _k, _e, SPC, APS, _e, _m, SPC, _d, _o, _w, _n, SPC, _w, _i, _t, _h, SPC, NWL, _o, _n, _e, SPC, _s, _h, _o, _t, EXM, NWL, END, }; u16 gMsg_ID_14180[28] = { - NP9, _H, _e, APS, _s, SPC, _q, _u, _i, _c, _k, EXM, SPC, NWL, + PRI1, _H, _e, APS, _s, SPC, _q, _u, _i, _c, _k, EXM, SPC, NWL, _B, _e, SPC, _c, _a, _r, _e, _f, _u, _l, PRD, NWL, END, }; u16 gMsg_ID_14190[42] = { - NP9, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, SPC, _u, _p, NWL, + PRI1, _S, _o, _m, _e, _t, _h, _i, _n, _g, APS, _s, SPC, _u, _p, NWL, _a, _h, _e, _a, _d, PRD, SPC, _L, _o, _o, _k, _s, NWL, _d, _i, _f, _f, _e, _r, _e, _n, _t, PRD, NWL, END, }; u16 gMsg_ID_14200[28] = { - NP9, _G, _e, _e, _z, CMA, SPC, _q, _u, _i, _t, SPC, _m, _o, _v, _i, _n, _g, NWL, + PRI1, _G, _e, _e, _z, CMA, SPC, _q, _u, _i, _t, SPC, _m, _o, _v, _i, _n, _g, NWL, _a, _r, _o, _u, _n, _d, EXM, NWL, END, }; u16 gMsg_ID_14210[34] = { - NP9, _W, _a, _t, _c, _h, SPC, _t, _h, _e, SPC, _r, _a, _d, _a, _r, NWL, + PRI1, _W, _a, _t, _c, _h, SPC, _t, _h, _e, SPC, _r, _a, _d, _a, _r, NWL, _c, _a, _r, _e, _f, _u, _l, _l, _y, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_14220[24] = { - NP9, _T, _h, _e, _s, _e, SPC, _g, _u, _y, _s, SPC, _a, _r, _e, NWL, + PRI1, _T, _h, _e, _s, _e, SPC, _g, _u, _y, _s, SPC, _a, _r, _e, NWL, _t, _o, _u, _g, _h, EXM, NWL, END, }; u16 gMsg_ID_14230[36] = { - NP9, _G, _o, _o, _d, SPC, _j, _o, _b, PRD, SPC, _K, _e, _e, _p, SPC, _u, _p, NWL, + PRI1, _G, _o, _o, _d, SPC, _j, _o, _b, PRD, SPC, _K, _e, _e, _p, SPC, _u, _p, NWL, _t, _h, _e, SPC, _g, _o, _o, _d, SPC, _w, _o, _r, _k, PRD, NWL, END, }; u16 gMsg_ID_14300[26] = { - NP9, _D, _o, _n, APS, _t, SPC, _p, _a, _r, _t, _y, SPC, _j, _u, _s, _t, SPC, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _p, _a, _r, _t, _y, SPC, _j, _u, _s, _t, SPC, NWL, _y, _e, _t, PRD, NWL, END, }; u16 gMsg_ID_14310[36] = { - NP9, _I, _t, APS, _s, SPC, _t, _i, _m, _e, SPC, _t, _o, SPC, _t, _r, _y, NWL, + PRI1, _I, _t, APS, _s, SPC, _t, _i, _m, _e, SPC, _t, _o, SPC, _t, _r, _y, NWL, _o, _u, _r, SPC, _n, _e, _w, SPC, _w, _e, _a, _p, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_14320[28] = { - NP9, _W, _h, _a, _t, APS, _s, SPC, _w, _r, _o, _n, _g, QST, NWL, + PRI1, _W, _h, _a, _t, APS, _s, SPC, _w, _r, _o, _n, _g, QST, NWL, _I, _s, SPC, _t, _h, _a, _t, SPC, _i, _t, QST, NWL, END, }; u16 gMsg_ID_14330[22] = { - NP9, _I, APS, _m, SPC, _c, _o, _m, _i, _n, APS, SPC, _f, _o, _r, SPC, _y, _a, EXM, NWL, + PRI1, _I, APS, _m, SPC, _c, _o, _m, _i, _n, APS, SPC, _f, _o, _r, SPC, _y, _a, EXM, NWL, END, }; u16 gMsg_ID_14340[40] = { - NP9, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _y, _o, _u, SPC, _g, _u, _y, _s, NWL, + PRI1, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _y, _o, _u, SPC, _g, _u, _y, _s, NWL, _o, _u, _t, SPC, _f, _r, _o, _m, SPC, _t, _h, _e, SPC, _s, _h, _i, _p, EXM, NWL, END, }; u16 gMsg_ID_14350[24] = { - NP9, _C, _o, _c, _k, _y, SPC, _l, _i, _t, _t, _l, _e, SPC, _f, _r, _e, _a, _k, _s, EXM, NWL, + PRI1, _C, _o, _c, _k, _y, SPC, _l, _i, _t, _t, _l, _e, SPC, _f, _r, _e, _a, _k, _s, EXM, NWL, END, }; u16 gMsg_ID_14360[18] = { - NPA, _A, _a, _a, _a, _a, _h, _h, _h, _h, _h, EXM, EXM, EXM, EXM, NWL, + PRI2, _A, _a, _a, _a, _a, _h, _h, _h, _h, _h, EXM, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_14370[38] = { - NPA, _W, _e, APS, _r, _e, SPC, _h, _e, _a, _d, _i, _n, APS, SPC, _f, _o, _r, NWL, + PRI2, _W, _e, APS, _r, _e, SPC, _h, _e, _a, _d, _i, _n, APS, SPC, _f, _o, _r, NWL, _A, _q, _u, _a, _s, PRD, SPC, _R, _e, _p, _o, _r, _t, SPC, _i, _n, PRD, NWL, END, }; u16 gMsg_ID_15010[40] = { - NP9, _I, APS, _m, SPC, _g, _o, _n, _n, _a, SPC, _c, _h, _e, _c, _k, SPC, _o, _u, _t, SPC, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _n, _n, _a, SPC, _c, _h, _e, _c, _k, SPC, _o, _u, _t, SPC, NWL, _t, _h, _e, SPC, _b, _i, _o, DSH, _w, _e, _a, _p, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_15030[38] = { - NP9, _I, APS, _m, SPC, _s, _e, _n, _d, _i, _n, _g, SPC, _t, _h, _e, SPC, NWL, + PRI1, _I, APS, _m, SPC, _s, _e, _n, _d, _i, _n, _g, SPC, _t, _h, _e, SPC, NWL, _d, _a, _t, _a, SPC, _t, _o, SPC, _y, _o, _u, SPC, _g, _u, _y, _s, PRD, NWL, END, }; u16 gMsg_ID_15040[42] = { - NP9, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _t, _h, _e, NWL, + PRI1, _L, _o, _o, _k, _s, SPC, _l, _i, _k, _e, SPC, _t, _h, _e, NWL, _p, _o, _l, _l, _u, _t, _i, _o, _n, SPC, _h, _a, _s, SPC, NWL, _s, _t, _a, _r, _t, _e, _d, PRD, NWL, END, }; u16 gMsg_ID_15045[16] = { - NP9, _I, _t, APS, _s, SPC, _a, _w, _f, _u, _l, PRD, PRD, PRD, NWL, + PRI1, _I, _t, APS, _s, SPC, _a, _w, _f, _u, _l, PRD, PRD, PRD, NWL, END, }; u16 gMsg_ID_15050[30] = { - NP9, _H, _o, _w, APS, _s, SPC, _t, _h, _e, NWL, + PRI1, _H, _o, _w, APS, _s, SPC, _t, _h, _e, NWL, _B, _l, _u, _e, DSH, _M, _a, _r, _i, _n, _e, CMA, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_15051[40] = { - NP9, _I, _t, APS, _s, SPC, _a, SPC, _g, _o, _o, _d, SPC, _t, _h, _i, _n, _g, NWL, + PRI1, _I, _t, APS, _s, SPC, _a, SPC, _g, _o, _o, _d, SPC, _t, _h, _i, _n, _g, NWL, _y, _o, _u, SPC, _p, _r, _e, _p, _a, _r, _e, _d, CMA, SPC, _S, _l, _i, _p, PRD, NWL, END, }; u16 gMsg_ID_15052[40] = { - NP9, _T, _h, _i, _s, SPC, _t, _h, _i, _n, _g, SPC, _w, _i, _l, _l, SPC, NWL, + PRI1, _T, _h, _i, _s, SPC, _t, _h, _i, _n, _g, SPC, _w, _i, _l, _l, SPC, NWL, _n, _e, _v, _e, _r, SPC, _h, _o, _l, _d, SPC, _t, _o, _g, _e, _t, _h, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_15053[48] = { - NP9, _K, _e, _e, _p, SPC, _s, _h, _o, _o, _t, _i, _n, _g, PRD, NWL, + PRI1, _K, _e, _e, _p, SPC, _s, _h, _o, _o, _t, _i, _n, _g, PRD, NWL, _W, _e, APS, _v, _e, SPC, _g, _o, _t, SPC, _l, _o, _t, _s, SPC, _o, _f, SPC, NWL, _t, _o, _r, _p, _e, _d, _o, _e, _s, EXM, NWL, END, }; u16 gMsg_ID_15054[28] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _t, _h, _e, SPC, _b, _e, _s, _t, CMA, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _t, _h, _e, SPC, _b, _e, _s, _t, CMA, NWL, _S, _l, _i, _p, _p, _y, EXM, NWL, END, }; u16 gMsg_ID_15060[18] = { - NP9, _T, _h, _a, _n, _k, _s, CMA, SPC, _P, _e, _p, _p, _y, EXM, NWL, + PRI1, _T, _h, _a, _n, _k, _s, CMA, SPC, _P, _e, _p, _p, _y, EXM, NWL, END, }; u16 gMsg_ID_15100[30] = { - NP9, _I, APS, _v, _e, SPC, _f, _o, _u, _n, _d, SPC, _t, _h, _e, NWL, + PRI1, _I, APS, _v, _e, SPC, _f, _o, _u, _n, _d, SPC, _t, _h, _e, NWL, _b, _i, _o, DSH, _w, _e, _a, _p, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_15110[28] = { - NP9, _A, _i, _m, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _t, _w, _o, NWL, + PRI1, _A, _i, _m, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _t, _w, _o, NWL, _c, _o, _l, _u, _m, _n, _s, PRD, NWL, END, }; u16 gMsg_ID_15120[26] = { - NP9, _F, _i, _r, _e, SPC, _a, SPC, _h, _o, _m, _i, _n, _g, NWL, + PRI1, _F, _i, _r, _e, SPC, _a, SPC, _h, _o, _m, _i, _n, _g, NWL, _t, _o, _r, _p, _e, _d, _o, EXM, NWL, END, }; u16 gMsg_ID_15130[18] = { - NP9, _T, _h, _a, _t, APS, _s, SPC, _i, _t, CMA, SPC, _F, _o, _x, PRD, NWL, + PRI1, _T, _h, _a, _t, APS, _s, SPC, _i, _t, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_15140[20] = { - NP9, _G, _o, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _e, _y, _e, _s, EXM, NWL, + PRI1, _G, _o, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _e, _y, _e, _s, EXM, NWL, END, }; u16 gMsg_ID_15200[28] = { - NP9, _W, _e, APS, _r, _e, SPC, _p, _r, _e, _p, _a, _r, _i, _n, _g, NWL, + PRI1, _W, _e, APS, _r, _e, SPC, _p, _r, _e, _p, _a, _r, _i, _n, _g, NWL, _t, _o, SPC, _d, _o, _c, _k, PRD, NWL, END, }; u16 gMsg_ID_15210[42] = { - NP9, _S, _l, _i, _p, _p, _y, APS, _s, SPC, _n, _o, _t, SPC, _s, _u, _c, _h, SPC, _a, NWL, + PRI1, _S, _l, _i, _p, _p, _y, APS, _s, SPC, _n, _o, _t, SPC, _s, _u, _c, _h, SPC, _a, NWL, _s, _c, _r, _e, _w, SPC, _u, _p, SPC, _a, _f, _t, _e, _r, SPC, _a, _l, _l, PRD, NWL, END, }; u16 gMsg_ID_15220[24] = { - NP9, _T, _h, _a, _n, _k, _s, SPC, _a, SPC, _l, _o, _t, CMA, SPC, _P, _e, _p, _p, _y, EXM, NWL, + PRI1, _T, _h, _a, _n, _k, _s, SPC, _a, SPC, _l, _o, _t, CMA, SPC, _P, _e, _p, _p, _y, EXM, NWL, END, }; u16 gMsg_ID_15230[30] = { - NP9, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _t, _h, _e, SPC, _s, _k, _y, SPC, NWL, + PRI1, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _t, _h, _e, SPC, _s, _k, _y, SPC, NWL, _a, _n, _y, SPC, _d, _a, _y, PRD, NWL, END, }; u16 gMsg_ID_15240[28] = { - NP9, _S, _h, _e, _e, _s, _h, CMA, SPC, _F, _a, _l, _c, _o, EXM, NWL, + PRI1, _S, _h, _e, _e, _s, _h, CMA, SPC, _F, _a, _l, _c, _o, EXM, NWL, _Y, _o, _u, CMA, SPC, _t, _o, _o, QST, NWL, END, }; u16 gMsg_ID_15250[36] = { - NP9, _S, _h, _o, _o, _t, SPC, _a, SPC, _t, _o, _r, _p, _e, _d, _o, SPC, _t, _o, SPC, NWL, + PRI1, _S, _h, _o, _o, _t, SPC, _a, SPC, _t, _o, _r, _p, _e, _d, _o, SPC, _t, _o, SPC, NWL, _h, _e, _l, _p, SPC, _y, _o, _u, SPC, _s, _e, _e, PRD, NWL, END, }; u16 gMsg_ID_15251[38] = { - NP9, _W, _o, _w, EXM, SPC, _L, _o, _o, _k, SPC, _a, _t, SPC, _t, _h, _a, _t, EXM, NWL, + PRI1, _W, _o, _w, EXM, SPC, _L, _o, _o, _k, SPC, _a, _t, SPC, _t, _h, _a, _t, EXM, NWL, _I, _t, APS, _s, SPC, _b, _e, _a, _u, _t, _i, _f, _u, _l, EXM, NWL, END, }; u16 gMsg_ID_15252[24] = { - NP9, _Y, _i, _p, _p, _e, _e, EXM, SPC, NWL, + PRI1, _Y, _i, _p, _p, _e, _e, EXM, SPC, NWL, _Y, _o, _u, SPC, _d, _i, _d, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_15253[42] = { - NP9, _T, _h, _a, _n, _k, _s, CMA, SPC, _S, _l, _i, _p, PRD, NWL, + PRI1, _T, _h, _a, _n, _k, _s, CMA, SPC, _S, _l, _i, _p, PRD, NWL, _B, _l, _u, _e, DSH, _M, _a, _r, _i, _n, _e, NWL, _c, _a, _m, _e, SPC, _t, _h, _r, _o, _u, _g, _h, PRD, NWL, END, @@ -2726,1254 +2726,1254 @@ u16 gMsg_ID_15254[24] = { END, }; u16 gMsg_ID_16010[36] = { - NP9, _E, _n, _e, _m, _y, SPC, _a, _p, _p, _r, _o, _a, _c, _h, _i, _n, _g, NWL, + PRI1, _E, _n, _e, _m, _y, SPC, _a, _p, _p, _r, _o, _a, _c, _h, _i, _n, _g, NWL, _f, _r, _o, _m, SPC, _t, _h, _e, SPC, _l, _e, _f, _t, PRD, NWL, END, }; u16 gMsg_ID_16020[30] = { - NP9, _W, _e, APS, _l, _l, SPC, _g, _l, _a, _d, _l, _y, SPC, _t, _a, _k, _e, NWL, + PRI1, _W, _e, APS, _l, _l, SPC, _g, _l, _a, _d, _l, _y, SPC, _t, _a, _k, _e, NWL, _t, _h, _i, _s, SPC, _o, _n, _e, PRD, NWL, END, }; u16 gMsg_ID_16030[16] = { - NP9, _N, _i, _c, _e, SPC, _w, _e, _l, _c, _o, _m, _e, EXM, NWL, + PRI1, _N, _i, _c, _e, SPC, _w, _e, _l, _c, _o, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_16040[36] = { - NP9, _I, APS, _m, SPC, _h, _e, _a, _d, _i, _n, _g, SPC, _f, _o, _r, SPC, _t, _h, _e, NWL, + PRI1, _I, APS, _m, SPC, _h, _e, _a, _d, _i, _n, _g, SPC, _f, _o, _r, SPC, _t, _h, _e, NWL, _m, _i, _s, _s, _i, _l, _e, SPC, _n, _o, _w, PRD, NWL, END, }; u16 gMsg_ID_16046[30] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _f, _o, _r, SPC, _t, _h, _e, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _f, _o, _r, SPC, _t, _h, _e, NWL, _m, _i, _s, _s, _i, _l, _e, PRD, NWL, END, }; u16 gMsg_ID_16047[36] = { - NP9, _I, APS, _m, SPC, _h, _e, _a, _d, _i, _n, _g, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, NWL, + PRI1, _I, APS, _m, SPC, _h, _e, _a, _d, _i, _n, _g, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, NWL, _m, _i, _s, _s, _i, _l, _e, SPC, _n, _o, _w, PRD, NWL, END, }; u16 gMsg_ID_16050[38] = { - NPA, _S, _i, _x, SPC, _m, _i, _s, _s, _i, _l, _e, _s, SPC, _c, _o, _m, _i, _n, _g, NWL, + PRI2, _S, _i, _x, SPC, _m, _i, _s, _s, _i, _l, _e, _s, SPC, _c, _o, _m, _i, _n, _g, NWL, _f, _r, _o, _m, SPC, _t, _h, _e, SPC, _l, _e, _f, _t, PRD, NWL, END, }; u16 gMsg_ID_16055[40] = { - NPA, _M, _i, _s, _s, _i, _l, _e, SPC, _o, _n, _e, SPC, _i, _s, NWL, + PRI2, _M, _i, _s, _s, _i, _l, _e, SPC, _o, _n, _e, SPC, _i, _s, NWL, _h, _e, _a, _d, _i, _n, _g, SPC, _f, _o, _r, NWL, _G, _r, _e, _a, _t, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_16060[18] = { - NPA, _H, _e, _r, _e, SPC, _i, _t, SPC, _c, _o, _m, _e, _s, EXM, NWL, + PRI2, _H, _e, _r, _e, SPC, _i, _t, SPC, _c, _o, _m, _e, _s, EXM, NWL, END, }; u16 gMsg_ID_16080[36] = { - NPA, _M, _i, _s, _s, _i, _l, _e, SPC, _a, _p, _p, _r, _o, _a, _c, _h, _i, _n, _g, PRD, NWL, + PRI2, _M, _i, _s, _s, _i, _l, _e, SPC, _a, _p, _p, _r, _o, _a, _c, _h, _i, _n, _g, PRD, NWL, _D, _i, _s, _t, _a, _n, _c, _e, SPC, _5, _0, PRD, NWL, END, }; u16 gMsg_ID_16085[36] = { - NPA, _M, _i, _s, _s, _i, _l, _e, SPC, _a, _p, _p, _r, _o, _a, _c, _h, _i, _n, _g, PRD, NWL, + PRI2, _M, _i, _s, _s, _i, _l, _e, SPC, _a, _p, _p, _r, _o, _a, _c, _h, _i, _n, _g, PRD, NWL, _D, _i, _s, _t, _a, _n, _c, _e, SPC, _2, _0, PRD, NWL, END, }; u16 gMsg_ID_16090[32] = { - NPA, _D, _i, _s, _t, _a, _n, _c, _e, SPC, _1, _0, PRD, NWL, + PRI2, _D, _i, _s, _t, _a, _n, _c, _e, SPC, _1, _0, PRD, NWL, _U, _n, _a, _b, _l, _e, SPC, _t, _o, SPC, _e, _v, _a, _d, _e, PRD, NWL, END, }; u16 gMsg_ID_16100[32] = { - NPA, _M, _i, _s, _s, _i, _l, _e, _s, SPC, _2, SPC, _a, _n, _d, SPC, _3, NWL, + PRI2, _M, _i, _s, _s, _i, _l, _e, _s, SPC, _2, SPC, _a, _n, _d, SPC, _3, NWL, _a, _p, _p, _r, _o, _a, _c, _h, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_16110[36] = { - NPA, _M, _i, _s, _s, _i, _l, _e, _s, SPC, _4, CMA, SPC, _5, SPC, _a, _n, _d, SPC, _6, SPC, NWL, + PRI2, _M, _i, _s, _s, _i, _l, _e, _s, SPC, _4, CMA, SPC, _5, SPC, _a, _n, _d, SPC, _6, SPC, NWL, _a, _p, _p, _r, _o, _a, _c, _h, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_16120[34] = { - NPA, _A, _r, _e, SPC, _y, _o, _u, SPC, _g, _o, _n, _n, _a, SPC, _h, _o, _g, NWL, + PRI2, _A, _r, _e, SPC, _y, _o, _u, SPC, _g, _o, _n, _n, _a, SPC, _h, _o, _g, NWL, _a, _l, _l, SPC, _t, _h, _e, SPC, _f, _u, _n, QST, NWL, END, }; u16 gMsg_ID_16125[44] = { - NPA, _K, _a, _t, _t, QST, EXM, SPC, _C, _a, _n, APS, _t, SPC, _y, _o, _u, SPC, _g, _o, NWL, + PRI2, _K, _a, _t, _t, QST, EXM, SPC, _C, _a, _n, APS, _t, SPC, _y, _o, _u, SPC, _g, _o, NWL, _b, _o, _t, _h, _e, _r, SPC, _s, _o, _m, _e, _o, _n, _e, SPC, _e, _l, _s, _e, QST, NWL, END, }; u16 gMsg_ID_16130[24] = { - NP9, _L, _e, _t, SPC, _m, _e, SPC, _h, _e, _l, _p, SPC, _y, _o, _u, SPC, _o, _u, _t, PRD, NWL, + PRI1, _L, _e, _t, SPC, _m, _e, SPC, _h, _e, _l, _p, SPC, _y, _o, _u, SPC, _o, _u, _t, PRD, NWL, END, }; u16 gMsg_ID_16135[22] = { - NP9, _M, _a, _k, _e, SPC, _w, _a, _y, SPC, _f, _o, _r, SPC, _K, _a, _t, _t, EXM, NWL, + PRI1, _M, _a, _k, _e, SPC, _w, _a, _y, SPC, _f, _o, _r, SPC, _K, _a, _t, _t, EXM, NWL, END, }; u16 gMsg_ID_16140[42] = { - NP9, _B, _e, _a, _u, _t, _i, _f, _u, _l, EXM, SPC, _I, SPC, _c, _o, _u, _l, _d, SPC, NWL, + PRI1, _B, _e, _a, _u, _t, _i, _f, _u, _l, EXM, SPC, _I, SPC, _c, _o, _u, _l, _d, SPC, NWL, _k, _i, _s, _s, SPC, _y, _o, _u, SPC, _f, _o, _r, SPC, _t, _h, _a, _t, EXM, NWL, END, }; u16 gMsg_ID_16150[22] = { - NP9, _Y, _o, _u, SPC, _o, _w, _e, SPC, _m, _e, CMA, SPC, _F, _a, _l, _c, _o, PRD, NWL, + PRI1, _Y, _o, _u, SPC, _o, _w, _e, SPC, _m, _e, CMA, SPC, _F, _a, _l, _c, _o, PRD, NWL, END, }; u16 gMsg_ID_16160[46] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _o, _n, SPC, _y, _o, _u, _r, SPC, _o, _w, _n, PRD, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _o, _n, SPC, _y, _o, _u, _r, SPC, _o, _w, _n, PRD, NWL, _G, _o, _o, _d, SPC, _l, _u, _c, _k, CMA, SPC, _l, _i, _t, _t, _l, _e, SPC, NWL, _m, _a, _n, PRD, NWL, END, }; u16 gMsg_ID_16165[24] = { - NP9, _T, _o, _o, SPC, _b, _a, _d, CMA, SPC, _l, _i, _t, _t, _l, _e, SPC, _m, _a, _n, PRD, NWL, + PRI1, _T, _o, _o, SPC, _b, _a, _d, CMA, SPC, _l, _i, _t, _t, _l, _e, SPC, _m, _a, _n, PRD, NWL, END, }; u16 gMsg_ID_16170[20] = { - NP9, _O, _n, _e, SPC, _m, _i, _s, _s, _i, _l, _e, SPC, _d, _o, _w, _n, PRD, NWL, + PRI1, _O, _n, _e, SPC, _m, _i, _s, _s, _i, _l, _e, SPC, _d, _o, _w, _n, PRD, NWL, END, }; u16 gMsg_ID_16175[26] = { - NP9, _O, _n, _e, SPC, _m, _i, _s, _s, _i, _l, _e, SPC, NWL, + PRI1, _O, _n, _e, SPC, _m, _i, _s, _s, _i, _l, _e, SPC, NWL, _d, _e, _s, _t, _r, _o, _y, _e, _d, PRD, NWL, END, }; u16 gMsg_ID_16180[24] = { - NP9, _S, _c, _r, _a, _t, _c, _h, SPC, _o, _n, _e, SPC, _m, _i, _s, _s, _i, _l, _e, PRD, NWL, + PRI1, _S, _c, _r, _a, _t, _c, _h, SPC, _o, _n, _e, SPC, _m, _i, _s, _s, _i, _l, _e, PRD, NWL, END, }; u16 gMsg_ID_16185[38] = { - NP9, _I, SPC, _t, _o, _o, _k, SPC, _c, _a, _r, _e, SPC, _o, _f, SPC, _a, NWL, + PRI1, _I, SPC, _t, _o, _o, _k, SPC, _c, _a, _r, _e, SPC, _o, _f, SPC, _a, NWL, _m, _i, _s, _s, _i, _l, _e, SPC, _f, _o, _r, SPC, _y, _a, PRD, NWL, SPC, NWL, END, }; u16 gMsg_ID_16200[26] = { - NP9, _R, _O, _B, CMA, SPC, _i, _s, NWL, + PRI1, _R, _O, _B, CMA, SPC, _i, _s, NWL, _e, _v, _e, _r, _y, _t, _h, _i, _n, _g, SPC, _O, _K, QST, NWL, END, }; u16 gMsg_ID_16210[44] = { - NP9, _D, _a, _m, _a, _g, _e, SPC, _t, _o, SPC, _r, _e, _a, _r, SPC, _l, _e, _f, _t, NWL, + PRI1, _D, _a, _m, _a, _g, _e, SPC, _t, _o, SPC, _r, _e, _a, _r, SPC, _l, _e, _f, _t, NWL, _s, _e, _c, _t, _i, _o, _n, SPC, _o, _f, SPC, _t, _h, _e, SPC, _s, _h, _i, _p, PRD, NWL, END, }; u16 gMsg_ID_16220[30] = { - NP9, _D, _a, _n, _g, CMA, SPC, _n, _o, _w, SPC, _t, _h, _e, _y, APS, _v, _e, NWL, + PRI1, _D, _a, _n, _g, CMA, SPC, _n, _o, _w, SPC, _t, _h, _e, _y, APS, _v, _e, NWL, _d, _o, _n, _e, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_16230[42] = { - NP9, _I, _t, SPC, _c, _o, _u, _l, _d, SPC, _b, _e, NWL, + PRI1, _I, _t, SPC, _c, _o, _u, _l, _d, SPC, _b, _e, NWL, _d, _i, _f, _f, _i, _c, _u, _l, _t, SPC, _t, _o, SPC, _a, _t, _t, _a, _c, _k, NWL, _V, _e, _n, _o, _m, PRD, NWL, END, }; u16 gMsg_ID_16240[14] = { - NP9, _D, _o, _g, _g, _o, _n, _e, SPC, _i, _t, EXM, NWL, + PRI1, _D, _o, _g, _g, _o, _n, _e, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_16250[20] = { - NP9, _G, _r, _e, _a, _t, SPC, _F, _o, _x, SPC, _i, _s, SPC, _O, _K, PRD, NWL, + PRI1, _G, _r, _e, _a, _t, SPC, _F, _o, _x, SPC, _i, _s, SPC, _O, _K, PRD, NWL, END, }; u16 gMsg_ID_16260[26] = { - NP9, _T, _h, _a, _t, SPC, _w, _a, _s, SPC, _a, SPC, _c, _l, _o, _s, _e, SPC, NWL, + PRI1, _T, _h, _a, _t, SPC, _w, _a, _s, SPC, _a, SPC, _c, _l, _o, _s, _e, SPC, NWL, _c, _a, _l, _l, PRD, NWL, END, }; u16 gMsg_ID_16270[38] = { - NP9, _W, _e, APS, _v, _e, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _b, _a, _d, NWL, + PRI1, _W, _e, APS, _v, _e, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _b, _a, _d, NWL, _g, _u, _y, _s, SPC, _o, _n, SPC, _t, _h, _e, SPC, _r, _u, _n, PRD, NWL, END, }; u16 gMsg_ID_16280[30] = { - NP9, _D, _o, _n, APS, _t, SPC, _w, _o, _r, _r, _y, PRD, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _w, _o, _r, _r, _y, PRD, NWL, _S, _l, _i, _p, _p, _y, APS, _s, SPC, _h, _e, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_17010[40] = { - NP9, _I, SPC, _s, _p, _o, _t, SPC, _t, _h, _e, SPC, _t, _r, _a, _i, _n, PRD, NWL, + PRI1, _I, SPC, _s, _p, _o, _t, SPC, _t, _h, _e, SPC, _t, _r, _a, _i, _n, PRD, NWL, _I, APS, _m, SPC, _t, _a, _k, _i, _n, APS, SPC, _i, _t, SPC, _o, _u, _t, EXM, NWL, END, }; u16 gMsg_ID_17020[40] = { - NP9, _H, _e, _y, CMA, SPC, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _m, _y, NWL, + PRI1, _H, _e, _y, CMA, SPC, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _m, _y, NWL, _h, _a, _n, _d, _s, SPC, _f, _u, _l, _l, SPC, _u, _p, SPC, _h, _e, _r, _e, PRD, NWL, END, }; u16 gMsg_ID_17030[42] = { - NP9, _D, _o, _n, APS, _t, SPC, _l, _e, _t, SPC, APS, _e, _m, SPC, _g, _e, _t, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _l, _e, _t, SPC, APS, _e, _m, SPC, _g, _e, _t, NWL, _t, _o, SPC, _t, _h, _e, SPC, _s, _u, _p, _p, _l, _y, SPC, _d, _e, _p, _o, _t, EXM, NWL, END, }; u16 gMsg_ID_17100[46] = { - NPA, _I, SPC, _s, _e, _e, SPC, _t, _h, _e, SPC, _f, _u, _e, _l, SPC, NWL, + PRI2, _I, SPC, _s, _e, _e, SPC, _t, _h, _e, SPC, _f, _u, _e, _l, SPC, NWL, _b, _u, _n, _k, _e, _r, SPC, _o, _n, SPC, _t, _h, _e, SPC, NWL, _r, _i, _g, _h, _t, SPC, _s, _i, _d, _e, PRD, NWL, END, }; u16 gMsg_ID_17110[28] = { - NPA, _C, _h, _a, _n, _g, _e, SPC, _t, _h, _e, SPC, _s, _w, _i, _t, _c, _h, NWL, + PRI2, _C, _h, _a, _n, _g, _e, SPC, _t, _h, _e, SPC, _s, _w, _i, _t, _c, _h, NWL, _a, _h, _e, _a, _d, PRD, NWL, END, }; u16 gMsg_ID_17120[42] = { - NPA, _S, _h, _o, _o, _t, SPC, _t, _h, _e, SPC, _8, SPC, NWL, + PRI2, _S, _h, _o, _o, _t, SPC, _t, _h, _e, SPC, _8, SPC, NWL, _s, _w, _i, _t, _c, _h, _e, _s, SPC, _t, _o, SPC, _o, _p, _e, _n, NWL, _t, _h, _e, SPC, _l, _o, _c, _k, PRD, NWL, END, }; u16 gMsg_ID_17130[42] = { - NPA, _S, _t, _a, _r, _t, _i, _n, APS, SPC, _w, _i, _t, _h, _o, _u, _t, NWL, + PRI2, _S, _t, _a, _r, _t, _i, _n, APS, SPC, _w, _i, _t, _h, _o, _u, _t, NWL, _m, _e, QST, SPC, _B, _o, _y, _s, CMA, SPC, _I, APS, _m, NWL, _c, _r, _u, _s, _h, _e, _d, PRD, NWL, END, }; u16 gMsg_ID_17131[26] = { - NPA, _K, _a, _t, _t, QST, EXM, SPC, NWL, + PRI2, _K, _a, _t, _t, QST, EXM, SPC, NWL, _N, _o, _t, SPC, _y, _o, _u, SPC, _a, _g, _a, _i, _n, PRD, NWL, END, }; u16 gMsg_ID_17140[48] = { - NP9, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _l, _e, _f, _t, PRD, NWL, + PRI1, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _t, _h, _e, SPC, _l, _e, _f, _t, PRD, NWL, _Y, _o, _u, SPC, _t, _a, _k, _e, SPC, _t, _h, _e, SPC, _r, _i, _g, _h, _t, CMA, SPC, NWL, _h, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_17150[30] = { - NPA, _O, _K, EXM, SPC, _N, _o, _w, SPC, _s, _h, _o, _o, _t, NWL, + PRI2, _O, _K, EXM, SPC, _N, _o, _w, SPC, _s, _h, _o, _o, _t, NWL, _t, _h, _e, SPC, _s, _w, _i, _t, _c, _h, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_17160[20] = { - NP9, _G, _o, _o, _d, SPC, _g, _o, _i, _n, _g, CMA, SPC, _F, _o, _x, PRD, NWL, + PRI1, _G, _o, _o, _d, SPC, _g, _o, _i, _n, _g, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_17170[46] = { - NP9, _W, _e, _l, _l, CMA, SPC, _a, _t, SPC, _l, _e, _a, _s, _t, SPC, _w, _e, NWL, + PRI1, _W, _e, _l, _l, CMA, SPC, _a, _t, SPC, _l, _e, _a, _s, _t, SPC, _w, _e, NWL, _c, _a, _n, SPC, _t, _a, _k, _e, SPC, _t, _h, _i, _s, SPC, _b, _o, _s, _s, SPC, NWL, _o, _u, _t, PRD, NWL, END, }; u16 gMsg_ID_17300[46] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _p, _r, _e, _t, _t, _y, SPC, _g, _o, _o, _d, CMA, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _p, _r, _e, _t, _t, _y, SPC, _g, _o, _o, _d, CMA, NWL, _t, _i, _g, _e, _r, PRD, SPC, _S, _e, _e, SPC, _y, _o, _u, SPC, NWL, _a, _g, _a, _i, _n, EXM, NWL, END, }; u16 gMsg_ID_17310[34] = { - NP9, _I, APS, _m, SPC, _s, _u, _r, _e, SPC, _w, _e, SPC, _h, _u, _r, _t, NWL, + PRI1, _I, APS, _m, SPC, _s, _u, _r, _e, SPC, _w, _e, SPC, _h, _u, _r, _t, NWL, APS, _e, _m, SPC, _t, _h, _i, _s, SPC, _t, _i, _m, _e, PRD, NWL, END, }; u16 gMsg_ID_17320[40] = { - NP9, _N, _o, _w, SPC, _i, _t, APS, _s, SPC, _o, _u, _r, SPC, _t, _u, _r, _n, NWL, + PRI1, _N, _o, _w, SPC, _i, _t, APS, _s, SPC, _o, _u, _r, SPC, _t, _u, _r, _n, NWL, _t, _o, SPC, _k, _i, _c, _k, SPC, _s, _o, _m, _e, SPC, _t, _a, _i, _l, EXM, NWL, END, }; u16 gMsg_ID_17330[46] = { - NP9, _I, SPC, _c, _a, _n, SPC, _s, _e, _e, SPC, _t, _h, _e, SPC, _l, _o, _o, _k, NWL, + PRI1, _I, SPC, _c, _a, _n, SPC, _s, _e, _e, SPC, _t, _h, _e, SPC, _l, _o, _o, _k, NWL, _o, _n, SPC, _t, _h, _e, _i, _r, SPC, _s, _t, _u, _p, _i, _d, SPC, NWL, _f, _a, _c, _e, _s, EXM, NWL, END, }; u16 gMsg_ID_17350[38] = { - NPA, _I, APS, _m, SPC, _o, _u, _t, _t, _a, SPC, _h, _e, _r, _e, PRD, SPC, NWL, + PRI2, _I, APS, _m, SPC, _o, _u, _t, _t, _a, SPC, _h, _e, _r, _e, PRD, SPC, NWL, _T, _a, _k, _e, SPC, _c, _a, _r, _e, CMA, SPC, _F, _a, _l, _c, _o, PRD, NWL, END, }; u16 gMsg_ID_17360[38] = { - NP9, _H, _e, _r, _e, SPC, _c, _o, _m, _e, SPC, _t, _h, _e, SPC, NWL, + PRI1, _H, _e, _r, _e, SPC, _c, _o, _m, _e, SPC, _t, _h, _e, SPC, NWL, _l, _i, _t, _t, _l, _e, SPC, _h, _y, _e, _n, _a, _s, CMA, SPC, _n, _o, _w, EXM, NWL, END, }; u16 gMsg_ID_17370[34] = { - NP9, _D, _a, _n, _g, EXM, SPC, _D, _e, _t, _a, _c, _h, SPC, _t, _h, _e, NWL, + PRI1, _D, _a, _n, _g, EXM, SPC, _D, _e, _t, _a, _c, _h, SPC, _t, _h, _e, NWL, _r, _e, _a, _r, SPC, _v, _e, _h, _i, _c, _l, _e, PRD, NWL, END, }; u16 gMsg_ID_17380[38] = { - NP9, _W, _h, _a, _t, APS, _s, SPC, _w, _r, _o, _n, _g, QST, SPC, _C, _o, _m, _e, NWL, + PRI1, _W, _h, _a, _t, APS, _s, SPC, _w, _r, _o, _n, _g, QST, SPC, _C, _o, _m, _e, NWL, _a, SPC, _l, _i, _t, _t, _l, _e, SPC, _c, _l, _o, _s, _e, _r, EXM, NWL, END, }; u16 gMsg_ID_17390[14] = { - NP9, _H, _e, _r, _e, SPC, _y, _a, SPC, _g, _o, EXM, NWL, + PRI1, _H, _e, _r, _e, SPC, _y, _a, SPC, _g, _o, EXM, NWL, END, }; u16 gMsg_ID_17400[36] = { - NP9, _T, _h, _e, _y, APS, _r, _e, SPC, _n, _o, _t, SPC, _t, _a, _k, _i, _n, _g, NWL, + PRI1, _T, _h, _e, _y, APS, _r, _e, SPC, _n, _o, _t, SPC, _t, _a, _k, _i, _n, _g, NWL, _m, _e, SPC, _s, _e, _r, _i, _o, _u, _s, _l, _y, PRD, NWL, END, }; u16 gMsg_ID_17410[38] = { - NP9, _I, APS, _l, _l, SPC, _l, _u, _r, _e, SPC, _t, _h, _e, _s, _e, SPC, NWL, + PRI1, _I, APS, _l, _l, SPC, _l, _u, _r, _e, SPC, _t, _h, _e, _s, _e, SPC, NWL, _g, _u, _y, _s, SPC, _t, _o, SPC, _t, _h, _e, SPC, _f, _r, _o, _n, _t, PRD, NWL, END, }; u16 gMsg_ID_17420[40] = { - NP9, _I, SPC, _d, _i, _d, _n, APS, _t, SPC, _e, _x, _p, _e, _c, _t, SPC, _t, _o, NWL, + PRI1, _I, SPC, _d, _i, _d, _n, APS, _t, SPC, _e, _x, _p, _e, _c, _t, SPC, _t, _o, NWL, _h, _a, _v, _e, SPC, _t, _o, SPC, _u, _s, _e, SPC, _t, _h, _i, _s, EXM, NWL, END, }; u16 gMsg_ID_17430[22] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _v, _e, _r, _y, SPC, _l, _u, _c, _k, _y, PRD, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _v, _e, _r, _y, SPC, _l, _u, _c, _k, _y, PRD, NWL, END, }; u16 gMsg_ID_17440[12] = { - NP9, _G, _w, _a, _a, _a, EXM, EXM, EXM, NWL, + PRI1, _G, _w, _a, _a, _a, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_17450[18] = { - NPA, _N, _o, EXM, EXM, NWL, + PRI2, _N, _o, EXM, EXM, NWL, _G, _e, _t, SPC, _a, _w, _a, _y, EXM, EXM, NWL, END, }; u16 gMsg_ID_17460[32] = { - NP9, _H, _e, _h, SPC, _h, _e, _h, SPC, _h, _e, _h, PRD, PRD, PRD, NWL, + PRI1, _H, _e, _h, SPC, _h, _e, _h, SPC, _h, _e, _h, PRD, PRD, PRD, NWL, _w, _h, _a, _t, APS, _s, SPC, _w, _r, _o, _n, _g, QST, NWL, END, }; u16 gMsg_ID_17470[12] = { - NP9, _T, _r, _y, SPC, _t, _h, _i, _s, EXM, NWL, + PRI1, _T, _r, _y, SPC, _t, _h, _i, _s, EXM, NWL, END, }; u16 gMsg_ID_17471[26] = { - NP9, _N, _O, EXM, SPC, NWL, + PRI1, _N, _O, EXM, SPC, NWL, _H, _i, _t, SPC, _t, _h, _e, SPC, _b, _r, _a, _k, _e, _s, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_17472[20] = { - NP9, _I, SPC, _c, _a, _n, APS, _t, SPC, _S, _T, _O, _P, SPC, _I, _T, EXM, NWL, + PRI1, _I, SPC, _c, _a, _n, APS, _t, SPC, _S, _T, _O, _P, SPC, _I, _T, EXM, NWL, END, }; u16 gMsg_ID_17473[20] = { - NP9, _S, _t, _e, _p, SPC, _o, _n, SPC, _t, _h, _e, SPC, _g, _a, _s, EXM, NWL, + PRI1, _S, _t, _e, _p, SPC, _o, _n, SPC, _t, _h, _e, SPC, _g, _a, _s, EXM, NWL, END, }; u16 gMsg_ID_17474[30] = { - NP9, _H, _o, _w, APS, _s, SPC, _t, _h, _e, SPC, NWL, + PRI1, _H, _o, _w, APS, _s, SPC, _t, _h, _e, SPC, NWL, _L, _a, _n, _d, _m, _a, _s, _t, _e, _r, CMA, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_17475[38] = { - NPA, _Y, _o, _u, APS, _r, _e, SPC, _t, _o, _o, SPC, _s, _l, _o, _w, PRD, NWL, + PRI2, _Y, _o, _u, APS, _r, _e, SPC, _t, _o, _o, SPC, _s, _l, _o, _w, PRD, NWL, _T, _i, _m, _e, SPC, _t, _o, SPC, _e, _n, _d, SPC, _t, _h, _i, _s, EXM, NWL, END, }; u16 gMsg_ID_17476[14] = { - NP9, _T, _a, _k, _e, SPC, _t, _h, _i, _s, EXM, NWL, + PRI1, _T, _a, _k, _e, SPC, _t, _h, _i, _s, EXM, NWL, END, }; u16 gMsg_ID_18000[38] = { - NP9, _H, _a, _n, _g, SPC, _o, _n, CMA, SPC, _g, _u, _y, _s, PRD, NWL, + PRI1, _H, _a, _n, _g, SPC, _o, _n, CMA, SPC, _g, _u, _y, _s, PRD, NWL, _H, _e, _l, _p, SPC, _i, _s, SPC, _o, _n, SPC, _t, _h, _e, SPC, _w, _a, _y, EXM, NWL, END, }; u16 gMsg_ID_18005[20] = { - NP9, _F, _o, _x, EXM, SPC, _Y, _o, _u, SPC, _m, _a, _d, _e, SPC, _i, _t, EXM, NWL, + PRI1, _F, _o, _x, EXM, SPC, _Y, _o, _u, SPC, _m, _a, _d, _e, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_18006[42] = { - NP9, _B, _i, _l, _l, QST, EXM, SPC, _I, _s, SPC, _t, _h, _a, _t, SPC, _y, _o, _u, QST, NWL, + PRI1, _B, _i, _l, _l, QST, EXM, SPC, _I, _s, SPC, _t, _h, _a, _t, SPC, _y, _o, _u, QST, NWL, _I, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, _l, _i, _e, _v, _e, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_18007[30] = { - NP9, _W, _e, SPC, _c, _a, _n, SPC, _c, _a, _t, _c, _h, SPC, _u, _p, NWL, + PRI1, _W, _e, SPC, _c, _a, _n, SPC, _c, _a, _t, _c, _h, SPC, _u, _p, NWL, _l, _a, _t, _e, _r, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_18010[44] = { - NP9, _H, _a, _r, _d, SPC, _t, _o, SPC, _t, _e, _l, _l, SPC, _t, _h, _e, NWL, + PRI1, _H, _a, _r, _d, SPC, _t, _o, SPC, _t, _e, _l, _l, SPC, _t, _h, _e, NWL, _g, _o, _o, _d, SPC, _g, _u, _y, _s, SPC, _f, _r, _o, _m, SPC, _t, _h, _e, SPC, NWL, _b, _a, _d, EXM, NWL, END, }; u16 gMsg_ID_18015[34] = { - NP9, _T, _r, _y, SPC, _s, _h, _o, _o, _t, _i, _n, _g, SPC, _t, _h, _e, NWL, + PRI1, _T, _r, _y, SPC, _s, _h, _o, _o, _t, _i, _n, _g, SPC, _t, _h, _e, NWL, _b, _a, _d, SPC, _g, _u, _y, _s, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_18018[28] = { - NP9, _F, _o, _x, CMA, SPC, _t, _h, _a, _t, APS, _s, SPC, _o, _n, _e, SPC, _o, _f, SPC, NWL, + PRI1, _F, _o, _x, CMA, SPC, _t, _h, _a, _t, APS, _s, SPC, _o, _n, _e, SPC, _o, _f, SPC, NWL, _o, _u, _r, _s, EXM, NWL, END, }; u16 gMsg_ID_18020[30] = { - NP9, _H, _u, _s, _k, _y, SPC, _u, _n, _i, _t, CMA, NWL, + PRI1, _H, _u, _s, _k, _y, SPC, _u, _n, _i, _t, CMA, NWL, _c, _o, _v, _e, _r, SPC, _t, _h, _e, SPC, _b, _a, _s, _e, EXM, NWL, END, }; u16 gMsg_ID_18021[48] = { - NP9, _B, _u, _l, _l, _d, _o, _g, SPC, _u, _n, _i, _t, CMA, SPC, _d, _o, _n, APS, _t, SPC, SPC, SPC, NWL, + PRI1, _B, _u, _l, _l, _d, _o, _g, SPC, _u, _n, _i, _t, CMA, SPC, _d, _o, _n, APS, _t, SPC, SPC, SPC, NWL, _l, _e, _t, SPC, _a, _n, _y, _t, _h, _i, _n, _g, SPC, NWL, _t, _h, _r, _o, _u, _g, _h, EXM, NWL, END, }; u16 gMsg_ID_18022[20] = { - NP9, _A, _l, _l, SPC, _u, _n, _i, _t, _s, SPC, _r, _e, _p, _o, _r, _t, EXM, NWL, + PRI1, _A, _l, _l, SPC, _u, _n, _i, _t, _s, SPC, _r, _e, _p, _o, _r, _t, EXM, NWL, END, }; u16 gMsg_ID_18025[44] = { - NP9, _M, _a, _n, CMA, SPC, _t, _h, _e, _r, _e, APS, _s, SPC, _j, _u, _s, _t, SPC, NWL, + PRI1, _M, _a, _n, CMA, SPC, _t, _h, _e, _r, _e, APS, _s, SPC, _j, _u, _s, _t, SPC, NWL, _n, _o, SPC, _e, _n, _d, SPC, _t, _o, SPC, _t, _h, _e, _s, _e, SPC, NWL, _g, _u, _y, _s, EXM, NWL, END, }; u16 gMsg_ID_18030[32] = { - NPA, _E, _n, _e, _m, _y, SPC, _m, _o, _t, _h, _e, _r, _s, _h, _i, _p, NWL, + PRI2, _E, _n, _e, _m, _y, SPC, _m, _o, _t, _h, _e, _r, _s, _h, _i, _p, NWL, _a, _p, _p, _r, _o, _a, _c, _h, _i, _n, _g, PRD, NWL, END, }; u16 gMsg_ID_18031[32] = { - NP9, _Y, _o, _u, APS, _v, _e, SPC, _b, _e, _c, _o, _m, _e, SPC, _q, _u, _i, _t, _e, SPC, NWL, + PRI1, _Y, _o, _u, APS, _v, _e, SPC, _b, _e, _c, _o, _m, _e, SPC, _q, _u, _i, _t, _e, SPC, NWL, _a, SPC, _p, _i, _l, _o, _t, PRD, NWL, END, }; u16 gMsg_ID_18035[18] = { - NP9, _H, _e, _r, _e, SPC, _t, _h, _e, _y, SPC, _c, _o, _m, _e, EXM, NWL, + PRI1, _H, _e, _r, _e, SPC, _t, _h, _e, _y, SPC, _c, _o, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_18040[44] = { - NPA, _G, _o, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _4, SPC, NWL, + PRI2, _G, _o, SPC, _f, _o, _r, SPC, _t, _h, _e, SPC, _4, SPC, NWL, _h, _a, _t, _c, _h, _e, _s, SPC, _o, _n, SPC, _t, _h, _e, SPC, NWL, _u, _n, _d, _e, _r, _s, _i, _d, _e, EXM, NWL, END, }; u16 gMsg_ID_18045[24] = { - NPA, _T, _h, _e, SPC, _h, _a, _t, _c, _h, _e, _s, SPC, _a, _r, _e, NWL, + PRI2, _T, _h, _e, SPC, _h, _a, _t, _c, _h, _e, _s, SPC, _a, _r, _e, NWL, _o, _p, _e, _n, EXM, NWL, END, }; u16 gMsg_ID_18050[40] = { - NP9, _T, _h, _e, _r, _e, APS, _s, SPC, _s, _o, _m, _e, SPC, _s, _o, _r, _t, NWL, + PRI1, _T, _h, _e, _r, _e, APS, _s, SPC, _s, _o, _m, _e, SPC, _s, _o, _r, _t, NWL, _o, _f, SPC, _e, _n, _e, _r, _g, _y, SPC, _r, _e, _a, _c, _t, _i, _o, _n, EXM, NWL, END, }; u16 gMsg_ID_18055[48] = { - NPA, _T, _h, _e, SPC, _c, _o, _r, _e, SPC, _h, _a, _s, SPC, NWL, + PRI2, _T, _h, _e, SPC, _c, _o, _r, _e, SPC, _h, _a, _s, SPC, NWL, _a, _p, _p, _e, _a, _r, _e, _d, EXM, SPC, _S, _t, _a, _n, _d, SPC, _b, _y, SPC, NWL, _t, _o, SPC, _a, _t, _t, _a, _c, _k, EXM, NWL, END, }; u16 gMsg_ID_18060[36] = { - NPA, _H, _u, _r, _r, _y, SPC, _u, _p, SPC, _a, _n, _d, SPC, _t, _a, _k, _e, SPC, NWL, + PRI2, _H, _u, _r, _r, _y, SPC, _u, _p, SPC, _a, _n, _d, SPC, _t, _a, _k, _e, SPC, NWL, _o, _u, _t, SPC, _t, _h, _a, _t, SPC, _c, _o, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_18065[38] = { - NP9, _T, _h, _e, _r, _e, APS, _s, SPC, _n, _o, _t, SPC, _m, _u, _c, _h, SPC, NWL, + PRI1, _T, _h, _e, _r, _e, APS, _s, SPC, _n, _o, _t, SPC, _m, _u, _c, _h, SPC, NWL, _t, _i, _m, _e, SPC, _l, _e, _f, _t, EXM, SPC, _H, _u, _r, _r, _y, EXM, NWL, END, }; u16 gMsg_ID_18066[26] = { - NPA, _Y, _e, _e, SPC, _h, _a, _a, _a, _a, EXM, NWL, + PRI2, _Y, _e, _e, SPC, _h, _a, _a, _a, _a, EXM, NWL, _Y, _o, _u, SPC, _d, _i, _d, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_18070[30] = { - NP9, _F, _o, _x, CMA, SPC, _g, _e, _t, SPC, _o, _u, _t, SPC, _o, _f, SPC, NWL, + PRI1, _F, _o, _x, CMA, SPC, _g, _e, _t, SPC, _o, _u, _t, SPC, _o, _f, SPC, NWL, _h, _e, _r, _e, SPC, _N, _O, _W, EXM, NWL, END, }; u16 gMsg_ID_18075[32] = { - NP9, PRD, PRD, PRD, _A, _l, _l, SPC, _a, _i, _r, _c, _r, _a, _f, _t, CMA, NWL, + PRI1, PRD, PRD, PRD, _A, _l, _l, SPC, _a, _i, _r, _c, _r, _a, _f, _t, CMA, NWL, _b, _r, _e, _a, _k, SPC, _a, _w, _a, _y, EXM, NWL, END, }; u16 gMsg_ID_18080[16] = { - NP9, _D, _a, _n, _g, PRD, PRD, PRD, PRD, PRD, PRD, PRD, PRD, NWL, + PRI1, _D, _a, _n, _g, PRD, PRD, PRD, PRD, PRD, PRD, PRD, PRD, NWL, END, }; u16 gMsg_ID_18085[28] = { - NP9, _D, _o, _n, APS, _t, SPC, _g, _e, _t, SPC, _s, _o, SPC, _d, _o, _w, _n, CMA, SPC, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _g, _e, _t, SPC, _s, _o, SPC, _d, _o, _w, _n, CMA, SPC, NWL, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_18090[18] = { - NP9, _T, _a, _k, _e, SPC, _c, _a, _r, _e, CMA, SPC, _F, _o, _x, PRD, NWL, + PRI1, _T, _a, _k, _e, SPC, _c, _a, _r, _e, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_18095[20] = { - NP9, _Y, _o, _u, CMA, SPC, _t, _o, _o, PRD, PRD, PRD, PRD, _B, _i, _l, _l, PRD, NWL, + PRI1, _Y, _o, _u, CMA, SPC, _t, _o, _o, PRD, PRD, PRD, PRD, _B, _i, _l, _l, PRD, NWL, END, }; u16 gMsg_ID_18100[42] = { - NP9, _I, APS, _m, SPC, _g, _l, _a, _d, SPC, _w, _e, APS, _r, _e, SPC, _o, _n, SPC, NWL, + PRI1, _I, APS, _m, SPC, _g, _l, _a, _d, SPC, _w, _e, APS, _r, _e, SPC, _o, _n, SPC, NWL, _t, _h, _e, SPC, _s, _a, _m, _e, SPC, _t, _e, _a, _m, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_18105[18] = { - NP9, _Y, _o, _u, SPC, _o, _w, _e, SPC, _m, _e, SPC, _o, _n, _e, PRD, NWL, + PRI1, _Y, _o, _u, SPC, _o, _w, _e, SPC, _m, _e, SPC, _o, _n, _e, PRD, NWL, END, }; u16 gMsg_ID_18120[32] = { - NPA, _J, _u, _s, _t, SPC, _l, _i, _k, _e, SPC, _o, _l, _d, SPC, _t, _i, _m, _e, _s, CMA, NWL, + PRI2, _J, _u, _s, _t, SPC, _l, _i, _k, _e, SPC, _o, _l, _d, SPC, _t, _i, _m, _e, _s, CMA, NWL, _e, _h, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_18130[28] = { - NPA, _S, _t, _i, _c, _k, SPC, _a, _r, _o, _u, _n, _d, SPC, _f, _o, _r, SPC, NWL, + PRI2, _S, _t, _i, _c, _k, SPC, _a, _r, _o, _u, _n, _d, SPC, _f, _o, _r, SPC, NWL, _a, _w, _h, _i, _l, _e, PRD, NWL, END, }; u16 gMsg_ID_18140[34] = { - NPA, _H, _e, _r, _e, APS, _s, SPC, _s, _o, _m, _e, _t, _h, _i, _n, _g, SPC, NWL, + PRI2, _H, _e, _r, _e, APS, _s, SPC, _s, _o, _m, _e, _t, _h, _i, _n, _g, SPC, NWL, _f, _o, _r, SPC, _y, _a, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_18150[46] = { - NP9, _E, _n, _e, _m, _y, SPC, _d, _o, _w, _n, PRD, PRD, PRD, PRD, NWL, + PRI1, _E, _n, _e, _m, _y, SPC, _d, _o, _w, _n, PRD, PRD, PRD, PRD, NWL, _W, _a, _i, _t, CMA, SPC, _t, _h, _a, _t, SPC, _w, _a, _s, SPC, _o, _n, _e, NWL, _o, _f, SPC, _o, _u, _r, _s, EXM, NWL, END, }; u16 gMsg_ID_19010[30] = { - NP9, _S, _a, _y, SPC, _y, _o, _u, _r, SPC, _p, _r, _a, _y, _e, _r, _s, CMA, NWL, + PRI1, _S, _a, _y, SPC, _y, _o, _u, _r, SPC, _p, _r, _a, _y, _e, _r, _s, CMA, NWL, _A, _n, _d, _r, _o, _s, _s, EXM, NWL, END, }; u16 gMsg_ID_19205[14] = { - NP9, _H, _u, _h, QST, SPC, _W, _h, _a, _t, QST, EXM, NWL, + PRI1, _H, _u, _h, QST, SPC, _W, _h, _a, _t, QST, EXM, NWL, END, }; u16 gMsg_ID_19200[34] = { - NP9, _D, _o, _n, APS, _t, SPC, _g, _e, _t, SPC, _t, _o, _o, SPC, _c, _o, _c, _k, _y, CMA, SPC, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _g, _e, _t, SPC, _t, _o, _o, SPC, _c, _o, _c, _k, _y, CMA, SPC, NWL, _S, _t, _a, _r, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_19210[44] = { - NP9, _L, _e, _t, APS, _s, SPC, _s, _e, _e, SPC, _h, _o, _w, SPC, _y, _o, _u, NWL, + PRI1, _L, _e, _t, APS, _s, SPC, _s, _e, _e, SPC, _h, _o, _w, SPC, _y, _o, _u, NWL, _h, _a, _n, _d, _l, _e, SPC, _o, _u, _r, SPC, _n, _e, _w, SPC, NWL, _s, _h, _i, _p, _s, EXM, NWL, END, }; u16 gMsg_ID_19220[42] = { - NP9, _T, _o, _o, SPC, _b, _a, _d, SPC, _d, _a, _d, APS, _s, SPC, _n, _o, _t, SPC, NWL, + PRI1, _T, _o, _o, SPC, _b, _a, _d, SPC, _d, _a, _d, APS, _s, SPC, _n, _o, _t, SPC, NWL, _h, _e, _r, _e, SPC, _t, _o, SPC, _s, _e, _e, SPC, _y, _a, SPC, _F, _A, _I, _L, EXM, NWL, END, }; u16 gMsg_ID_19230[44] = { - NP9, _W, _e, APS, _l, _l, SPC, _m, _a, _k, _e, SPC, _s, _u, _r, _e, NWL, + PRI1, _W, _e, APS, _l, _l, SPC, _m, _a, _k, _e, SPC, _s, _u, _r, _e, NWL, _y, _o, _u, SPC, _n, _e, _v, _e, _r, SPC, _r, _e, _a, _c, _h, SPC, NWL, _A, _n, _d, _r, _o, _s, _s, EXM, NWL, END, }; u16 gMsg_ID_19240[42] = { - NPA, _W, _e, APS, _l, _l, SPC, _j, _u, _s, _t, SPC, _s, _e, _e, SPC, NWL, + PRI2, _W, _e, APS, _l, _l, SPC, _j, _u, _s, _t, SPC, _s, _e, _e, SPC, NWL, _a, _b, _o, _u, _t, SPC, _t, _h, _a, _t, CMA, NWL, _S, _t, _a, _r, SPC, _W, _o, _l, _f, PRD, NWL, END, }; u16 gMsg_ID_19250[26] = { - NPA, _Y, _o, _u, SPC, _g, _u, _y, _s, SPC, _d, _o, _n, APS, _t, NWL, + PRI2, _Y, _o, _u, SPC, _g, _u, _y, _s, SPC, _d, _o, _n, APS, _t, NWL, _g, _i, _v, _e, SPC, _u, _p, PRD, NWL, END, }; u16 gMsg_ID_19325[32] = { - NPA, _N, _o, _w, SPC, _y, _o, _u, SPC, _w, _i, _l, _l, SPC, _f, _e, _e, _l, SPC, NWL, + PRI2, _N, _o, _w, SPC, _y, _o, _u, SPC, _w, _i, _l, _l, SPC, _f, _e, _e, _l, SPC, NWL, _T, _R, _U, _E, SPC, _p, _a, _i, _n, EXM, NWL, END, }; u16 gMsg_ID_19330[42] = { - NPA, _O, _n, _l, _y, SPC, _I, SPC, _h, _a, _v, _e, SPC, _t, _h, _e, SPC, NWL, + PRI2, _O, _n, _l, _y, SPC, _I, SPC, _h, _a, _v, _e, SPC, _t, _h, _e, SPC, NWL, _b, _r, _a, _i, _n, _s, SPC, _t, _o, SPC, _r, _u, _l, _e, SPC, NWL, _L, _y, _l, _a, _t, EXM, NWL, END, }; u16 gMsg_ID_19335[42] = { - NPA, _I, _f, SPC, _I, SPC, _g, _o, SPC, _d, _o, _w, _n, CMA, SPC, _I, APS, _m, SPC, NWL, + PRI2, _I, _f, SPC, _I, SPC, _g, _o, SPC, _d, _o, _w, _n, CMA, SPC, _I, APS, _m, SPC, NWL, _t, _a, _k, _i, _n, _g, SPC, _y, _o, _u, SPC, _w, _i, _t, _h, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_19340[18] = { - NPA, _F, _o, _l, _l, _o, _w, SPC, _m, _e, CMA, SPC, _F, _o, _x, PRD, NWL, + PRI2, _F, _o, _l, _l, _o, _w, SPC, _m, _e, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_19350[12] = { - NPA, _F, _a, _t, _h, _e, _r, QST, EXM, NWL, + PRI2, _F, _a, _t, _h, _e, _r, QST, EXM, NWL, END, }; u16 gMsg_ID_19355[18] = { - NPA, _T, _h, _i, _s, SPC, _w, _a, _y, CMA, SPC, _F, _o, _x, PRD, NWL, + PRI2, _T, _h, _i, _s, SPC, _w, _a, _y, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_19360[40] = { - NPA, _N, _e, _v, _e, _r, SPC, _g, _i, _v, _e, SPC, _u, _p, PRD, NWL, + PRI2, _N, _e, _v, _e, _r, SPC, _g, _i, _v, _e, SPC, _u, _p, PRD, NWL, _T, _r, _u, _s, _t, SPC, _y, _o, _u, _r, NWL, _i, _n, _s, _t, _i, _n, _c, _t, _s, PRD, NWL, END, }; u16 gMsg_ID_19370[32] = { - NPA, _Y, _o, _u, APS, _v, _e, SPC, _b, _e, _c, _o, _m, _e, SPC, _s, _o, NWL, + PRI2, _Y, _o, _u, APS, _v, _e, SPC, _b, _e, _c, _o, _m, _e, SPC, _s, _o, NWL, _s, _t, _r, _o, _n, _g, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_19400[18] = { - NP9, _F, _o, _x, EXM, SPC, _Y, _o, _u, APS, _r, _e, SPC, _O, _K, EXM, NWL, + PRI1, _F, _o, _x, EXM, SPC, _Y, _o, _u, APS, _r, _e, SPC, _O, _K, EXM, NWL, END, }; u16 gMsg_ID_19410[18] = { - NP9, _W, _a, _y, SPC, _t, _o, SPC, _g, _o, CMA, SPC, _F, _o, _x, EXM, NWL, + PRI1, _W, _a, _y, SPC, _t, _o, SPC, _g, _o, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_19420[22] = { - NP9, _T, _h, _a, _t, APS, _s, SPC, _o, _u, _r, SPC, _l, _e, _a, _d, _e, _r, EXM, NWL, + PRI1, _T, _h, _a, _t, APS, _s, SPC, _o, _u, _r, SPC, _l, _e, _a, _d, _e, _r, EXM, NWL, END, }; u16 gMsg_ID_19430[22] = { - NP9, _W, _h, _a, _t, APS, _s, SPC, _w, _r, _o, _n, _g, CMA, SPC, _F, _o, _x, QST, NWL, + PRI1, _W, _h, _a, _t, APS, _s, SPC, _w, _r, _o, _n, _g, CMA, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_19440[30] = { - NP9, _N, _o, _t, _h, _i, _n, _g, PRD, PRD, PRD, NWL, + PRI1, _N, _o, _t, _h, _i, _n, _g, PRD, PRD, PRD, NWL, _N, _o, _t, _h, _i, _n, _g, APS, _s, SPC, _w, _r, _o, _n, _g, PRD, NWL, END, }; u16 gMsg_ID_19450[32] = { - NP9, _W, _h, _a, _t, QST, EXM, SPC, _I, _s, SPC, _t, _h, _a, _t, SPC, _a, _l, _l, SPC, NWL, + PRI1, _W, _h, _a, _t, QST, EXM, SPC, _I, _s, SPC, _t, _h, _a, _t, SPC, _a, _l, _l, SPC, NWL, _y, _o, _u, SPC, _g, _o, _t, QST, NWL, END, }; u16 gMsg_ID_19451[26] = { - NP9, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, SPC, NWL, + PRI1, _I, APS, _l, _l, SPC, _t, _a, _k, _e, SPC, _c, _a, _r, _e, SPC, _o, _f, SPC, NWL, _y, _o, _u, EXM, NWL, END, }; u16 gMsg_ID_19452[36] = { - NP9, _I, APS, _m, SPC, _g, _o, _n, _n, _a, SPC, _b, _u, _s, _t, SPC, _y, _o, _u, SPC, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _n, _n, _a, SPC, _b, _u, _s, _t, SPC, _y, _o, _u, SPC, NWL, _u, _p, SPC, _R, _E, _A, _L, SPC, _g, _o, _o, _d, EXM, NWL, END, }; u16 gMsg_ID_19453[28] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, _w, _e, _l, _c, _o, _m, _e, SPC, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, _w, _e, _l, _c, _o, _m, _e, SPC, NWL, _h, _e, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_19454[32] = { - NP9, _Y, _o, _u, APS, _r, _e, SPC, _g, _o, _o, _d, CMA, SPC, _b, _u, _t, SPC, NWL, + PRI1, _Y, _o, _u, APS, _r, _e, SPC, _g, _o, _o, _d, CMA, SPC, _b, _u, _t, SPC, NWL, _I, APS, _m, SPC, _b, _e, _t, _t, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_19455[36] = { - NP9, _N, _o, _t, SPC, _y, _e, _t, PRD, SPC, _T, _h, _e, NWL, + PRI1, _N, _o, _t, SPC, _y, _e, _t, PRD, SPC, _T, _h, _e, NWL, _p, _a, _r, _t, _y, APS, _s, SPC, _j, _u, _s, _t, SPC, _b, _e, _g, _u, _n, EXM, NWL, END, }; u16 gMsg_ID_19456[48] = { - NP9, _Y, _o, _u, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, _a, _t, SPC, _m, _e, PRD, SPC, NWL, + PRI1, _Y, _o, _u, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, _a, _t, SPC, _m, _e, PRD, SPC, NWL, _I, APS, _v, _e, SPC, _g, _o, _t, SPC, _a, SPC, _b, _e, _t, _t, _e, _r, SPC, NWL, _s, _h, _i, _p, EXM, NWL, END, }; u16 gMsg_ID_19457[30] = { - NP9, _G, _i, _v, _e, SPC, _i, _t, SPC, _u, _p, PRD, NWL, + PRI1, _G, _i, _v, _e, SPC, _i, _t, SPC, _u, _p, PRD, NWL, _Y, _o, _u, SPC, _c, _a, _n, APS, _t, SPC, _w, _i, _n, EXM, NWL, END, }; u16 gMsg_ID_19458[32] = { - NP9, _N, _o, SPC, _w, _a, _y, EXM, SPC, NWL, + PRI1, _N, _o, SPC, _w, _a, _y, EXM, SPC, NWL, _I, SPC, _d, _o, _n, APS, _t, SPC, _b, _e, _l, _i, _e, _v, _e, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_19459[20] = { - NP9, _H, _e, APS, _s, SPC, _t, _o, _o, SPC, _s, _t, _r, _o, _n, _g, EXM, NWL, + PRI1, _H, _e, APS, _s, SPC, _t, _o, _o, SPC, _s, _t, _r, _o, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_19460[28] = { - NP9, _T, _h, _i, _s, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, NWL, + PRI1, _T, _h, _i, _s, SPC, _c, _a, _n, APS, _t, SPC, _b, _e, NWL, _h, _a, _p, _p, _e, _n, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_19461[12] = { - NP9, _A, _h, _h, _h, _h, EXM, EXM, EXM, EXM, NWL, + PRI1, _A, _h, _h, _h, _h, EXM, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_19462[32] = { - NP9, _I, SPC, _s, _e, _e, SPC, _y, _o, _u, APS, _v, _e, SPC, _g, _o, _t, SPC, NWL, + PRI1, _I, SPC, _s, _e, _e, SPC, _y, _o, _u, APS, _v, _e, SPC, _g, _o, _t, SPC, NWL, _n, _e, _w, SPC, _s, _h, _i, _p, _s, PRD, NWL, END, }; u16 gMsg_ID_19463[30] = { - NP9, _H, _e, _y, CMA, SPC, _n, _i, _c, _e, SPC, _a, _i, _r, _c, _r, _a, _f, _t, CMA, SPC, NWL, + PRI1, _H, _e, _y, CMA, SPC, _n, _i, _c, _e, SPC, _a, _i, _r, _c, _r, _a, _f, _t, CMA, SPC, NWL, _g, _u, _y, _s, EXM, NWL, END, }; u16 gMsg_ID_19464[22] = { - NP9, _I, SPC, _c, _a, _n, APS, _t, SPC, _b, _r, _e, _a, _k, SPC, _f, _r, _e, _e, EXM, NWL, + PRI1, _I, SPC, _c, _a, _n, APS, _t, SPC, _b, _r, _e, _a, _k, SPC, _f, _r, _e, _e, EXM, NWL, END, }; u16 gMsg_ID_19465[28] = { - NPA, _T, _h, _e, _r, _e, APS, _s, SPC, _o, _n, _e, SPC, _m, _o, _r, _e, SPC, NWL, + PRI2, _T, _h, _e, _r, _e, APS, _s, SPC, _o, _n, _e, SPC, _m, _o, _r, _e, SPC, NWL, _t, _o, SPC, _g, _o, PRD, NWL, END, }; u16 gMsg_ID_19466[42] = { - NPA, _S, _o, CMA, SPC, _A, _n, _d, _r, _o, _s, _s, CMA, SPC, _y, _o, _u, SPC, NWL, + PRI2, _S, _o, CMA, SPC, _A, _n, _d, _r, _o, _s, _s, CMA, SPC, _y, _o, _u, SPC, NWL, _s, _h, _o, _w, SPC, _y, _o, _u, _r, SPC, _t, _r, _u, _e, SPC, _f, _o, _r, _m, EXM, NWL, END, }; u16 gMsg_ID_19467[36] = { - NPA, _H, _u, _r, _r, _y, CMA, SPC, _F, _o, _x, PRD, SPC, NWL, + PRI2, _H, _u, _r, _r, _y, CMA, SPC, _F, _o, _x, PRD, SPC, NWL, _I, APS, _m, SPC, _w, _a, _i, _t, _i, _n, _g, SPC, _f, _o, _r, SPC, _y, _o, _u, PRD, NWL, END, }; u16 gMsg_ID_19468[32] = { - NPA, _D, _o, _n, APS, _t, SPC, _e, _v, _e, _r, SPC, _g, _i, _v, _e, SPC, _u, _p, CMA, SPC, NWL, + PRI2, _D, _o, _n, APS, _t, SPC, _e, _v, _e, _r, SPC, _g, _i, _v, _e, SPC, _u, _p, CMA, SPC, NWL, _m, _y, SPC, _s, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_20010[24] = { - NP9, _A, _l, _l, SPC, _a, _i, _r, _c, _r, _a, _f, _t, SPC, _r, _e, _p, _o, _r, _t, EXM, NWL, + PRI1, _A, _l, _l, SPC, _a, _i, _r, _c, _r, _a, _f, _t, SPC, _r, _e, _p, _o, _r, _t, EXM, NWL, END, }; u16 gMsg_ID_20011[22] = { - NP9, _I, APS, _m, SPC, _f, _i, _n, _e, CMA, SPC, _I, APS, _m, SPC, _f, _i, _n, _e, EXM, NWL, + PRI1, _I, APS, _m, SPC, _f, _i, _n, _e, CMA, SPC, _I, APS, _m, SPC, _f, _i, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_20012[22] = { - NP9, _E, _v, _e, _r, _y, _t, _h, _i, _n, _g, APS, _s, SPC, _A, DSH, _O, _K, PRD, NWL, + PRI1, _E, _v, _e, _r, _y, _t, _h, _i, _n, _g, APS, _s, SPC, _A, DSH, _O, _K, PRD, NWL, END, }; u16 gMsg_ID_20013[32] = { - NP9, _I, APS, _m, SPC, _h, _a, _v, _i, _n, APS, SPC, _s, _o, _m, _e, NWL, + PRI1, _I, APS, _m, SPC, _h, _a, _v, _i, _n, APS, SPC, _s, _o, _m, _e, NWL, _t, _r, _o, _u, _b, _l, _e, SPC, _h, _e, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_20014[38] = { - NP9, _I, APS, _v, _e, SPC, _t, _a, _k, _e, _n, SPC, _a, SPC, _f, _e, _w, SPC, NWL, + PRI1, _I, APS, _v, _e, SPC, _t, _a, _k, _e, _n, SPC, _a, SPC, _f, _e, _w, SPC, NWL, _h, _i, _t, _s, CMA, SPC, _b, _u, _t, SPC, _I, APS, _m, SPC, _O, _K, PRD, NWL, END, }; u16 gMsg_ID_20015[28] = { - NP9, _I, SPC, _t, _h, _o, _u, _g, _h, _t, SPC, _I, SPC, _w, _a, _s, SPC, _a, NWL, + PRI1, _I, SPC, _t, _h, _o, _u, _g, _h, _t, SPC, _I, SPC, _w, _a, _s, SPC, _a, NWL, _g, _o, _n, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_20016[38] = { - NP9, _I, SPC, _s, _a, _w, SPC, _m, _y, SPC, _l, _i, _f, _e, SPC, _f, _l, _a, _s, _h, NWL, + PRI1, _I, SPC, _s, _a, _w, SPC, _m, _y, SPC, _l, _i, _f, _e, SPC, _f, _l, _a, _s, _h, NWL, _b, _e, _f, _o, _r, _e, SPC, _m, _y, SPC, _e, _y, _e, _s, EXM, NWL, END, }; u16 gMsg_ID_20017[34] = { - NP9, _A, _h, CMA, SPC, _y, _o, _u, APS, _r, _e, SPC, _g, _e, _t, _t, _i, _n, _g, NWL, + PRI1, _A, _h, CMA, SPC, _y, _o, _u, APS, _r, _e, SPC, _g, _e, _t, _t, _i, _n, _g, NWL, _b, _e, _t, _t, _e, _r, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_20018[26] = { - NP9, _Y, _o, _u, SPC, _a, _r, _e, SPC, _S, _O, SPC, NWL, + PRI1, _Y, _o, _u, SPC, _a, _r, _e, SPC, _S, _O, SPC, NWL, _l, _u, _c, _k, _y, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_20019[34] = { - NP9, _Y, _o, _u, SPC, _w, _o, _r, _r, _y, SPC, _a, _b, _o, _u, _t, SPC, NWL, + PRI1, _Y, _o, _u, SPC, _w, _o, _r, _r, _y, SPC, _a, _b, _o, _u, _t, SPC, NWL, _y, _o, _u, _r, SPC, _o, _w, _n, SPC, _h, _i, _d, _e, PRD, NWL, END, }; u16 gMsg_ID_20020[14] = { - NP9, _A, _r, _e, SPC, _y, _o, _u, SPC, _O, _K, QST, NWL, + PRI1, _A, _r, _e, SPC, _y, _o, _u, SPC, _O, _K, QST, NWL, END, }; u16 gMsg_ID_20030[30] = { - NP9, _S, _h, _o, _o, _t, EXM, SPC, _I, APS, _v, _e, SPC, _t, _a, _k, _e, _n, SPC, NWL, + PRI1, _S, _h, _o, _o, _t, EXM, SPC, _I, APS, _v, _e, SPC, _t, _a, _k, _e, _n, SPC, NWL, _d, _a, _m, _a, _g, _e, EXM, NWL, END, }; u16 gMsg_ID_20040[18] = { - NP9, _D, _a, _n, _g, EXM, SPC, _I, APS, _m, SPC, _h, _i, _t, EXM, NWL, + PRI1, _D, _a, _n, _g, EXM, SPC, _I, APS, _m, SPC, _h, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_20050[16] = { - NP9, _S, _l, _i, _p, _p, _y, APS, _s, SPC, _h, _i, _t, EXM, NWL, + PRI1, _S, _l, _i, _p, _p, _y, APS, _s, SPC, _h, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_20060[36] = { - NP9, _H, _e, _y, CMA, SPC, _E, _i, _n, _s, _t, _e, _i, _n, EXM, SPC, NWL, + PRI1, _H, _e, _y, CMA, SPC, _E, _i, _n, _s, _t, _e, _i, _n, EXM, SPC, NWL, _I, APS, _m, SPC, _o, _n, SPC, _y, _o, _u, _r, SPC, _s, _i, _d, _e, EXM, NWL, END, }; u16 gMsg_ID_20070[22] = { - NP9, _K, _n, _o, _c, _k, SPC, _i, _t, SPC, _o, _f, _f, CMA, SPC, _F, _o, _x, EXM, NWL, + PRI1, _K, _n, _o, _c, _k, SPC, _i, _t, SPC, _o, _f, _f, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_20080[30] = { - NP9, _H, _e, _y, EXM, SPC, NWL, + PRI1, _H, _e, _y, EXM, SPC, NWL, _W, _h, _a, _t, APS, _s, SPC, _t, _h, _e, SPC, _b, _i, _g, SPC, _i, _d, _e, _a, QST, NWL, END, }; u16 gMsg_ID_20084[42] = { - NP9, _Y, _o, _u, SPC, _t, _r, _y, _i, _n, APS, SPC, _t, _o, SPC, NWL, + PRI1, _Y, _o, _u, SPC, _t, _r, _y, _i, _n, APS, SPC, _t, _o, SPC, NWL, _d, _a, _m, _a, _g, _e, SPC, _m, _y, SPC, _p, _r, _e, _t, _t, _y, SPC, NWL, _f, _a, _c, _e, QST, EXM, NWL, END, }; u16 gMsg_ID_20085[34] = { - NP9, _H, _e, _y, EXM, SPC, _S, _e, _e, SPC, _i, _f, SPC, _I, SPC, _h, _e, _l, _p, SPC, NWL, + PRI1, _H, _e, _y, EXM, SPC, _S, _e, _e, SPC, _i, _f, SPC, _I, SPC, _h, _e, _l, _p, SPC, NWL, _y, _o, _u, SPC, _a, _g, _a, _i, _n, EXM, NWL, END, }; u16 gMsg_ID_20090[10] = { - NPB, _N, _o, EXM, EXM, EXM, EXM, NWL, + PRI3, _N, _o, EXM, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_20091[10] = { - NPB, _N, _o, EXM, EXM, EXM, EXM, NWL, + PRI3, _N, _o, EXM, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_20092[10] = { - NPB, _N, _o, EXM, EXM, EXM, EXM, NWL, + PRI3, _N, _o, EXM, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_20150[20] = { - NP9, _H, _e, _y, EXM, SPC, _H, _e, SPC, _w, _a, _s, SPC, _m, _i, _n, _e, EXM, NWL, + PRI1, _H, _e, _y, EXM, SPC, _H, _e, SPC, _w, _a, _s, SPC, _m, _i, _n, _e, EXM, NWL, END, }; u16 gMsg_ID_20160[30] = { - NP9, _W, _h, _a, _t, APS, _s, SPC, _t, _h, _e, SPC, _b, _i, _g, SPC, NWL, + PRI1, _W, _h, _a, _t, APS, _s, SPC, _t, _h, _e, SPC, _b, _i, _g, SPC, NWL, _i, _d, _e, _a, CMA, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_20170[34] = { - NP9, _G, _o, SPC, _f, _i, _n, _d, SPC, _y, _o, _u, _r, SPC, _o, _w, _n, SPC, NWL, + PRI1, _G, _o, SPC, _f, _i, _n, _d, SPC, _y, _o, _u, _r, SPC, _o, _w, _n, SPC, NWL, _t, _a, _r, _g, _e, _t, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_20180[18] = { - NPA, _A, _l, _l, DSH, _r, _a, _n, _g, _e, SPC, _m, _o, _d, _e, PRD, NWL, + PRI2, _A, _l, _l, DSH, _r, _a, _n, _g, _e, SPC, _m, _o, _d, _e, PRD, NWL, END, }; u16 gMsg_ID_20190[40] = { - NP9, _W, _h, _a, _t, SPC, _d, _o, SPC, _y, _o, _u, SPC, _t, _h, _i, _n, _k, NWL, + PRI1, _W, _h, _a, _t, SPC, _d, _o, SPC, _y, _o, _u, SPC, _t, _h, _i, _n, _k, NWL, _y, _o, _u, APS, _r, _e, SPC, _d, _o, _i, _n, _g, CMA, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_20200[30] = { - NP9, _W, _a, _t, _c, _h, SPC, _w, _h, _e, _r, _e, SPC, _y, _o, _u, APS, _r, _e, SPC, NWL, + PRI1, _W, _a, _t, _c, _h, SPC, _w, _h, _e, _r, _e, SPC, _y, _o, _u, APS, _r, _e, SPC, NWL, _f, _l, _y, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_20210[22] = { - NP9, _G, _e, _t, SPC, _o, _u, _t, SPC, _o, _f, SPC, _m, _y, SPC, _w, _a, _y, EXM, NWL, + PRI1, _G, _e, _t, SPC, _o, _u, _t, SPC, _o, _f, SPC, _m, _y, SPC, _w, _a, _y, EXM, NWL, END, }; u16 gMsg_ID_20220[40] = { - NPA, _O, _h, SPC, _m, _a, _n, EXM, SPC, _I, APS, _m, SPC, _g, _o, _n, _n, _a, SPC, NWL, + PRI2, _O, _h, SPC, _m, _a, _n, EXM, SPC, _I, APS, _m, SPC, _g, _o, _n, _n, _a, SPC, NWL, _h, _a, _v, _e, SPC, _t, _o, SPC, _b, _a, _c, _k, SPC, _o, _f, _f, PRD, NWL, END, }; u16 gMsg_ID_20221[46] = { - NPA, _S, _o, _r, _r, _y, CMA, SPC, _g, _u, _y, _s, CMA, SPC, _I, APS, _v, _e, SPC, NWL, + PRI2, _S, _o, _r, _r, _y, CMA, SPC, _g, _u, _y, _s, CMA, SPC, _I, APS, _v, _e, SPC, NWL, _g, _o, _t, _t, _a, SPC, _s, _i, _t, SPC, _t, _h, _i, _s, SPC, _o, _n, _e, SPC, NWL, _o, _u, _t, PRD, NWL, END, }; u16 gMsg_ID_20222[36] = { - NPA, _I, APS, _m, SPC, _m, _o, _n, _k, _e, _y, SPC, _f, _o, _o, _d, SPC, _i, _f, NWL, + PRI2, _I, APS, _m, SPC, _m, _o, _n, _k, _e, _y, SPC, _f, _o, _o, _d, SPC, _i, _f, NWL, _I, SPC, _d, _o, _n, APS, _t, SPC, _l, _e, _a, _v, _e, EXM, NWL, END, }; u16 gMsg_ID_20230[40] = { - NPA, _L, _o, _c, _a, _t, _i, _o, _n, SPC, _c, _o, _n, _f, _i, _r, _m, _e, _d, PRD, NWL, + PRI2, _L, _o, _c, _a, _t, _i, _o, _n, SPC, _c, _o, _n, _f, _i, _r, _m, _e, _d, PRD, NWL, _S, _e, _n, _d, _i, _n, _g, SPC, _s, _u, _p, _p, _l, _i, _e, _s, PRD, NWL, END, }; u16 gMsg_ID_20235[34] = { - NPA, _U, _s, _e, SPC, _t, _h, _e, SPC, _b, _o, _o, _s, _t, SPC, _t, _o, NWL, + PRI2, _U, _s, _e, SPC, _t, _h, _e, SPC, _b, _o, _o, _s, _t, SPC, _t, _o, NWL, _c, _h, _a, _s, _e, SPC, LPR, _C, ALF, SPC, CLF, RPR, PRD, NWL, END, }; u16 gMsg_ID_20236[34] = { - NPA, _T, _r, _y, SPC, _a, SPC, _s, _o, _m, _e, _r, _s, _a, _u, _l, _t, NWL, + PRI2, _T, _r, _y, SPC, _a, SPC, _s, _o, _m, _e, _r, _s, _a, _u, _l, _t, NWL, LPR, ADN, SPC, _a, _n, _d, SPC, _C, ALF, SPC, CLF, RPR, PRD, NWL, END, }; u16 gMsg_ID_20237[30] = { - NPA, _T, _r, _y, SPC, _a, SPC, _U, DSH, _t, _u, _r, _n, NWL, + PRI2, _T, _r, _y, SPC, _a, SPC, _U, DSH, _t, _u, _r, _n, NWL, LPR, ADN, SPC, _a, _n, _d, SPC, _C, ADN, SPC, CDN, RPR, PRD, NWL, END, }; u16 gMsg_ID_20238[32] = { - NPA, _U, _s, _e, SPC, _b, _o, _m, _b, _s, SPC, _w, _i, _s, _e, _l, _y, NWL, + PRI2, _U, _s, _e, SPC, _b, _o, _m, _b, _s, SPC, _w, _i, _s, _e, _l, _y, NWL, LPR, _B, SPC, _B, _u, _t, _t, _o, _n, RPR, PRD, NWL, END, }; u16 gMsg_ID_20239[36] = { - NPA, _U, _s, _e, SPC, _t, _h, _e, SPC, _b, _o, _o, _s, _t, SPC, _t, _o, NWL, + PRI2, _U, _s, _e, SPC, _t, _h, _e, SPC, _b, _o, _o, _s, _t, SPC, _t, _o, NWL, _g, _e, _t, SPC, _t, _h, _r, _u, SPC, LPR, _C, ALF, SPC, CLF, RPR, PRD, NWL, END, }; u16 gMsg_ID_20250[28] = { - NP9, _I, APS, _m, SPC, _h, _e, _r, _e, SPC, _t, _o, SPC, _r, _e, _s, _c, _u, _e, SPC, NWL, + PRI1, _I, APS, _m, SPC, _h, _e, _r, _e, SPC, _t, _o, SPC, _r, _e, _s, _c, _u, _e, SPC, NWL, _y, _o, _u, EXM, NWL, END, }; u16 gMsg_ID_20260[20] = { - NP9, _D, _o, _n, APS, _t, SPC, _f, _o, _r, _g, _e, _t, SPC, _m, _e, EXM, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _f, _o, _r, _g, _e, _t, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_20261[36] = { - NP9, _Y, _o, _u, _r, SPC, _s, _k, _i, _l, _l, _s, SPC, _h, _a, _v, _e, SPC, NWL, + PRI1, _Y, _o, _u, _r, SPC, _s, _k, _i, _l, _l, _s, SPC, _h, _a, _v, _e, SPC, NWL, _i, _m, _p, _r, _o, _v, _e, _d, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_20262[38] = { - NP9, _I, SPC, _g, _u, _e, _s, _s, SPC, _y, _o, _u, APS, _r, _e, SPC, _g, _o, _o, _d, NWL, + PRI1, _I, SPC, _g, _u, _e, _s, _s, SPC, _y, _o, _u, APS, _r, _e, SPC, _g, _o, _o, _d, NWL, _f, _o, _r, SPC, _s, _o, _m, _e, _t, _h, _i, _n, _g, PRD, NWL, END, }; u16 gMsg_ID_20263[14] = { - NP9, _G, _r, _e, _a, _t, CMA, SPC, _F, _o, _x, EXM, NWL, + PRI1, _G, _r, _e, _a, _t, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_20264[10] = { - NP9, _P, _e, _p, _p, _y, EXM, NWL, + PRI1, _P, _e, _p, _p, _y, EXM, NWL, END, }; u16 gMsg_ID_20265[10] = { - NP9, _F, _a, _l, _c, _o, EXM, NWL, + PRI1, _F, _a, _l, _c, _o, EXM, NWL, END, }; u16 gMsg_ID_20266[10] = { - NP9, _S, _l, _i, _p, _p, _y, EXM, NWL, + PRI1, _S, _l, _i, _p, _p, _y, EXM, NWL, END, }; u16 gMsg_ID_20267[26] = { - NP9, _S, _l, _i, _p, _p, _y, CMA, SPC, _g, _e, _t, SPC, _b, _a, _c, _k, SPC, NWL, + PRI1, _S, _l, _i, _p, _p, _y, CMA, SPC, _g, _e, _t, SPC, _b, _a, _c, _k, SPC, NWL, _h, _e, _r, _e, EXM, NWL, END, }; u16 gMsg_ID_20268[30] = { - NP9, _H, _e, _h, SPC, _h, _e, _h, PRD, PRD, NWL, + PRI1, _H, _e, _h, SPC, _h, _e, _h, PRD, PRD, NWL, _t, _r, _y, SPC, _a, _n, _d, SPC, _s, _t, _o, _p, SPC, _m, _e, PRD, NWL, END, }; u16 gMsg_ID_20269[40] = { - NPA, _I, _n, _c, _o, _m, _i, _n, _g, SPC, _m, _e, _s, _s, _a, _g, _e, SPC, NWL, + PRI2, _I, _n, _c, _o, _m, _i, _n, _g, SPC, _m, _e, _s, _s, _a, _g, _e, SPC, NWL, _f, _r, _o, _m, SPC, _R, _O, _B, _6, _4, SPC, LPR, _C, ART, SPC, CRT, RPR, PRD, NWL, END, }; u16 gMsg_ID_20270[12] = { - NP9, _I, _n, _c, _o, _m, _i, _n, _g, EXM, NWL, + PRI1, _I, _n, _c, _o, _m, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_20271[18] = { - NP9, _H, _e, _r, _e, SPC, _t, _h, _e, _y, SPC, _c, _o, _m, _e, EXM, NWL, + PRI1, _H, _e, _r, _e, SPC, _t, _h, _e, _y, SPC, _c, _o, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_20272[12] = { - NP9, _I, _n, _c, _o, _m, _i, _n, _g, EXM, NWL, + PRI1, _I, _n, _c, _o, _m, _i, _n, _g, EXM, NWL, END, }; u16 gMsg_ID_20273[32] = { - NPA, _I, APS, _m, SPC, _l, _o, _o, _k, _i, _n, _g, SPC, _f, _o, _r, _w, _a, _r, _d, SPC, NWL, + PRI2, _I, APS, _m, SPC, _l, _o, _o, _k, _i, _n, _g, SPC, _f, _o, _r, _w, _a, _r, _d, SPC, NWL, _t, _o, SPC, _t, _h, _i, _s, EXM, NWL, END, }; u16 gMsg_ID_20274[32] = { - NPA, _A, _h, CMA, SPC, _t, _h, _e, SPC, _s, _o, _n, SPC, _o, _f, NWL, + PRI2, _A, _h, CMA, SPC, _t, _h, _e, SPC, _s, _o, _n, SPC, _o, _f, NWL, _J, _a, _m, _e, _s, SPC, _M, _c, _C, _l, _o, _u, _d, EXM, NWL, END, }; u16 gMsg_ID_20275[30] = { - NPA, _I, APS, _l, _l, SPC, _m, _a, _k, _e, SPC, _t, _h, _o, _s, _e, NWL, + PRI2, _I, APS, _l, _l, SPC, _m, _a, _k, _e, SPC, _t, _h, _o, _s, _e, NWL, _f, _o, _o, _l, _s, SPC, _p, _a, _y, EXM, NWL, END, }; u16 gMsg_ID_20276[38] = { - NPA, _T, _h, _o, _s, _e, SPC, _t, _i, _n, SPC, _c, _a, _n, _s, SPC, _a, _r, _e, NWL, + PRI2, _T, _h, _o, _s, _e, SPC, _t, _i, _n, SPC, _c, _a, _n, _s, SPC, _a, _r, _e, NWL, _n, _o, SPC, _m, _a, _t, _c, _h, SPC, _f, _o, _r, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_20277[38] = { - NPA, _H, _a, SPC, _h, _a, SPC, _h, _a, EXM, SPC, _Y, _o, _u, SPC, _c, _a, _n, NWL, + PRI2, _H, _a, SPC, _h, _a, SPC, _h, _a, EXM, SPC, _Y, _o, _u, SPC, _c, _a, _n, NWL, _N, _E, _V, _E, _R, SPC, _d, _e, _f, _e, _a, _t, SPC, _m, _e, EXM, NWL, END, }; u16 gMsg_ID_20278[18] = { - NPA, _G, _o, _o, _d, SPC, _l, _u, _c, _k, CMA, SPC, _F, _o, _x, PRD, NWL, + PRI2, _G, _o, _o, _d, SPC, _l, _u, _c, _k, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_20279[38] = { - NPA, _P, _o, _s, _i, _t, _i, _o, _n, SPC, _c, _o, _n, _f, _i, _r, _m, _e, _d, PRD, NWL, + PRI2, _P, _o, _s, _i, _t, _i, _o, _n, SPC, _c, _o, _n, _f, _i, _r, _m, _e, _d, PRD, NWL, _E, _v, _e, _r, _y, _t, _h, _i, _n, _g, SPC, _O, _K, PRD, NWL, END, }; u16 gMsg_ID_20280[30] = { - NP9, _D, _o, _n, APS, _t, SPC, _w, _o, _r, _r, _y, SPC, _a, _b, _o, _u, _t, SPC, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _w, _o, _r, _r, _y, SPC, _a, _b, _o, _u, _t, SPC, NWL, _m, _e, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_20281[34] = { - NP9, _I, SPC, _s, _e, _e, SPC, _y, _o, _u, _r, SPC, _f, _a, _t, _h, _e, _r, SPC, NWL, + PRI1, _I, SPC, _s, _e, _e, SPC, _y, _o, _u, _r, SPC, _f, _a, _t, _h, _e, _r, SPC, NWL, _i, _n, SPC, _y, _o, _u, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_20282[32] = { - NP9, _H, _o, _w, APS, _s, SPC, _t, _h, _e, SPC, _A, _r, _w, _i, _n, _g, SPC, NWL, + PRI1, _H, _o, _w, APS, _s, SPC, _t, _h, _e, SPC, _A, _r, _w, _i, _n, _g, SPC, NWL, _d, _o, _i, _n, _g, CMA, SPC, _F, _o, _x, QST, NWL, END, }; u16 gMsg_ID_20283[30] = { - NPA, _L, _o, _c, _k, SPC, _o, _n, SPC, _t, _h, _e, SPC, _e, _n, _e, _m, _y, NWL, + PRI2, _L, _o, _c, _k, SPC, _o, _n, SPC, _t, _h, _e, SPC, _e, _n, _e, _m, _y, NWL, LPR, _h, _o, _l, _d, SPC, _A, RPR, PRD, NWL, END, }; u16 gMsg_ID_20284[34] = { - NPA, _H, _o, _l, _d, SPC, _A, SPC, _t, _o, SPC, _l, _o, _c, _k, SPC, _o, _n, NWL, + PRI2, _H, _o, _l, _d, SPC, _A, SPC, _t, _o, SPC, _l, _o, _c, _k, SPC, _o, _n, NWL, _t, _o, SPC, _t, _h, _e, SPC, _e, _n, _e, _m, _y, PRD, NWL, END, }; u16 gMsg_ID_20285[46] = { - NPA, _T, _o, SPC, _g, _e, _t, SPC, _r, _i, _d, SPC, _o, _f, SPC, _t, _h, _e, NWL, + PRI2, _T, _o, SPC, _g, _e, _t, SPC, _r, _i, _d, SPC, _o, _f, SPC, _t, _h, _e, NWL, _a, _i, _m, CMA, SPC, _p, _a, _u, _s, _e, SPC, _a, _n, _d, SPC, NWL, _p, _r, _e, _s, _s, SPC, _R, PRD, NWL, END, }; u16 gMsg_ID_20286[24] = { - NPA, _P, _r, _e, _s, _s, SPC, _C, ALF, SPC, CLF, SPC, _t, _o, NWL, + PRI2, _P, _r, _e, _s, _s, SPC, _C, ALF, SPC, CLF, SPC, _t, _o, NWL, _b, _o, _o, _s, _t, EXM, NWL, END, }; u16 gMsg_ID_20287[40] = { - NPA, _P, _r, _e, _s, _s, SPC, ADN, SPC, _a, _n, _d, SPC, _C, ALF, SPC, CLF, SPC, NWL, + PRI2, _P, _r, _e, _s, _s, SPC, ADN, SPC, _a, _n, _d, SPC, _C, ALF, SPC, CLF, SPC, NWL, _t, _o, SPC, _d, _o, SPC, _a, SPC, _s, _o, _m, _e, _r, _s, _a, _u, _l, _t, PRD, NWL, END, }; u16 gMsg_ID_20288[36] = { - NPA, _F, _o, _r, SPC, _a, SPC, _U, DSH, _t, _u, _r, _n, CMA, SPC, NWL, + PRI2, _F, _o, _r, SPC, _a, SPC, _U, DSH, _t, _u, _r, _n, CMA, SPC, NWL, _p, _r, _e, _s, _s, SPC, ADN, SPC, _a, _n, _d, SPC, _C, ADN, SPC, CDN, PRD, NWL, END, }; u16 gMsg_ID_20289[20] = { - NPA, _P, _r, _e, _s, _s, SPC, _B, SPC, _t, _o, SPC, _b, _o, _m, _b, PRD, NWL, + PRI2, _P, _r, _e, _s, _s, SPC, _B, SPC, _t, _o, SPC, _b, _o, _m, _b, PRD, NWL, END, }; u16 gMsg_ID_20290[40] = { - NPA, _T, _o, SPC, _b, _a, _r, _r, _e, _l, SPC, _r, _o, _l, _l, CMA, SPC, NWL, + PRI2, _T, _o, SPC, _b, _a, _r, _r, _e, _l, SPC, _r, _o, _l, _l, CMA, SPC, NWL, _p, _r, _e, _s, _s, SPC, _Z, SPC, _o, _r, SPC, _R, SPC, _t, _w, _i, _c, _e, PRD, NWL, END, }; u16 gMsg_ID_20291[24] = { - NPA, _P, _r, _e, _s, _s, SPC, _C, ADN, SPC, CDN, NWL, + PRI2, _P, _r, _e, _s, _s, SPC, _C, ADN, SPC, CDN, NWL, _t, _o, SPC, _b, _r, _a, _k, _e, PRD, NWL, END, }; u16 gMsg_ID_20292[28] = { - NPA, _T, _o, SPC, _h, _o, _v, _e, _r, CMA, SPC, NWL, + PRI2, _T, _o, SPC, _h, _o, _v, _e, _r, CMA, SPC, NWL, _p, _r, _e, _s, _s, SPC, _Z, SPC, _a, _n, _d, SPC, _R, PRD, NWL, END, }; u16 gMsg_ID_20294[12] = { - NP9, _S, _l, _i, _p, _p, _y, EXM, EXM, EXM, NWL, + PRI1, _S, _l, _i, _p, _p, _y, EXM, EXM, EXM, NWL, END, }; u16 gMsg_ID_20296[32] = { - NP9, _C, _o, _m, _e, SPC, _o, _n, CMA, SPC, _F, _o, _x, PRD, NWL, + PRI1, _C, _o, _m, _e, SPC, _o, _n, CMA, SPC, _F, _o, _x, PRD, NWL, _Y, _o, _u, SPC, _c, _a, _n, SPC, _d, _o, SPC, _i, _t, PRD, NWL, END, }; u16 gMsg_ID_20297[14] = { - NP9, _A, _r, _e, SPC, _y, _o, _u, SPC, _O, _K, QST, NWL, + PRI1, _A, _r, _e, SPC, _y, _o, _u, SPC, _O, _K, QST, NWL, END, }; u16 gMsg_ID_20298[40] = { - NP9, _C, _o, _m, _e, SPC, _o, _n, CMA, SPC, _F, _o, _x, PRD, SPC, NWL, + PRI1, _C, _o, _m, _e, SPC, _o, _n, CMA, SPC, _F, _o, _x, PRD, SPC, NWL, _L, _e, _t, APS, _s, SPC, _k, _i, _c, _k, SPC, _s, _o, _m, _e, SPC, NWL, _t, _a, _i, _l, PRD, NWL, END, }; u16 gMsg_ID_20299[30] = { - NP9, _D, _o, _n, APS, _t, SPC, _g, _o, SPC, _d, _y, _i, _n, APS, SPC, _o, _n, SPC, NWL, + PRI1, _D, _o, _n, APS, _t, SPC, _g, _o, SPC, _d, _y, _i, _n, APS, SPC, _o, _n, SPC, NWL, _m, _e, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_20300[30] = { - NP9, _L, _e, _t, APS, _s, SPC, _t, _a, _k, _e, SPC, _i, _t, SPC, _t, _o, SPC, NWL, + PRI1, _L, _e, _t, APS, _s, SPC, _t, _a, _k, _e, SPC, _i, _t, SPC, _t, _o, SPC, NWL, APS, _e, _m, CMA, SPC, _F, _o, _x, PRD, NWL, END, }; u16 gMsg_ID_20301[30] = { - NP9, _L, _e, _t, APS, _s, SPC, _c, _l, _e, _a, _n, SPC, _u, _p, SPC, NWL, + PRI1, _L, _e, _t, APS, _s, SPC, _c, _l, _e, _a, _n, SPC, _u, _p, SPC, NWL, _t, _h, _i, _s, SPC, _m, _e, _s, _s, PRD, NWL, END, }; u16 gMsg_ID_20302[24] = { - NP9, _L, _o, _o, _k, SPC, _o, _u, _t, SPC, _b, _e, _h, _i, _n, _d, SPC, _y, _o, _u, EXM, NWL, + PRI1, _L, _o, _o, _k, SPC, _o, _u, _t, SPC, _b, _e, _h, _i, _n, _d, SPC, _y, _o, _u, EXM, NWL, END, }; u16 gMsg_ID_20303[40] = { - NP9, _S, _e, _e, SPC, _m, _y, SPC, _s, _h, _i, _p, QST, SPC, _D, _o, _e, _s, SPC, NWL, + PRI1, _S, _e, _e, SPC, _m, _y, SPC, _s, _h, _i, _p, QST, SPC, _D, _o, _e, _s, SPC, NWL, _i, _t, SPC, _l, _o, _o, _k, SPC, _O, _K, SPC, _t, _o, SPC, _y, _o, _u, QST, NWL, END, }; u16 gMsg_ID_20304[40] = { - NP8, _N, _e, _v, _e, _r, SPC, _g, _i, _v, _e, SPC, _u, _p, PRD, NWL, + PRI0, _N, _e, _v, _e, _r, SPC, _g, _i, _v, _e, SPC, _u, _p, PRD, NWL, _T, _r, _u, _s, _t, SPC, _y, _o, _u, _r, SPC, NWL, _i, _n, _s, _t, _i, _n, _c, _t, _s, PRD, NWL, END, }; u16 gMsg_ID_20305[20] = { - NP8, _F, _o, _x, CMA, SPC, _a, _r, _e, SPC, _y, _o, _u, SPC, _O, _K, QST, NWL, + PRI0, _F, _o, _x, CMA, SPC, _a, _r, _e, SPC, _y, _o, _u, SPC, _O, _K, QST, NWL, END, }; u16 gMsg_ID_20306[18] = { - NP8, _H, _o, _l, _d, SPC, _t, _o, _g, _e, _t, _h, _e, _r, PRD, NWL, + PRI0, _H, _o, _l, _d, SPC, _t, _o, _g, _e, _t, _h, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_20307[18] = { - NP8, _E, _v, _e, _r, _y, _t, _h, _i, _n, _g, SPC, _O, _K, QST, NWL, + PRI0, _E, _v, _e, _r, _y, _t, _h, _i, _n, _g, SPC, _O, _K, QST, NWL, END, }; u16 gMsg_ID_20308[28] = { - NP8, _W, _h, _e, _w, EXM, SPC, NWL, + PRI0, _W, _h, _e, _w, EXM, SPC, NWL, _Y, _o, _u, APS, _r, _e, SPC, _a, _l, _l, SPC, _r, _i, _g, _h, _t, EXM, NWL, END, }; u16 gMsg_ID_20309[28] = { - NP8, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, _l, _e, _a, _v, _i, _n, APS, CMA, SPC, NWL, + PRI0, _Y, _o, _u, APS, _r, _e, SPC, _n, _o, _t, SPC, _l, _e, _a, _v, _i, _n, APS, CMA, SPC, NWL, _y, _e, _t, EXM, NWL, END, }; u16 gMsg_ID_20310[8] = { - NP9, _C, _r, _u, _d, EXM, NWL, + PRI1, _C, _r, _u, _d, EXM, NWL, END, }; u16 gMsg_ID_20311[10] = { - NP9, _O, _h, SPC, _n, _o, EXM, NWL, + PRI1, _O, _h, SPC, _n, _o, EXM, NWL, END, }; u16 gMsg_ID_20312[14] = { - NP9, _D, _o, _g, _g, _o, _n, _e, SPC, _i, _t, EXM, NWL, + PRI1, _D, _o, _g, _g, _o, _n, _e, SPC, _i, _t, EXM, NWL, END, }; u16 gMsg_ID_20313[32] = { - NPA, _H, _o, _l, _d, SPC, _A, SPC, _t, _o, SPC, _c, _h, _a, _r, _g, _e, SPC, NWL, + PRI2, _H, _o, _l, _d, SPC, _A, SPC, _t, _o, SPC, _c, _h, _a, _r, _g, _e, SPC, NWL, _y, _o, _u, _r, SPC, _l, _a, _s, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_20314[44] = { - NPA, _Y, _o, _u, SPC, _c, _a, _n, SPC, _a, _l, _s, _o, SPC, _l, _o, _c, _k, NWL, + PRI2, _Y, _o, _u, SPC, _c, _a, _n, SPC, _a, _l, _s, _o, SPC, _l, _o, _c, _k, NWL, _o, _n, _t, _o, SPC, _e, _n, _e, _m, _i, _e, _s, SPC, _t, _h, _i, _s, SPC, NWL, _w, _a, _y, PRD, NWL, END, }; u16 gMsg_ID_20315[18] = { - NP9, _W, _a, _t, _c, _h, SPC, _o, _u, _t, CMA, SPC, _F, _o, _x, EXM, NWL, + PRI1, _W, _a, _t, _c, _h, SPC, _o, _u, _t, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_20316[18] = { - NP9, _W, _a, _t, _c, _h, SPC, _o, _u, _t, CMA, SPC, _F, _o, _x, EXM, NWL, + PRI1, _W, _a, _t, _c, _h, SPC, _o, _u, _t, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_20317[18] = { - NP9, _W, _a, _t, _c, _h, SPC, _o, _u, _t, CMA, SPC, _F, _o, _x, EXM, NWL, + PRI1, _W, _a, _t, _c, _h, SPC, _o, _u, _t, CMA, SPC, _F, _o, _x, EXM, NWL, END, }; u16 gMsg_ID_20318[12] = { - NPB, _A, _a, _a, _a, _a, _h, _h, _h, EXM, NWL, + PRI3, _A, _a, _a, _a, _a, _h, _h, _h, EXM, NWL, END, }; u16 gMsg_ID_20319[12] = { - NP9, _A, _a, _a, _a, _a, _h, _h, _h, EXM, NWL, + PRI1, _A, _a, _a, _a, _a, _h, _h, _h, EXM, NWL, END, }; u16 gMsg_ID_20320[12] = { - NP9, _A, _a, _a, _a, _a, _h, _h, _h, EXM, NWL, + PRI1, _A, _a, _a, _a, _a, _h, _h, _h, EXM, NWL, END, }; u16 gMsg_ID_20321[12] = { - NP9, _A, _a, _a, _a, _a, _h, _h, _h, EXM, NWL, + PRI1, _A, _a, _a, _a, _a, _h, _h, _h, EXM, NWL, END, }; u16 gMsg_ID_20326[30] = { - NPA, _W, _e, _l, _c, _o, _m, _e, SPC, _t, _o, SPC, NWL, + PRI2, _W, _e, _l, _c, _o, _m, _e, SPC, _t, _o, SPC, NWL, _t, _r, _a, _i, _n, _i, _n, _g, SPC, _m, _o, _d, _e, PRD, NWL, END, }; u16 gMsg_ID_20327[30] = { - NPA, _L, _e, _t, APS, _s, SPC, _p, _r, _a, _c, _t, _i, _c, _e, NWL, + PRI2, _L, _e, _t, APS, _s, SPC, _p, _r, _a, _c, _t, _i, _c, _e, NWL, _t, _h, _e, SPC, _b, _a, _s, _i, _c, _s, PRD, NWL, END, }; u16 gMsg_ID_20328[12] = { - NPA, _G, _o, _o, _d, SPC, _j, _o, _b, PRD, NWL, + PRI2, _G, _o, _o, _d, SPC, _j, _o, _b, PRD, NWL, END, }; u16 gMsg_ID_20329[42] = { - NPA, _T, _h, _i, _s, SPC, _i, _s, SPC, _R, _O, _B, _6, _4, PRD, SPC, NWL, + PRI2, _T, _h, _i, _s, SPC, _i, _s, SPC, _R, _O, _B, _6, _4, PRD, SPC, NWL, _K, _e, _e, _p, SPC, _u, _p, SPC, _t, _h, _e, SPC, _g, _o, _o, _d, SPC, NWL, _w, _o, _r, _k, PRD, NWL, END, }; u16 gMsg_ID_20330[44] = { - NPA, _G, _r, _e, _a, _t, PRD, SPC, _N, _o, _w, SPC, _l, _e, _t, APS, _s, SPC, NWL, + PRI2, _G, _r, _e, _a, _t, PRD, SPC, _N, _o, _w, SPC, _l, _e, _t, APS, _s, SPC, NWL, _g, _e, _t, SPC, _b, _a, _c, _k, SPC, _t, _o, SPC, _t, _h, _e, SPC, NWL, _g, _a, _m, _e, PRD, NWL, END, }; u16 gMsg_ID_20331[38] = { - NP9, _F, _a, _l, _c, _o, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, NWL, + PRI1, _F, _a, _l, _c, _o, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, NWL, _u, _n, _d, _e, _r, SPC, _m, _a, _i, _n, _t, _e, _n, _a, _n, _c, _e, PRD, NWL, END, }; u16 gMsg_ID_20332[36] = { - NP9, _P, _e, _p, _p, _y, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, _i, _n, SPC, NWL, + PRI1, _P, _e, _p, _p, _y, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, _i, _n, SPC, NWL, _f, _o, _r, SPC, _r, _e, _p, _a, _i, _r, _s, PRD, NWL, END, }; u16 gMsg_ID_20333[36] = { - NP9, _S, _l, _i, _p, _p, _y, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, _i, _n, NWL, + PRI1, _S, _l, _i, _p, _p, _y, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, _i, _n, NWL, _f, _o, _r, SPC, _r, _e, _p, _a, _i, _r, _s, PRD, NWL, END, }; u16 gMsg_ID_20337[38] = { - NP9, _F, _a, _l, _c, _o, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, _i, _n, NWL, + PRI1, _F, _a, _l, _c, _o, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, _i, _n, NWL, _t, _h, _e, SPC, _d, _o, _c, _k, _i, _n, _g, SPC, _b, _a, _y, PRD, NWL, END, }; u16 gMsg_ID_20338[38] = { - NP9, _P, _e, _p, _p, _y, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, _i, _n, NWL, + PRI1, _P, _e, _p, _p, _y, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, _i, _n, NWL, _t, _h, _e, SPC, _d, _o, _c, _k, _i, _n, _g, SPC, _b, _a, _y, PRD, NWL, END, }; u16 gMsg_ID_20339[40] = { - NP9, _S, _l, _i, _p, _p, _y, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, _i, _n, NWL, + PRI1, _S, _l, _i, _p, _p, _y, APS, _s, SPC, _s, _h, _i, _p, SPC, _i, _s, SPC, _i, _n, NWL, _t, _h, _e, SPC, _d, _o, _c, _k, _i, _n, _g, SPC, _b, _a, _y, PRD, NWL, END, }; u16 gMsg_ID_20340[42] = { - NP9, _M, _a, _i, _n, _t, _e, _n, _a, _n, _c, _e, SPC, NWL, + PRI1, _M, _a, _i, _n, _t, _e, _n, _a, _n, _c, _e, SPC, NWL, _c, _o, _m, _p, _l, _e, _t, _e, SPC, _o, _n, SPC, _F, _a, _l, _c, _o, APS, _s, SPC, NWL, _s, _h, _i, _p, PRD, NWL, END, }; u16 gMsg_ID_20343[38] = { - NP9, _R, _e, _p, _a, _i, _r, _s, SPC, _c, _o, _m, _p, _l, _e, _t, _e, SPC, _o, _n, SPC, NWL, + PRI1, _R, _e, _p, _a, _i, _r, _s, SPC, _c, _o, _m, _p, _l, _e, _t, _e, SPC, _o, _n, SPC, NWL, _F, _a, _l, _c, _o, APS, _s, SPC, _s, _h, _i, _p, PRD, NWL, END, }; u16 gMsg_ID_20344[38] = { - NP9, _R, _e, _p, _a, _i, _r, _s, SPC, _c, _o, _m, _p, _l, _e, _t, _e, SPC, _o, _n, SPC, NWL, + PRI1, _R, _e, _p, _a, _i, _r, _s, SPC, _c, _o, _m, _p, _l, _e, _t, _e, SPC, _o, _n, SPC, NWL, _P, _e, _p, _p, _y, APS, _s, SPC, _s, _h, _i, _p, PRD, NWL, END, }; u16 gMsg_ID_20345[38] = { - NP9, _R, _e, _p, _a, _i, _r, _s, SPC, _c, _o, _m, _p, _l, _e, _t, _e, SPC, _o, _n, SPC, NWL, + PRI1, _R, _e, _p, _a, _i, _r, _s, SPC, _c, _o, _m, _p, _l, _e, _t, _e, SPC, _o, _n, SPC, NWL, _S, _l, _i, _p, _p, _y, APS, _s, SPC, _s, _h, _i, _p, PRD, NWL, END, }; u16 gMsg_ID_21010[34] = { - NP9, _S, _t, _a, _r, SPC, _F, _o, _x, CMA, SPC, _w, _e, NWL, + PRI1, _S, _t, _a, _r, SPC, _F, _o, _x, CMA, SPC, _w, _e, NWL, _a, _r, _e, SPC, _i, _n, SPC, _y, _o, _u, _r, NWL, _d, _e, _b, _t, PRD, NWL, END, }; u16 gMsg_ID_21020[64] = { - NP9, _I, SPC, _w, _o, _u, _l, _d, SPC, _b, _e, NWL, + PRI1, _I, SPC, _w, _o, _u, _l, _d, SPC, _b, _e, NWL, _h, _o, _n, _o, _r, _e, _d, SPC, _t, _o, NWL, _h, _a, _v, _e, SPC, _y, _o, _u, SPC, _a, _s, NWL, _p, _a, _r, _t, SPC, _o, _f, SPC, _t, _h, _e, NWL, @@ -3982,68 +3982,68 @@ u16 gMsg_ID_21020[64] = { END, }; u16 gMsg_ID_21030[50] = { - NP9, _O, _h, SPC, _n, _o, CMA, SPC, _s, _i, _r, PRD, NWL, + PRI1, _O, _h, SPC, _n, _o, CMA, SPC, _s, _i, _r, PRD, NWL, _W, _e, SPC, _p, _r, _e, _f, _e, _r, NWL, _d, _o, _i, _n, _g, SPC, _t, _h, _i, _n, _g, _s, NWL, _o, _u, _r, SPC, _o, _w, _n, SPC, _w, _a, _y, PRD, NWL, END, }; u16 gMsg_ID_21050[30] = { - NP9, _G, _r, _e, _a, _t, SPC, _F, _o, _x, SPC, _i, _s, SPC, _r, _e, _a, _d, _y, SPC, NWL, + PRI1, _G, _r, _e, _a, _t, SPC, _F, _o, _x, SPC, _i, _s, SPC, _r, _e, _a, _d, _y, SPC, NWL, _t, _o, SPC, _g, _o, PRD, NWL, END, }; u16 gMsg_ID_21060[32] = { - NP9, _I, _t, SPC, _i, _s, SPC, _t, _i, _m, _e, SPC, _f, _o, _r, NWL, + PRI1, _I, _t, SPC, _i, _s, SPC, _t, _i, _m, _e, SPC, _f, _o, _r, NWL, _u, _s, SPC, _t, _o, SPC, _g, _o, SPC, _n, _o, _w, PRD, NWL, END, }; u16 gMsg_ID_21070[20] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _r, _i, _g, _h, _t, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _r, _i, _g, _h, _t, EXM, NWL, END, }; u16 gMsg_ID_21071[18] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _l, _e, _f, _t, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _l, _e, _f, _t, EXM, NWL, END, }; u16 gMsg_ID_21072[16] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _u, _p, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _u, _p, EXM, NWL, END, }; u16 gMsg_ID_21073[18] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _d, _o, _w, _n, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _d, _o, _w, _n, EXM, NWL, END, }; u16 gMsg_ID_21080[20] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _r, _i, _g, _h, _t, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _r, _i, _g, _h, _t, EXM, NWL, END, }; u16 gMsg_ID_21081[18] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _l, _e, _f, _t, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _l, _e, _f, _t, EXM, NWL, END, }; u16 gMsg_ID_21082[16] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _u, _p, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _u, _p, EXM, NWL, END, }; u16 gMsg_ID_21083[18] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _d, _o, _w, _n, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _d, _o, _w, _n, EXM, NWL, END, }; u16 gMsg_ID_21090[20] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _r, _i, _g, _h, _t, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _r, _i, _g, _h, _t, EXM, NWL, END, }; u16 gMsg_ID_21091[18] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _l, _e, _f, _t, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _l, _e, _f, _t, EXM, NWL, END, }; u16 gMsg_ID_21092[16] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _u, _p, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _u, _p, EXM, NWL, END, }; u16 gMsg_ID_21093[18] = { - NP9, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _d, _o, _w, _n, EXM, NWL, + PRI1, _I, APS, _m, SPC, _g, _o, _i, _n, _g, SPC, _d, _o, _w, _n, EXM, NWL, END, }; u16 gMsg_ID_22000[10] = { @@ -4133,183 +4133,183 @@ u16 gMsg_ID_22020[14] = { END, }; u16 gMsg_ID_23000[34] = { - NP9, _U, _s, _e, SPC, _t, _h, _e, SPC, _C, _o, _n, _t, _r, _o, _l, SPC, NWL, + PRI1, _U, _s, _e, SPC, _t, _h, _e, SPC, _C, _o, _n, _t, _r, _o, _l, SPC, NWL, _S, _t, _i, _c, _k, SPC, _t, _o, SPC, _f, _l, _y, PRD, NWL, END, }; u16 gMsg_ID_23001[52] = { - NP9, _T, _o, SPC, _a, _s, _c, _e, _n, _d, CMA, SPC, _p, _u, _l, _l, SPC, NWL, + PRI1, _T, _o, SPC, _a, _s, _c, _e, _n, _d, CMA, SPC, _p, _u, _l, _l, SPC, NWL, _b, _a, _c, _k, PRD, SPC, _T, _o, SPC, _d, _e, _s, _c, _e, _n, _d, CMA, NWL, _p, _u, _s, _h, SPC, _f, _o, _r, _w, _a, _r, _d, PRD, NWL, END, }; u16 gMsg_ID_23002[46] = { - NP9, _P, _r, _e, _s, _s, SPC, _Z, SPC, _o, _r, SPC, _R, SPC, _t, _o, NWL, + PRI1, _P, _r, _e, _s, _s, SPC, _Z, SPC, _o, _r, SPC, _R, SPC, _t, _o, NWL, _m, _o, _v, _e, SPC, _l, _e, _f, _t, SPC, _o, _r, SPC, _r, _i, _g, _h, _t, NWL, _q, _u, _i, _c, _k, _l, _y, PRD, NWL, END, }; u16 gMsg_ID_23003[60] = { - NP9, _P, _r, _e, _s, _s, SPC, _Z, SPC, _o, _r, SPC, _R, SPC, _t, _w, _i, _c, _e, NWL, + PRI1, _P, _r, _e, _s, _s, SPC, _Z, SPC, _o, _r, SPC, _R, SPC, _t, _w, _i, _c, _e, NWL, _t, _o, SPC, _b, _a, _r, _r, _e, _l, SPC, _r, _o, _l, _l, PRD, SPC, _I, _t, NWL, _r, _e, _p, _e, _l, _s, SPC, _e, _n, _e, _m, _y, SPC, _f, _i, _r, _e, PRD, NWL, END, }; u16 gMsg_ID_23004[44] = { - NP9, _P, _r, _e, _s, _s, SPC, _B, SPC, _t, _o, SPC, _b, _o, _m, _b, PRD, NWL, + PRI1, _P, _r, _e, _s, _s, SPC, _B, SPC, _t, _o, SPC, _b, _o, _m, _b, PRD, NWL, _P, _r, _e, _s, _s, SPC, _a, _g, _a, _i, _n, SPC, _t, _o, NWL, _d, _e, _t, _o, _n, _a, _t, _e, PRD, NWL, END, }; u16 gMsg_ID_23005[44] = { - NP9, _I, _f, SPC, _y, _o, _u, SPC, _h, _o, _l, _d, SPC, _A, CMA, SPC, NWL, + PRI1, _I, _f, SPC, _y, _o, _u, SPC, _h, _o, _l, _d, SPC, _A, CMA, SPC, NWL, _i, _t, APS, _l, _l, SPC, _c, _h, _a, _r, _g, _e, SPC, _y, _o, _u, _r, NWL, _l, _a, _s, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_23006[40] = { - NP9, _L, _o, _c, _k, SPC, _o, _n, SPC, _e, _n, _e, _m, _i, _e, _s, NWL, + PRI1, _L, _o, _c, _k, SPC, _o, _n, SPC, _e, _n, _e, _m, _i, _e, _s, NWL, _w, _h, _e, _n, SPC, _c, _h, _a, _r, _g, _i, _n, _g, SPC, _l, _a, _s, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_23007[40] = { - NP9, _Y, _o, _u, SPC, _c, _a, _n, SPC, _l, _o, _c, _k, SPC, _o, _n, SPC, _a, _n, _d, NWL, + PRI1, _Y, _o, _u, SPC, _c, _a, _n, SPC, _l, _o, _c, _k, SPC, _o, _n, SPC, _a, _n, _d, NWL, _s, _h, _o, _o, _t, SPC, _b, _o, _m, _b, _s, CMA, SPC, _t, _o, _o, PRD, NWL, END, }; u16 gMsg_ID_23008[54] = { - NP9, _Y, _o, _u, SPC, _g, _e, _t, SPC, _b, _o, _n, _u, _s, SPC, _p, _t, _s, PRD, NWL, + PRI1, _Y, _o, _u, SPC, _g, _e, _t, SPC, _b, _o, _n, _u, _s, SPC, _p, _t, _s, PRD, NWL, _i, _f, SPC, _2, SPC, _o, _r, SPC, _m, _o, _r, _e, SPC, _f, _o, _e, _s, NWL, _a, _r, _e, SPC, _d, _e, _s, _t, _r, _o, _y, _e, _d, PRD, NWL, END, }; u16 gMsg_ID_23009[44] = { - NP9, _A, SPC, _s, _i, _l, _v, _e, _r, SPC, _r, _i, _n, _g, SPC, NWL, + PRI1, _A, SPC, _s, _i, _l, _v, _e, _r, SPC, _r, _i, _n, _g, SPC, NWL, _r, _e, _f, _i, _l, _l, _s, SPC, _t, _h, _e, SPC, _s, _h, _i, _e, _l, _d, NWL, _g, _a, _u, _g, _e, PRD, NWL, END, }; u16 gMsg_ID_23010[48] = { - NP9, _3, SPC, _g, _o, _l, _d, SPC, _r, _i, _n, _g, _s, SPC, _w, _i, _l, _l, NWL, + PRI1, _3, SPC, _g, _o, _l, _d, SPC, _r, _i, _n, _g, _s, SPC, _w, _i, _l, _l, NWL, _i, _n, _c, _r, _e, _a, _s, _e, SPC, _y, _o, _u, _r, NWL, _s, _h, _i, _e, _l, _d, SPC, _g, _a, _u, _g, _e, PRD, NWL, END, }; u16 gMsg_ID_23011[44] = { - NP9, _T, _h, _e, SPC, _l, _a, _s, _e, _r, SPC, _i, _t, _e, _m, NWL, + PRI1, _T, _h, _e, SPC, _l, _a, _s, _e, _r, SPC, _i, _t, _e, _m, NWL, _w, _i, _l, _l, SPC, _p, _o, _w, _e, _r, SPC, _u, _p, NWL, _y, _o, _u, _r, SPC, _l, _a, _s, _e, _r, PRD, NWL, END, }; u16 gMsg_ID_23012[36] = { - NP9, _H, _y, _p, _e, _r, SPC, _i, _s, SPC, _m, _o, _r, _e, NWL, + PRI1, _H, _y, _p, _e, _r, SPC, _i, _s, SPC, _m, _o, _r, _e, NWL, _p, _o, _w, _e, _r, _f, _u, _l, SPC, _t, _h, _a, _n, SPC, _t, _w, _i, _n, PRD, NWL, END, }; u16 gMsg_ID_23013[38] = { - NP9, _W, _i, _n, _g, SPC, _r, _e, _p, _a, _i, _r, SPC, _w, _i, _l, _l, NWL, + PRI1, _W, _i, _n, _g, SPC, _r, _e, _p, _a, _i, _r, SPC, _w, _i, _l, _l, NWL, _r, _e, _p, _a, _i, _r, SPC, _y, _o, _u, _r, SPC, _w, _i, _n, _g, _s, PRD, NWL, END, }; u16 gMsg_ID_23014[36] = { - NP9, _L, _e, _t, APS, _s, SPC, _p, _r, _a, _c, _t, _i, _c, _e, SPC, NWL, + PRI1, _L, _e, _t, APS, _s, SPC, _p, _r, _a, _c, _t, _i, _c, _e, SPC, NWL, _s, _p, _e, _e, _d, SPC, _a, _n, _d, SPC, _U, DSH, _t, _u, _r, _n, PRD, NWL, END, }; u16 gMsg_ID_23015[24] = { - NP9, _P, _r, _e, _s, _s, SPC, _C, ALF, SPC, CLF, SPC, _f, _o, _r, NWL, + PRI1, _P, _r, _e, _s, _s, SPC, _C, ALF, SPC, CLF, SPC, _f, _o, _r, NWL, _b, _o, _o, _s, _t, PRD, NWL, END, }; u16 gMsg_ID_23016[24] = { - NP9, _P, _r, _e, _s, _s, SPC, _C, ADN, SPC, CDN, SPC, _t, _o, SPC, NWL, + PRI1, _P, _r, _e, _s, _s, SPC, _C, ADN, SPC, CDN, SPC, _t, _o, SPC, NWL, _b, _r, _a, _k, _e, PRD, NWL, END, }; u16 gMsg_ID_23017[36] = { - NP9, _T, _o, SPC, _s, _o, _m, _e, _r, _s, _a, _u, _l, _t, CMA, NWL, + PRI1, _T, _o, SPC, _s, _o, _m, _e, _r, _s, _a, _u, _l, _t, CMA, NWL, _p, _r, _e, _s, _s, SPC, ADN, SPC, _a, _n, _d, SPC, _C, ALF, SPC, CLF, PRD, NWL, END, }; u16 gMsg_ID_23018[36] = { - NP9, _Y, _o, _u, SPC, _c, _a, _n, SPC, _U, DSH, _t, _u, _r, _n, SPC, _i, _n, NWL, + PRI1, _Y, _o, _u, SPC, _c, _a, _n, SPC, _U, DSH, _t, _u, _r, _n, SPC, _i, _n, NWL, _a, _l, _l, DSH, _r, _a, _n, _g, _e, SPC, _m, _o, _d, _e, PRD, NWL, END, }; u16 gMsg_ID_23019[30] = { - NP9, _P, _r, _e, _s, _s, SPC, ADN, SPC, _a, _n, _d, SPC, _C, ADN, SPC, CDN, NWL, + PRI1, _P, _r, _e, _s, _s, SPC, ADN, SPC, _a, _n, _d, SPC, _C, ADN, SPC, CDN, NWL, _t, _o, SPC, _U, DSH, _t, _u, _r, _n, PRD, NWL, END, }; u16 gMsg_ID_23020[38] = { - NP9, _T, _h, _i, _s, SPC, _o, _n, _l, _y, SPC, _w, _o, _r, _k, _s, SPC, _i, _n, NWL, + PRI1, _T, _h, _i, _s, SPC, _o, _n, _l, _y, SPC, _w, _o, _r, _k, _s, SPC, _i, _n, NWL, _a, _l, _l, DSH, _r, _a, _n, _g, _e, SPC, _m, _o, _d, _e, PRD, NWL, END, }; u16 gMsg_ID_23021[42] = { - NP9, _P, _r, _e, _s, _s, SPC, _C, AUP, SPC, CUP, SPC, _t, _o, SPC, NWL, + PRI1, _P, _r, _e, _s, _s, SPC, _C, AUP, SPC, CUP, SPC, _t, _o, SPC, NWL, _c, _h, _a, _n, _g, _e, SPC, _t, _h, _e, SPC, _c, _a, _m, _e, _r, _a, NWL, _a, _n, _g, _l, _e, PRD, NWL, END, }; u16 gMsg_ID_23022[40] = { - NP9, _T, _o, SPC, _r, _e, _s, _p, _o, _n, _d, SPC, _t, _o, SPC, NWL, + PRI1, _T, _o, SPC, _r, _e, _s, _p, _o, _n, _d, SPC, _t, _o, SPC, NWL, _m, _e, _s, _s, _a, _g, _e, _s, CMA, SPC, _p, _r, _e, _s, _s, NWL, _C, ART, SPC, CRT, PRD, NWL, END, }; u16 gMsg_ID_23023[30] = { - NP9, _P, _r, _e, _s, _s, SPC, _A, SPC, _o, _n, _c, _e, SPC, _m, _o, _r, _e, NWL, + PRI1, _P, _r, _e, _s, _s, SPC, _A, SPC, _o, _n, _c, _e, SPC, _m, _o, _r, _e, NWL, _t, _o, SPC, _s, _h, _o, _o, _t, PRD, NWL, END, }; u16 gMsg_ID_23024[48] = { - NP9, _T, _h, _e, SPC, _e, _f, _f, _e, _c, _t, SPC, _i, _s, NWL, + PRI1, _T, _h, _e, SPC, _e, _f, _f, _e, _c, _t, SPC, _i, _s, NWL, _g, _r, _e, _a, _t, _e, _r, SPC, _i, _f, SPC, _y, _o, _u, NWL, _h, _o, _l, _d, SPC, _t, _h, _e, SPC, _b, _u, _t, _t, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_23025[50] = { - NP9, _I, _f, SPC, _b, _o, _o, _s, _t, SPC, _m, _e, _t, _e, _r, SPC, _i, _s, NWL, + PRI1, _I, _f, SPC, _b, _o, _o, _s, _t, SPC, _m, _e, _t, _e, _r, SPC, _i, _s, NWL, _r, _e, _d, CMA, SPC, _n, _o, SPC, _t, _e, _c, _h, _n, _i, _q, _u, _e, _s, NWL, _w, _i, _l, _l, SPC, _w, _o, _r, _k, PRD, NWL, END, }; u16 gMsg_ID_23026[40] = { - NP9, _P, _r, _e, _s, _s, SPC, _S, _T, _A, _R, _T, SPC, _a, _n, _d, NWL, + PRI1, _P, _r, _e, _s, _s, SPC, _S, _T, _A, _R, _T, SPC, _a, _n, _d, NWL, _c, _h, _o, _o, _s, _e, SPC, _Q, _U, _I, _T, SPC, _t, _o, SPC, _q, _u, _i, _t, PRD, NWL, END, }; u16 gMsg_ID_23027[38] = { - NP9, _C, _o, _l, _l, _e, _c, _t, SPC, _3, SPC, _m, _o, _r, _e, SPC, _f, _o, _r, NWL, + PRI1, _C, _o, _l, _l, _e, _c, _t, SPC, _3, SPC, _m, _o, _r, _e, SPC, _f, _o, _r, NWL, _a, _n, SPC, _e, _x, _t, _r, _a, SPC, _A, _r, _w, _i, _n, _g, PRD, NWL, END, }; u16 gMsg_ID_23028[32] = { - NP9, _N, _o, _w, SPC, _m, _o, _v, _i, _n, _g, SPC, _t, _o, NWL, + PRI1, _N, _o, _w, SPC, _m, _o, _v, _i, _n, _g, SPC, _t, _o, NWL, _a, _l, _l, DSH, _r, _a, _n, _g, _e, SPC, _m, _o, _d, _e, PRD, NWL, END, }; u16 gMsg_ID_23029[44] = { - NP9, _Y, _o, _u, SPC, _c, _a, _n, SPC, _f, _l, _y, SPC, NWL, + PRI1, _Y, _o, _u, SPC, _c, _a, _n, SPC, _f, _l, _y, SPC, NWL, _a, _n, _y, _w, _h, _e, _r, _e, SPC, _i, _n, NWL, _a, _l, _l, DSH, _r, _a, _n, _g, _e, SPC, _m, _o, _d, _e, PRD, NWL, END, }; u16 gMsg_ID_23030[48] = { - NP9, _T, _h, _e, SPC, _y, _e, _l, _l, _o, _w, SPC, _m, _a, _r, _k, SPC, _o, _n, NWL, + PRI1, _T, _h, _e, SPC, _y, _e, _l, _l, _o, _w, SPC, _m, _a, _r, _k, SPC, _o, _n, NWL, _r, _a, _d, _a, _r, SPC, _s, _h, _o, _w, _s, SPC, _y, _o, _u, _r, NWL, _p, _o, _s, _i, _t, _i, _o, _n, PRD, NWL, END, }; u16 gMsg_ID_23031[52] = { - NP9, _I, _f, SPC, _y, _o, _u, SPC, _r, _e, _a, _c, _h, SPC, _t, _h, _e, NWL, + PRI1, _I, _f, SPC, _y, _o, _u, SPC, _r, _e, _a, _c, _h, SPC, _t, _h, _e, NWL, _e, _d, _g, _e, SPC, _o, _f, SPC, _t, _h, _e, SPC, _m, _a, _p, CMA, NWL, _y, _o, _u, APS, _l, _l, SPC, _U, DSH, _t, _u, _r, _n, PRD, NWL, END, }; u16 gMsg_ID_23032[42] = { - NP9, _C, _o, _n, _t, _i, _n, _u, _e, SPC, _t, _o, SPC, NWL, + PRI1, _C, _o, _n, _t, _i, _n, _u, _e, SPC, _t, _o, SPC, NWL, _p, _r, _a, _c, _t, _i, _c, _e, SPC, _a, _l, _l, DSH, _r, _a, _n, _g, _e, SPC, NWL, _m, _o, _d, _e, PRD, NWL, END, diff --git a/src/main/fox_43AC0.c b/src/main/fox_43AC0.c new file mode 100644 index 00000000..237a6be9 --- /dev/null +++ b/src/main/fox_43AC0.c @@ -0,0 +1,117 @@ +#include "global.h" + +s32 D_801613A0; + +s32 D_800C9E90[28] = { + 0x8012, 0x8013, 0x8015, 0x8017, 0x8017, 0x8019, 0x8018, 0x801B, 0x8016, 0x8018, 0x8012, 0x8020, 0x8014, 0x801E, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, +}; + +const f32 D_800D55D0[] = { 6000.0f, 18000.0f, -6000.0f, -18000.0f }; + +void func_80042EC0(Object_408* arg0) { + s32 var_a3; + f32 var_fv0; + + if (D_801613A0 < 0xF00) { + var_a3 = 10; + } else if (D_801613A0 < 0x1680) { + var_a3 = 5; + } else if (D_801613A0 < 0x1E00) { + var_a3 = 2; + } else if (D_801613A0 < 0x2580) { + var_a3 = 1; + } else { + var_a3 = 0; + } + if (var_a3 != 0) { + var_fv0 = 0.0f; + if (arg0->obj.id == OBJECT_292) { + var_fv0 = 300.0f; + } else if (arg0->obj.id == OBJECT_306) { + var_fv0 = 200.0f; + } + func_80077240(arg0->obj.pos.x, arg0->obj.pos.y + var_fv0, arg0->obj.pos.z, var_a3); + } + gHitCount += var_a3 + 1; + D_80177850 = 0xF; +} + +void func_80042FAC(Object_408* arg0) { +} + +void func_80042FB8(Object_408* arg0) { +} + +void func_80042FC4(Object_408* arg0) { +} + +void func_80042FD0(Object_408* arg0) { +} + +void func_80042FDC(Object_408* arg0) { +} + +void func_80042FE8(Object_408* arg0) { +} + +void func_80042FF4(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, + f32 arg9, f32 argA, s32 argB, s32 argC) { + Object_2F4_Initialize(arg0); + arg0->obj.status = 1; + arg0->obj.id = OBJECT_189; + arg0->unk_0B8 = argB; + arg0->obj.pos.x = arg1; + arg0->obj.pos.y = arg2; + arg0->obj.pos.z = arg3; + arg0->obj.rot.x = arg4; + arg0->obj.rot.y = arg5; + arg0->obj.rot.z = arg6; + arg0->unk_0E8.x = arg7; + arg0->unk_0E8.y = arg8; + arg0->unk_0E8.z = arg9; + arg0->unk_110 = argA; + arg0->unk_0BC = argC; + arg0->unk_0BE = 20; + func_800612B8(&arg0->unk_01C, arg0->obj.id); + if (gLevelType == 0) { + arg0->unk_10C = 0.5f; + } +} + +void func_800430DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, f32 arg9, + s32 argA, s32 argB) { + s32 i; + + for (i = 59; i >= 0; i--) { + if (gObjects2F4[i].obj.status == 0) { + func_80042FF4(&gObjects2F4[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, argA, argB); + return; + } + } +} + +void func_80043188(Object_2F4* arg0) { + arg0->unk_01C.unk_10 = 30000.0f; +} + +void func_8004319C(Player* arg0, f32 arg1, f32 arg2, f32 arg3) { + func_800182F4(0x105000FF); + func_800182F4(0x115000FF); + + D_80177A80 = 0; + D_80178448 = arg3 + D_80177D20; + D_80178440 = arg1; + D_80178444 = arg2; + + arg0->unk_1C8 = 7; + arg0->unk_1D0 = 10; + arg0->unk_1F8 = 50; + arg0->unk_1FC = 50; + arg0->unk_000 = 0.0f; + arg0->unk_004 = 1.0f; + if (arg0->unk_074 < arg0->unk_0AC) { + arg0->unk_004 = -1.0f; + } + gPlayer[0].unk_0C0.x = 0.0f; +} diff --git a/src/main/fox_52730.c b/src/main/fox_52730.c index 32f4059e..dfb89777 100644 --- a/src/main/fox_52730.c +++ b/src/main/fox_52730.c @@ -1,8 +1,9 @@ #include "global.h" +s16 D_80161410; Vec3f D_801613B0[4]; Vec3f D_801613E0[4]; -s16 D_80161410; + Matrix D_80161418[4]; Vec3f D_80161518[4]; Vec3f D_80161548[4]; @@ -30,7 +31,7 @@ void func_80051B30(void) { if ((D_80177854 == 0x64) || (D_800CA234 == NULL)) { return; } - if ((D_800CA234->obj.status != 2) || (D_80178280->unk_1C8 != 3)) { + if ((D_800CA234->obj.status != 2) || (gPlayer[0].unk_1C8 != 3)) { D_800CA234 = NULL; D_800CA238 = 0; return; @@ -43,11 +44,11 @@ void func_80051B30(void) { } } if (!(D_800CA238 & 4)) { - Matrix_RotateY(gCalcMatrix, D_80178280->unk_058, 0); - Matrix_RotateX(gCalcMatrix, D_80178280->unk_05C, 1); - sp68.x = D_800CA234->obj.pos.x - D_80178280->unk_040.x; - sp68.y = D_800CA234->obj.pos.y - D_80178280->unk_040.y; - sp68.z = D_800CA234->obj.pos.z + D_80177D20 - D_80178280->unk_040.z; + Matrix_RotateY(gCalcMatrix, gPlayer[0].unk_058, 0); + Matrix_RotateX(gCalcMatrix, gPlayer[0].unk_05C, 1); + sp68.x = D_800CA234->obj.pos.x - gPlayer[0].unk_040.x; + sp68.y = D_800CA234->obj.pos.y - gPlayer[0].unk_040.y; + sp68.z = D_800CA234->obj.pos.z + D_80177D20 - gPlayer[0].unk_040.z; Matrix_MultVec3f(gCalcMatrix, &sp68, &sp5C); sp7C = 0; if ((sp5C.z < 0.0f) && (sp5C.z > -12000.0f) && (fabsf(sp5C.x) < fabsf(sp5C.z * 0.4f))) { @@ -121,7 +122,7 @@ void func_80051B30(void) { } s32 func_800520FC(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* data) { - UnkStruct_D_80178280* arg4 = (UnkStruct_D_80178280*) data; + Player* arg4 = (Player*) data; gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); if (arg4->unk_1C4 == 1) { @@ -178,7 +179,7 @@ s32 func_800520FC(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* dat void func_800523A8(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp1C; - UnkStruct_D_80178280* arg2 = (UnkStruct_D_80178280*) data; + Player* arg2 = (Player*) data; if (limbIndex == 0xB) { sp1C.x = 3.0f; @@ -190,7 +191,7 @@ void func_800523A8(s32 limbIndex, Vec3f* rot, void* data) { void func_80052420(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp1C; - UnkStruct_D_80178280* arg2 = (UnkStruct_D_80178280*) data; + Player* arg2 = (Player*) data; if (limbIndex == 0x10) { sp1C.x = 13.0f; @@ -202,7 +203,7 @@ void func_80052420(s32 limbIndex, Vec3f* rot, void* data) { void func_80052498(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp1C; - UnkStruct_D_80178280* arg2 = (UnkStruct_D_80178280*) data; + Player* arg2 = (Player*) data; if (limbIndex == 0xB) { sp1C.x = 0.0f; @@ -214,7 +215,7 @@ void func_80052498(s32 limbIndex, Vec3f* rot, void* data) { void func_8005250C(s32 limbIndex, Vec3f* rot, void* data) { Vec3f sp1C; - UnkStruct_D_80178280* arg2 = (UnkStruct_D_80178280*) data; + Player* arg2 = (Player*) data; if (limbIndex == 0xB) { sp1C.x = 19.0f; @@ -224,7 +225,7 @@ void func_8005250C(s32 limbIndex, Vec3f* rot, void* data) { } } -void func_80052584(UnkStruct_D_80178280* arg0) { +void func_80052584(Player* arg0) { Matrix_Push(&gGfxMatrix); Matrix_Copy(gGfxMatrix, &gIdentityMatrix); if ((arg0->unk_1C8 == 3) && (arg0->unk_1F8 != 0)) { @@ -240,7 +241,7 @@ void func_80052584(UnkStruct_D_80178280* arg0) { Matrix_Pop(&gGfxMatrix); } -void func_800526B8(UnkStruct_D_80178280* arg0) { +void func_800526B8(Player* arg0) { Matrix_Push(&gGfxMatrix); Matrix_Scale(gCalcMatrix, 0.5f, 0.5f, 0.5f, 1); Matrix_Translate(gCalcMatrix, 0.0f, 35.0f, 0.0f, 1); @@ -264,7 +265,7 @@ void func_800526B8(UnkStruct_D_80178280* arg0) { // Vec3f D_800CA254 = {0.0f, 0.0f, 90.0f}; // Vec3f D_800CA260 = {0.0f, 40.0f, -70.0f}; -void func_80052884(UnkStruct_D_80178280* arg0) { +void func_80052884(Player* arg0) { f32 sp64; Vec3f sp58; Vec3f sp4C = { 0.0f, 0.0f, 90.0f }; @@ -283,7 +284,7 @@ void func_80052884(UnkStruct_D_80178280* arg0) { if (D_801778A0 == arg0->unk_1C4) { sp64 = 0.0f; if (D_801779C8[arg0->unk_1C4] >= 20) { - sp64 = (f32) (D_80177DB0 & 7) * 80.0f; + sp64 = (f32) (gFrameCount & 7) * 80.0f; } sp58.x = 0.0f; sp58.y = 0.0f; @@ -314,7 +315,7 @@ f32 D_800CA294 = -10.0f; f32 D_800CA298[] = { 0.0f, 0.0f, 0.0f, 0.0f }; f32 D_800CA2A8 = 0.0f; -void func_80052B80(UnkStruct_D_80178280* arg0) { +void func_80052B80(Player* arg0) { Matrix_Push(&gGfxMatrix); if ((arg0->unk_1C8 == 3) && (arg0->unk_1A0 != 0)) { Matrix_Translate(gGfxMatrix, D_80161548[arg0->unk_1C4].x, D_80161548[arg0->unk_1C4].y, @@ -338,7 +339,7 @@ void func_80052B80(UnkStruct_D_80178280* arg0) { Matrix_Pop(&gGfxMatrix); } -void func_80052D48(UnkStruct_D_80178280* arg0) { +void func_80052D48(Player* arg0) { f32 sp2C; Matrix_Push(&gGfxMatrix); @@ -356,13 +357,13 @@ void func_80052D48(UnkStruct_D_80178280* arg0) { if (D_801778E8 == 0) { sp2C *= 1.1f; } - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { sp2C *= 1.1f; } Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 20.0f, 30.0f, -10.0f, 1); if (D_801778E8 == 0) { - Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1); + Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1); } Matrix_Scale(gGfxMatrix, sp2C, sp2C, sp2C, 1); Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1); @@ -379,13 +380,13 @@ void func_80052D48(UnkStruct_D_80178280* arg0) { if (D_801778E8 == 0) { sp2C *= 1.1f; } - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { sp2C *= 1.1f; } Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, -20.0f, 30.0f, -10.0f, 1); if (D_801778E8 == 0) { - Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1); + Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1); } Matrix_Scale(gGfxMatrix, sp2C, sp2C, sp2C, 1); Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1); @@ -407,19 +408,19 @@ void func_8005314C(void) { } } -s32 func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wingData) { - UnkStruct_D_80161630* wings = (UnkStruct_D_80161630*) wingData; +bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wingData) { + WingInfo* wings = (WingInfo*) wingData; - if ((D_800CA22C != 0) && (D_80178280->unk_200 == 0)) { + if ((D_800CA22C != 0) && (gPlayer[0].unk_200 == 0)) { RCP_SetupDL(&gMasterDisp, 0x1D); func_8005314C(); } switch (limbIndex) { case 13: - if (wings->unk_00 == 0) { + if (wings->rightState == 0) { *gfxPtr = NULL; } - if (wings->unk_00 == 1) { + if (wings->rightState == 1) { *gfxPtr = D_3015120; } if ((D_800CA22C != 0) && (D_80177D40[0] & 1)) { @@ -434,7 +435,7 @@ s32 func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* win break; case 1: case 2: - if (wings->unk_00 != 2) { + if (wings->rightState != 2) { *gfxPtr = NULL; } if ((D_800CA22C != 0) && (D_80177D40[0] & 1)) { @@ -448,10 +449,10 @@ s32 func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* win } break; case 12: - if (wings->unk_00 == 0) { + if (wings->rightState == 0) { *gfxPtr = NULL; } - if (wings->unk_01 == 1) { + if (wings->leftState == 1) { *gfxPtr = D_3014BF0; } if ((D_800CA22C != 0) && (D_80177D58[0] & 1)) { @@ -466,7 +467,7 @@ s32 func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* win break; case 5: case 6: - if (wings->unk_01 != 2) { + if (wings->leftState != 2) { *gfxPtr = NULL; } if ((D_800CA22C != 0) && (D_80177D58[0] & 1)) { @@ -508,10 +509,10 @@ s32 func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* win pos->x += wings->unk_18; break; } - return 0; + return false; } -void func_80053658(UnkStruct_D_80161630* arg0) { +void func_80053658(WingInfo* arg0) { Vec3f sp68[30]; s32 sp64; @@ -520,10 +521,10 @@ void func_80053658(UnkStruct_D_80161630* arg0) { if (arg0->unk_14 < -7.0f) { arg0->unk_18 = (-arg0->unk_14 - 7.0f) * 2.5f; } - if (D_80177834 == 7) { - Animation_DrawSkeleton(1, D_3016610, D_80178280[0].jointTable, func_800531A4, NULL, arg0, &gIdentityMatrix); + if (gGameState == GSTATE_PLAY) { + Animation_DrawSkeleton(1, D_3016610, gPlayer[0].jointTable, func_800531A4, NULL, arg0, &gIdentityMatrix); } else { - if (D_80177834 == 3) { + if (gGameState == GSTATE_MENU) { Animation_GetFrameData(&D_3015AF4, 0, sp68); } else { Animation_GetFrameData(&D_3015C28, 0, sp68); @@ -540,8 +541,8 @@ void func_80053658(UnkStruct_D_80161630* arg0) { Matrix_Translate(gGfxMatrix, 0.0f, 6.4f, -16.5f, 1); Matrix_RotateY(gGfxMatrix, arg0->unk_34 * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, arg0->unk_30 * M_DTOR, 1); - Matrix_Scale(gGfxMatrix, 0.0140994005f, 0.0140994005f, 0.0140994005f, 1); - if (D_80177834 == 8) { + Matrix_Scale(gGfxMatrix, 1.0f / 70.925f, 1.0f / 70.925f, 1.0f / 70.925f, 1); + if (gGameState == GSTATE_CREDITS) { Matrix_Scale(gGfxMatrix, 0.95f, 0.95f, 0.95f, 1); } Matrix_SetGfxMtx(&gMasterDisp); @@ -556,7 +557,7 @@ void func_80053658(UnkStruct_D_80161630* arg0) { Matrix_RotateX(gGfxMatrix, arg0->unk_38 * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL_64_2(); - if ((D_80177834 == 7) && (D_80178280->unk_1C8 == 2) && (D_80178234 == 0)) { + if ((gGameState == GSTATE_PLAY) && (gPlayer[0].unk_1C8 == 2) && (gCurrentLevel == LEVEL_CORNERIA)) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 120); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); gSPDisplayList(gMasterDisp++, D_30194E0); @@ -590,14 +591,14 @@ void func_80053B18(void) { Matrix_Pop(&gGfxMatrix); } -void func_80053C38(UnkStruct_D_80178280* arg0, s32 arg1) { +void func_80053C38(Player* arg0, s32 arg1) { Vec3f sp4C; f32 sp48; if ((D_801778A0 == arg0->unk_1C4) && (arg1 == 0)) { sp48 = 0.0f; if (D_801779C8[arg0->unk_1C4] >= 20) { - sp48 = (f32) (D_80177DB0 & 7) * 80.0f; + sp48 = (f32) (gFrameCount & 7) * 80.0f; } sp4C.x = 0.0f; sp4C.y = 0.0f; @@ -618,33 +619,33 @@ void func_80053C38(UnkStruct_D_80178280* arg0, s32 arg1) { } } else { if (D_801778E8 != 0) { - if ((arg0->unk_49C.unk_00 == 2) && (arg0->unk_49C.unk_01 == 2)) { + if ((arg0->wings.rightState == 2) && (arg0->wings.leftState == 2)) { gSPDisplayList(gMasterDisp++, D_300EE80); - } else if ((arg0->unk_49C.unk_00 < 2) && (arg0->unk_49C.unk_01 == 2)) { + } else if ((arg0->wings.rightState <= 1) && (arg0->wings.leftState == 2)) { gSPDisplayList(gMasterDisp++, D_3010A90); - } else if ((arg0->unk_49C.unk_00 == 2) && (arg0->unk_49C.unk_01 < 2)) { + } else if ((arg0->wings.rightState == 2) && (arg0->wings.leftState <= 1)) { gSPDisplayList(gMasterDisp++, D_3011470); } else { gSPDisplayList(gMasterDisp++, D_300D550); } } else { - if ((D_80177C98 == 1) || (D_80178234 == 0x11)) { - arg0->unk_49C.unk_28 = arg0->unk_49C.unk_04 = arg0->unk_49C.unk_08 = arg0->unk_49C.unk_0C = - arg0->unk_49C.unk_10 = 0.0f; + if ((gLevelType == 1) || (gCurrentLevel == LEVEL_BOLSE)) { + arg0->wings.unk_28 = arg0->wings.unk_04 = arg0->wings.unk_08 = arg0->wings.unk_0C = arg0->wings.unk_10 = + 0.0f; } D_800CA22C = 1; D_80161410 = arg1; - func_80053658(&arg0->unk_49C); + func_80053658(&arg0->wings); } } } -void func_80053F7C(UnkStruct_D_80178280* arg0) { +void func_80053F7C(Player* arg0) { Vec3f* pad; s32 i; if ((D_801778A0 == arg0->unk_1C4) && ((arg0->unk_1CC == 0) || (arg0->unk_1CC == 1)) && (arg0->unk_234 != 0) && - (((D_80177834 == 7) && (arg0->unk_1C8 == 3)) || (D_80177834 == 3))) { + (((gGameState == GSTATE_PLAY) && (arg0->unk_1C8 == 3)) || (gGameState == GSTATE_MENU))) { for (i = 0; i < 2; i++) { pad = &D_801613E0[i]; Matrix_Push(&gGfxMatrix); @@ -674,7 +675,7 @@ void func_80053F7C(UnkStruct_D_80178280* arg0) { } } -void func_80054280(UnkStruct_D_80178280* arg0, s32 arg1) { +void func_80054280(Player* arg0, s32 arg1) { switch (arg0->unk_1CC) { case 0: func_80053C38(arg0, arg1); @@ -691,7 +692,7 @@ void func_80054280(UnkStruct_D_80178280* arg0, s32 arg1) { } } -void func_80054300(UnkStruct_D_80178280* arg0) { +void func_80054300(Player* arg0) { Math_SmoothStepToF(&D_800CA2A8, arg0->unk_23C, 1.0f, 10.0f, 0.0f); RCP_SetupDL(&gMasterDisp, 0x42); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, (s32) D_800CA2A8); @@ -716,7 +717,7 @@ void func_80054300(UnkStruct_D_80178280* arg0) { Matrix_Scale(gGfxMatrix, 1.17f, 1.17f, 1.17f, 1); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 20.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - if (D_80178234 == 0xB) { + if (gCurrentLevel == LEVEL_MACBETH) { RCP_SetupDL(&gMasterDisp, 0x41); } if (D_801778E8 == 0) { @@ -762,7 +763,7 @@ void func_8005465C(s32 arg0) { gSPDisplayList(gMasterDisp++, D_1024AC0); } -void func_8005478C(UnkStruct_D_80178280* arg0) { +void func_8005478C(Player* arg0) { RCP_SetupDL_64(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 100); Matrix_Push(&gGfxMatrix); @@ -776,17 +777,17 @@ void func_8005478C(UnkStruct_D_80178280* arg0) { } else { Matrix_Scale(gGfxMatrix, arg0->unk_194, arg0->unk_194, 1.0f, 1); } - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { Matrix_Scale(gGfxMatrix, 0.9f, 0.63f, 1.0f, 1); } else { Matrix_Scale(gGfxMatrix, 0.80999994f, 0.567f, 1.0f, 1); } Matrix_SetGfxMtx(&gMasterDisp); - func_8005465C(D_80177C98); + func_8005465C(gLevelType); Matrix_Pop(&gGfxMatrix); } -void func_80054914(UnkStruct_D_80178280* arg0) { +void func_80054914(Player* arg0) { f32 sp4C; Vec3f sp40; Vec3f sp34; @@ -807,9 +808,9 @@ void func_80054914(UnkStruct_D_80178280* arg0) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, arg0->unk_074 + sp34.x, arg0->unk_078 + sp34.y, arg0->unk_138 + arg0->unk_144 + sp34.z, 1); - Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1); - Matrix_RotateX(gGfxMatrix, D_80178280[D_801778A0].unk_05C, 1); - Matrix_RotateZ(gGfxMatrix, D_80177DB0 * 20.0f * sp4C * M_DTOR, 1); + Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1); + Matrix_RotateX(gGfxMatrix, gPlayer[D_801778A0].unk_05C, 1); + Matrix_RotateZ(gGfxMatrix, gFrameCount * 20.0f * sp4C * M_DTOR, 1); if (arg0->unk_1CC == 0) { Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1); } else { @@ -827,7 +828,7 @@ void func_80054914(UnkStruct_D_80178280* arg0) { } } -void func_80054CA4(UnkStruct_D_80178280* arg0) { +void func_80054CA4(Player* arg0) { if (D_80177AB8[arg0->unk_1C4] > 1.0f) { Matrix_Push(&gGfxMatrix); Matrix_Copy(gGfxMatrix, &D_80161418[arg0->unk_1C4]); @@ -848,7 +849,7 @@ void func_80054CA4(UnkStruct_D_80178280* arg0) { // Vec3f D_800CA2B8 = {0.0f, -14.0f, 60.0f}; // Vec3f D_800CA2C4 = {30.0f, -10.0f, 30.0f}; // Vec3f D_800CA2D0 = {-30.0f, -10.0f, 30.0f}; -void func_80054E80(UnkStruct_D_80178280* arg0) { +void func_80054E80(Player* arg0) { Vec3f spC4 = { 0.0f, -5.0f, 60.0f }; Vec3f spB8 = { 0.0f, -14.0f, 60.0f }; Vec3f spAC = { 30.0f, -10.0f, 30.0f }; @@ -858,7 +859,7 @@ void func_80054E80(UnkStruct_D_80178280* arg0) { u8 var_v1; f32 sp80; - if (D_801779C8[arg0->unk_1C4] >= 0xB) { + if (D_801779C8[arg0->unk_1C4] > 10) { RCP_SetupDL(&gMasterDisp, 0x43); Matrix_Copy(gCalcMatrix, &D_80161418[arg0->unk_1C4]); if ((arg0->unk_238 != 0) && (D_80177880 == 0)) { @@ -896,10 +897,10 @@ void func_80054E80(UnkStruct_D_80178280* arg0) { } else { gDPSetEnvColor(gMasterDisp++, 0, 255, 0, 128); } - Matrix_RotateZ(gGfxMatrix, D_80177DB0 * 53.0f * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, gFrameCount * 53.0f * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_101C2E0); - Matrix_RotateZ(gGfxMatrix, D_80177DB0 * -53.0f * 2.0f * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, gFrameCount * -53.0f * 2.0f * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_101C2E0); Matrix_Pop(&gGfxMatrix); @@ -907,7 +908,7 @@ void func_80054E80(UnkStruct_D_80178280* arg0) { Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 0.3f, 1); } Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 1.0f, 1); - if (!(D_80177DB0 & 1)) { + if (!(gFrameCount & 1)) { Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.0f, 1); } else { Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.0f, 1); @@ -920,8 +921,8 @@ void func_80054E80(UnkStruct_D_80178280* arg0) { Matrix_Push(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x43); Matrix_Copy(gCalcMatrix, &D_80161418[arg0->unk_1C4]); - var_v1 = D_80161AA8[arg0->unk_1C4]; - if (arg0->unk_49C.unk_14 > -8.0f) { + var_v1 = gLaserStrength[arg0->unk_1C4]; + if (arg0->wings.unk_14 > -8.0f) { var_v1 = 0; } switch (var_v1) { @@ -969,7 +970,7 @@ void func_80054E80(UnkStruct_D_80178280* arg0) { } } -void func_80055788(UnkStruct_D_80178280* arg0) { +void func_80055788(Player* arg0) { f32 sp54; if (D_801779C8[arg0->unk_1C4] >= 0xB) { @@ -1001,15 +1002,15 @@ void func_80055788(UnkStruct_D_80178280* arg0) { } else { gDPSetEnvColor(gMasterDisp++, 0, 255, 0, 128); } - Matrix_RotateZ(gGfxMatrix, D_80177DB0 * 53.0f * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, gFrameCount * 53.0f * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_101C2E0); - Matrix_RotateZ(gGfxMatrix, D_80177DB0 * -53.0f * 2.0f * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, gFrameCount * -53.0f * 2.0f * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_101C2E0); Matrix_Pop(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 1.0f, 1); - if (!(D_80177DB0 & 1)) { + if (!(gFrameCount & 1)) { Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.0f, 1); } else { Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.0f, 1); @@ -1020,7 +1021,7 @@ void func_80055788(UnkStruct_D_80178280* arg0) { } } -void func_80055B58(UnkStruct_D_80178280* arg0) { +void func_80055B58(Player* arg0) { Vec3f sp4C; Vec3f sp40; f32 var_fv0; @@ -1048,8 +1049,8 @@ void func_80055B58(UnkStruct_D_80178280* arg0) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, arg0->unk_074 + sp40.x, arg0->unk_078 + sp40.y, arg0->unk_138 + arg0->unk_144 + sp40.z, 1); - Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1); - Matrix_RotateX(gGfxMatrix, D_80178280[D_801778A0].unk_05C, 1); + Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1); + Matrix_RotateX(gGfxMatrix, gPlayer[D_801778A0].unk_05C, 1); Matrix_SetGfxMtx(&gMasterDisp); func_8005478C(arg0); Matrix_Pop(&gGfxMatrix); @@ -1074,7 +1075,7 @@ void func_80055B58(UnkStruct_D_80178280* arg0) { } } -void func_80055E98(UnkStruct_D_80178280* arg0) { +void func_80055E98(Player* arg0) { f32 sp5C; f32 sp58; f32 sp54; @@ -1089,7 +1090,7 @@ void func_80055E98(UnkStruct_D_80178280* arg0) { } if (arg0->unk_25C != 0.0f) { sp54 = 0.0f; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { sp54 = 180.0f; } var_fs0 = arg0->unk_0E8; @@ -1104,7 +1105,7 @@ void func_80055E98(UnkStruct_D_80178280* arg0) { } RCP_SetupDL_64(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 100); - if (arg0->unk_49C.unk_01 == 2) { + if (arg0->wings.leftState == 2) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, sp5C, sp58, -100.0f, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * sp50, 1); @@ -1117,7 +1118,7 @@ void func_80055E98(UnkStruct_D_80178280* arg0) { gSPDisplayList(gMasterDisp++, D_102A8A0); Matrix_Pop(&gGfxMatrix); } - if (arg0->unk_49C.unk_00 == 2) { + if (arg0->wings.rightState == 2) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, -sp5C, sp58, -100.0f, 1); Matrix_RotateX(gGfxMatrix, M_DTOR * sp50, 1); @@ -1133,8 +1134,9 @@ void func_80055E98(UnkStruct_D_80178280* arg0) { } } -void func_80056230(UnkStruct_D_80178280* arg0) { - if ((arg0->unk_234 != 0) && (arg0->unk_1CC == 0) && (D_80178234 != 9) && (D_80178234 != 0xA) && (D_80177C98 == 0)) { +void func_80056230(Player* arg0) { + if ((arg0->unk_234 != 0) && (arg0->unk_1CC == 0) && (gCurrentLevel != LEVEL_VENOM_2) && + (gCurrentLevel != LEVEL_TRAINING) && (gLevelType == 0)) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, arg0->unk_074, arg0->unk_078, arg0->unk_138 + arg0->unk_144, 1); Matrix_RotateY(gGfxMatrix, (arg0->unk_114 + arg0->unk_0E8 + 180.0f) * M_DTOR, 1); @@ -1177,7 +1179,7 @@ s32 D_800CA2E8[16] = { 60, 40, 20, 20, 20, 20, 20, 20, 0, 0, 0, 0, 0, 0, 0, 0 }; #ifdef NON_MATCHING // Vec3f D_800CA328 = {0.0f, 0.0f, 0.0f}; -void func_800564C0(UnkStruct_D_80178280* arg0, s32 arg1) { +void func_800564C0(Player* arg0, s32 arg1) { s32 i; Vec3f sp50 = { 0.0f, 0.0f, 0.0f }; Vec3f* temp_s0; @@ -1191,7 +1193,7 @@ void func_800564C0(UnkStruct_D_80178280* arg0, s32 arg1) { Matrix_Translate(gGfxMatrix, arg0->unk_074, arg0->unk_078 + arg0->unk_18C + 30.0f, arg0->unk_138 + arg0->unk_144, 1); if (D_801778E8 != 0) { - for (i = 0; i < D_801778A8; i++) { + for (i = 0; i < gCamCount; i++) { if (D_80177B00[arg0->unk_1C4][i] != 0) { temp_s0 = &D_80161578[i]; Matrix_MultVec3f(gGfxMatrix, &sp50, temp_s0); @@ -1233,7 +1235,7 @@ void func_800564C0(UnkStruct_D_80178280* arg0, s32 arg1) { } else { Matrix_Translate(gGfxMatrix, arg0->unk_074, arg0->unk_078, arg0->unk_138 + arg0->unk_144, 1); if (D_801778E8 != 0) { - for (i = 0; i < D_801778A8; i++) { + for (i = 0; i < gCamCount; i++) { if (D_80177B00[arg0->unk_1C4][i] != 0) { temp_s0 = &D_80161578[i]; Matrix_MultVec3f(gGfxMatrix, &sp50, temp_s0); @@ -1258,15 +1260,15 @@ void func_800564C0(UnkStruct_D_80178280* arg0, s32 arg1) { switch (arg0->unk_200) { case 0: if (D_801778E8 == 0) { - if ((D_80178234 == 0xE) || (D_80178234 == 0xC)) { - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, 0x3ED); + if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_TITANIA)) { + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, 0x3ED); } else { - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } } else if (D_8017789C == 2) { - RCP_SetupDL_29(0x80, 0x80, 0xFF, 0xFF, D_801783D8, D_801783DC); + RCP_SetupDL_29(0x80, 0x80, 0xFF, 0xFF, gFogNear, gFogFar); } else { - RCP_SetupDL_29(0, 0, 0, 0xFF, D_801783D8, D_801783DC); + RCP_SetupDL_29(0, 0, 0, 0xFF, gFogNear, gFogFar); } break; case 1: @@ -1288,7 +1290,7 @@ void func_800564C0(UnkStruct_D_80178280* arg0, s32 arg1) { } #else Vec3f D_800CA328 = { 0.0f, 0.0f, 0.0f }; -void func_800564C0(UnkStruct_D_80178280*, s32); +void func_800564C0(Player*, s32); #pragma GLOBAL_ASM("asm/us/nonmatchings/main/fox_52730/func_800564C0.s") #endif @@ -1309,14 +1311,14 @@ f32 D_800CA38C[] = { -50.0f, }; -void func_80056E2C(UnkStruct_D_80178280* arg0) { +void func_80056E2C(Player* arg0) { f32 sp34; f32 sp30; f32 sp2C; if ((arg0->unk_234 != 0) && (arg0->unk_240 == 0)) { - sp34 = D_800CA334[D_80177DB0 & 7]; - sp30 = D_800CA334[(D_80177DB0 + 4) & 7]; + sp34 = D_800CA334[gFrameCount & 7]; + sp30 = D_800CA334[(gFrameCount + 4) & 7]; if (arg0->unk_1D4 != 0) { sp34 = sp30 = 0.0f; } @@ -1361,7 +1363,7 @@ void func_80057248(void) { Vec3f* var_s0; f32 var_fs0; - if (!(D_80177DB0 & 4)) { + if (!(gFrameCount & 4)) { RCP_SetupDL_40(); for (i = 0, var_s0 = D_80177E98; i < ARRAY_COUNT(D_80177E98); i++, var_s0++) { if (var_s0->z < 0.0f) { @@ -1374,13 +1376,13 @@ void func_80057248(void) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, var_s0->x, var_s0->y, var_s0->z, 1); Matrix_Scale(gGfxMatrix, var_fs0 * 0.25f, var_fs0 * 0.25f, 1.0f, 1); - if ((i == 0) && (D_80178234 == 0x12)) { + if ((i == 0) && (gCurrentLevel == LEVEL_SECTOR_Z)) { Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 1.0f, 1); } Matrix_Translate(gGfxMatrix, 0.0f, 150.0f, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gDPSetTextureFilter(gMasterDisp++, G_TF_POINT); - if ((i == 0) && (D_80178234 == 0x12)) { + if ((i == 0) && (gCurrentLevel == LEVEL_SECTOR_Z)) { gSPDisplayList(gMasterDisp++, D_6004330); } else { gSPDisplayList(gMasterDisp++, D_800CA354[i]); @@ -1405,7 +1407,7 @@ void func_80057504(void) { Vec3f* var_s0; f32 tm; - for (i = 0, var_s0 = D_80161578; i < D_801778A8; i++, var_s0++) { + for (i = 0, var_s0 = D_80161578; i < gCamCount; i++, var_s0++) { if (var_s0->z < 0.f) { tm = sqrtf(VEC3F_SQ(*var_s0)); if (tm < 20000.0f) { @@ -1434,7 +1436,7 @@ void func_80057504(void) { } } } - for (i = 0; i < D_801778A8; i++) { + for (i = 0; i < gCamCount; i++) { D_80161578[i].x = D_80161578[i].y = 0; D_80161578[i].z = 100.0f; } @@ -1444,28 +1446,28 @@ void func_80057504(void); #pragma GLOBAL_ASM("asm/us/nonmatchings/main/fox_52730/func_80057504.s") #endif -void func_80057814(UnkStruct_D_80178280* arg0) { +void func_80057814(Player* arg0) { Vec3f sp2C; Vec3f sp20; sp20.x = arg0->unk_074; sp20.y = arg0->unk_078; sp20.z = arg0->unk_138; - sp2C.x = arg0->unk_460[0].x; - sp2C.y = arg0->unk_460[0].y; - sp2C.z = arg0->unk_460[0].z; - func_8005F0E8(&arg0->unk_460[0], &sp20); - arg0->unk_460[1].x = arg0->unk_460[0].x - sp2C.x; - arg0->unk_460[1].y = arg0->unk_460[0].y - sp2C.y; - arg0->unk_460[1].z = arg0->unk_460[0].z - sp2C.z; - arg0->unk_480 = &arg0->unk_460[1]; - arg0->unk_47C = &arg0->unk_460[0]; + sp2C.x = arg0->unk_460.x; + sp2C.y = arg0->unk_460.y; + sp2C.z = arg0->unk_460.z; + func_8005F0E8(&arg0->unk_460, &sp20); + arg0->unk_46C.x = arg0->unk_460.x - sp2C.x; + arg0->unk_46C.y = arg0->unk_460.y - sp2C.y; + arg0->unk_46C.z = arg0->unk_460.z - sp2C.z; + arg0->unk_480 = &arg0->unk_46C; + arg0->unk_47C = &arg0->unk_460; arg0->unk_488 = arg0->unk_0C0.y; arg0->unk_490 = arg0->unk_0F8; } // Vec3f D_800CA39C = {0.0f, 0.0f, -300.0f}; -void func_800578C4(UnkStruct_D_80178280* arg0) { +void func_800578C4(Player* arg0) { Vec3f sp4C = { 0.0f, 0.0f, -300.0f }; Vec3f sp40; f32 sp3C; @@ -1473,8 +1475,8 @@ void func_800578C4(UnkStruct_D_80178280* arg0) { switch (D_800CA220) { case 0: - Math_SmoothStepToAngle(&arg0->unk_49C.unk_30, 0.0f, 0.2f, 3.0f, 0.0f); - Math_SmoothStepToAngle(&arg0->unk_49C.unk_34, 0.0f, 0.2f, 3.0f, 0.0f); + Math_SmoothStepToAngle(&arg0->wings.unk_30, 0.0f, 0.2f, 3.0f, 0.0f); + Math_SmoothStepToAngle(&arg0->wings.unk_34, 0.0f, 0.2f, 3.0f, 0.0f); D_801779D8.x = arg0->unk_040.x; D_801779D8.y = arg0->unk_040.y; D_801779D8.z = arg0->unk_040.z; @@ -1500,8 +1502,8 @@ void func_800578C4(UnkStruct_D_80178280* arg0) { sp3C += 360.0f; } sp3C = 360.0f - sp3C; - Math_SmoothStepToAngle(&arg0->unk_49C.unk_30, sp38, 0.2f, 6.0f, 0.0f); - Math_SmoothStepToAngle(&arg0->unk_49C.unk_34, sp3C, 0.2f, 6.0f, 0.0f); + Math_SmoothStepToAngle(&arg0->wings.unk_30, sp38, 0.2f, 6.0f, 0.0f); + Math_SmoothStepToAngle(&arg0->wings.unk_34, sp3C, 0.2f, 6.0f, 0.0f); Math_SmoothStepToF(&D_800CA380, gChangedInput->stick_y * 0.75f, 0.1f, 2.0f, 0.0f); Math_SmoothStepToF(&D_800CA384, gChangedInput->stick_x * 3.0f, 0.1f, 5.0f, 0.0f); Math_SmoothStepToF(&D_800CA388, D_800CA38C[D_800CA220], 0.1f, 10.0f, 0.0f); @@ -1512,9 +1514,9 @@ void func_800578C4(UnkStruct_D_80178280* arg0) { D_801779D8.x = arg0->unk_074 + sp40.x; D_801779D8.y = arg0->unk_078 + sp40.y + 20.0f; D_801779D8.z = arg0->unk_138 + sp40.z; - D_801779E8.x = (__sinf(D_80177DB0 * 3.0f * M_DTOR) * 3.0f) + arg0->unk_074; - D_801779E8.y = (__cosf(D_80177DB0 * 4.0f * M_DTOR) * 3.0f) + arg0->unk_078; - D_801779E8.z = (__sinf(D_80177DB0 * 3.5f * M_DTOR) * 3.0f) + arg0->unk_138; + D_801779E8.x = (__sinf(gFrameCount * 3.0f * M_DTOR) * 3.0f) + arg0->unk_074; + D_801779E8.y = (__cosf(gFrameCount * 4.0f * M_DTOR) * 3.0f) + arg0->unk_078; + D_801779E8.z = (__sinf(gFrameCount * 3.5f * M_DTOR) * 3.0f) + arg0->unk_138; break; } } @@ -1525,31 +1527,31 @@ void func_80057D00(void) { Vec3f sp6C; Vec3f sp60; s32 pad; - UnkStruct_D_80178280* var_s0; - UnkStruct_D_80178280* sp54 = &D_80178280[D_801778A0]; + Player* var_s0; + Player* sp54 = &gPlayer[D_801778A0]; D_800CA228 = 0; - if (D_80161A98 > 0x1FF) { - D_80161A98 = 0x1FF; + if (gHitCount > 0x1FF) { + gHitCount = 0x1FF; } Matrix_Push(&gGfxMatrix); - if ((D_80178234 == 0xD) && (D_80178280->unk_1C8 == 3)) { + if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].unk_1C8 == 3)) { Math_SmoothStepToF(&D_800CA230, 0.01f, 0.2f, 0.002f, 0.0f); } else { Math_SmoothStepToF(&D_800CA230, 0.0f, 0.2f, 0.002f, 0.0f); } - Matrix_RotateZ(gGfxMatrix, (f32) D_80177DB0 * 10.0f * 0.017453292f, 1); + Matrix_RotateZ(gGfxMatrix, (f32) gFrameCount * 10.0f * M_DTOR, 1); Matrix_Scale(gGfxMatrix, 1.0f + D_800CA230, 1.0f - D_800CA230, 1.0f, 1); - Matrix_RotateZ(gGfxMatrix, -(f32) D_80177DB0 * 10.0f * 0.017453292f, 1); + Matrix_RotateZ(gGfxMatrix, -(f32) gFrameCount * 10.0f * M_DTOR, 1); Matrix_Scale(gGfxMatrix, 1.0f + D_800CA230, 1.0f - D_800CA230, 1.0f, 1); Matrix_Push(&gGfxMatrix); func_800B73E0(sp54); - Lights_SetOneLight(&gMasterDisp, D_801784DC, D_801784E0, D_801784E4, D_80178548, D_8017854C, D_80178550, D_80178554, - D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, + gAmbientB); if (D_80177880 == 0) { - Matrix_RotateY(gCalcMatrix, sp54->unk_114 * 0.017453292f, 0); - Matrix_RotateX(gCalcMatrix, sp54->unk_120 * 0.017453292f, 1); + Matrix_RotateY(gCalcMatrix, sp54->unk_114 * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, sp54->unk_120 * M_DTOR, 1); sp78.x = sp54->unk_040.x - sp54->unk_074; sp78.y = sp54->unk_040.y - sp54->unk_078; sp78.z = sp54->unk_040.z - (sp54->unk_138 + sp54->unk_144); @@ -1565,7 +1567,7 @@ void func_80057D00(void) { D_801779E8.y += sp54->unk_078; D_801779E8.z += sp54->unk_138 + sp54->unk_144; if ((sp54->unk_238 != 0) && (sp54->unk_110 > 5.0f)) { - D_801779E8.x += __sinf((f32) D_80177DB0 * 150.0f * 0.017453292f) * sp54->unk_110 * 0.2f; + D_801779E8.x += __sinf((f32) gFrameCount * 150.0f * M_DTOR) * sp54->unk_110 * 0.2f; } } else if (sp54->unk_1C8 == 7) { func_800578C4(sp54); @@ -1582,13 +1584,13 @@ void func_80057D00(void) { sqrtf(SQ(D_801779D8.z - D_801779E8.z) + SQ(D_801779D8.x - D_801779E8.x))); Matrix_RotateY(gCalcMatrix, -sp54->unk_058, 0); Matrix_RotateX(gCalcMatrix, sp54->unk_05C, 1); - Matrix_RotateZ(gCalcMatrix, -sp54->unk_034 * 0.017453292f, 1); + Matrix_RotateZ(gCalcMatrix, -sp54->unk_034 * M_DTOR, 1); sp78.x = 0.0f; sp78.y = 100.0f; sp78.z = 0.0f; Matrix_MultVec3f(gCalcMatrix, &sp78, &sp6C); if (D_80178410 != 0) { - D_80178428 = (D_80178280->unk_034 / 180.0f) * M_PI; + D_80178428 = (gPlayer[0].unk_034 / 180.0f) * M_PI; func_800B6F50(D_801779D8.x, D_801779D8.y, D_801779D8.z, D_801779E8.x, D_801779E8.y, D_801779E8.z); func_8003DAF0(); } @@ -1597,8 +1599,8 @@ void func_80057D00(void) { Matrix_Push(&gGfxMatrix); Matrix_LookAt(gGfxMatrix, D_801779D8.x, D_801779D8.y, D_801779D8.z, D_801779E8.x, D_801779E8.y, D_801779E8.z, sp6C.x, sp6C.y, sp6C.z, 1); - if ((D_80177C98 == 0) || (D_80178234 == 0x11)) { - if ((D_80178234 == 0xC) && ((D_80178280->unk_1C8 != 2) || (D_80178280->unk_19C != 0))) { + if ((gLevelType == 0) || (gCurrentLevel == LEVEL_BOLSE)) { + if ((gCurrentLevel == LEVEL_TITANIA) && ((gPlayer[0].unk_1C8 != 2) || (gPlayer[0].unk_19C != 0))) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 0.0f, D_8017847C, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -1610,9 +1612,9 @@ void func_80057D00(void) { func_80040CE4(); } } - Lights_SetOneLight(&gMasterDisp, D_80178504, D_80178508, D_8017850C, D_80178564, D_80178568, D_8017856C, D_80178554, - D_80178558, D_8017855C); - for (i = 0, var_s0 = D_80178280; i < D_801778A8; i++, var_s0++) { + Lights_SetOneLight(&gMasterDisp, gLight2x, gLight2y, gLight2z, gLight2R, gLight2G, gLight2B, gAmbientR, gAmbientG, + gAmbientB); + for (i = 0, var_s0 = gPlayer; i < gCamCount; i++, var_s0++) { sp60.x = var_s0->unk_074; sp60.y = var_s0->unk_078; sp60.z = var_s0->unk_138; @@ -1620,12 +1622,12 @@ void func_80057D00(void) { func_800564C0(var_s0, 0); func_80057814(var_s0); } - if ((D_80161A88 == 2) && (D_80178280->unk_1C8 != 2)) { - Lights_SetOneLight(&gMasterDisp, D_80178504, -1 * D_80178508, D_8017850C, D_80178564, D_80178568, D_8017856C, - D_80178554, D_80178558, D_8017855C); + if ((D_80161A88 == 2) && (gPlayer[0].unk_1C8 != 2)) { + Lights_SetOneLight(&gMasterDisp, gLight2x, -1 * gLight2y, gLight2z, gLight2R, gLight2G, gLight2B, gAmbientR, + gAmbientG, gAmbientB); Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1); - for (i = 0, var_s0 = D_80178280; i < D_801778A8; i++, var_s0++) { + for (i = 0, var_s0 = gPlayer; i < gCamCount; i++, var_s0++) { sp60.x = var_s0->unk_074; sp60.y = var_s0->unk_078; sp60.z = var_s0->unk_138; @@ -1633,13 +1635,13 @@ void func_80057D00(void) { } Matrix_Pop(&gGfxMatrix); } - Lights_SetOneLight(&gMasterDisp, D_801784DC, D_801784E0, D_801784E4, D_80178548, D_8017854C, D_80178550, D_80178554, - D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, + gAmbientB); func_80060714(1); func_80060968(); D_80161410 = 1; func_8003DA0C(); - if ((D_80161A88 == 2) && (D_80178280->unk_1C8 != 2)) { + if ((D_80161A88 == 2) && (gPlayer[0].unk_1C8 != 2)) { Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1); D_80161410 = -1; @@ -1647,10 +1649,10 @@ void func_80057D00(void) { Matrix_Pop(&gGfxMatrix); } D_80161410 = -1; - if ((D_80161A88 == 2) && (D_80178280->unk_1C8 != 2)) { + if ((D_80161A88 == 2) && (gPlayer[0].unk_1C8 != 2)) { Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1); - for (i = 0, var_s0 = D_80178280; i < D_801778A8; i++, var_s0++) { + for (i = 0, var_s0 = gPlayer; i < gCamCount; i++, var_s0++) { if (D_800CA224[i] != 0) { func_80055B58(var_s0); func_80056230(var_s0); @@ -1658,7 +1660,7 @@ void func_80057D00(void) { Matrix_Pop(&gGfxMatrix); } } - if (D_80178234 == 0xD) { + if (gCurrentLevel == LEVEL_AQUAS) { func_8006089C(0); } if ((D_80161A88 == 2) || (D_80177AC8 != 0)) { @@ -1666,22 +1668,23 @@ void func_80057D00(void) { func_8006089C(1); func_80040CE4(); } - if ((D_80178234 != 0xD) && - (((D_80178234 != 0) && (D_80178234 != 9)) || ((D_80178280->unk_1C8 != 7) && (D_80178280->unk_1C8 != 2)))) { + if ((gCurrentLevel != LEVEL_AQUAS) && (((gCurrentLevel != LEVEL_CORNERIA) && (gCurrentLevel != LEVEL_VENOM_2)) || + ((gPlayer[0].unk_1C8 != 7) && (gPlayer[0].unk_1C8 != 2)))) { func_8006089C(0); } D_80161410 = 1; - for (i = 0, var_s0 = D_80178280; i < D_801778A8; i++, var_s0++) { + for (i = 0, var_s0 = gPlayer; i < gCamCount; i++, var_s0++) { if (D_800CA224[i] != 0) { func_80056E2C(var_s0); func_80055B58(var_s0); func_80056230(var_s0); } } - if ((D_80178234 == 0xD) && (D_80178280->unk_1C8 == 3)) { + if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].unk_1C8 == 3)) { func_E16C50_801AA20C(); } - if (((D_80178234 == 0) || (D_80178234 == 9)) && ((D_80178280->unk_1C8 == 7) || (D_80178280->unk_1C8 == 2))) { + if (((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_VENOM_2)) && + ((gPlayer[0].unk_1C8 == 7) || (gPlayer[0].unk_1C8 == 2))) { func_8006089C(0); } func_80077790(); @@ -1691,7 +1694,7 @@ void func_80057D00(void) { if (D_800CA228 != 0) { func_80053B18(); } - for (i = 0, var_s0 = D_80178280; i < D_801778A8; i++, var_s0++) { + for (i = 0, var_s0 = gPlayer; i < gCamCount; i++, var_s0++) { if (D_800CA224[i] != 0) { if (D_800D2860[i] != 0) { func_80053F7C(var_s0); @@ -1703,11 +1706,11 @@ void func_80057D00(void) { } } } - if ((D_80177880 == 2) && (D_80178280->unk_1C8 == 3)) { - func_E9F1D0_801A6164(D_80178280); + if ((D_80177880 == 2) && (gPlayer[0].unk_1C8 == 3)) { + func_E9F1D0_801A6164(gPlayer); } func_80040954(); - if ((D_801778A8 != 1) && ((sp54->unk_1C8 == 3) || (sp54->unk_1C8 == 5))) { + if ((gCamCount != 1) && ((sp54->unk_1C8 == 3) || (sp54->unk_1C8 == 5))) { func_8008FA84(); func_8008CA44(); } diff --git a/src/main/fox_6B3B0.c b/src/main/fox_6B3B0.c new file mode 100644 index 00000000..21f38943 --- /dev/null +++ b/src/main/fox_6B3B0.c @@ -0,0 +1,3889 @@ +#include "global.h" + +s32 D_800CFF80[4] = { 0, 0, 0, 0 }; +s32 D_800CFF90 = 0; +s32 D_80161690; + +void func_8007F11C(s32, f32, f32, f32, f32); +void func_80187530(Object_2F4*); // figure out which one later + +void func_8006A7B0(u16* msg, s32 character) { + (void) "Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n"; + if ((D_8017829C == 0) || (D_80177D68 != character)) { + func_800BA808(msg, character); + } +} + +void func_8006A800(Object_8C* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { + Object_8C_Initialize(arg0); + arg0->obj.status = 1; + arg0->obj.id = OBJECT_361; + arg0->obj.pos.x = arg1; + arg0->obj.pos.y = arg2; + arg0->obj.pos.z = arg3; + arg0->unk_48 = 3; + if (Rand_ZeroOne() < 0.5f) { + arg0->unk_48 = -arg0->unk_48; + } + arg0->unk_4A = 100; + arg0->unk_70 = arg4 * 0.25f; + arg0->unk_6C = 0.3f; + if (arg4 < 10.0f) { + arg0->unk_6C = 0.1f; + } + arg0->obj.rot.z = Rand_ZeroOne() * 360.0f; + func_800612B8(&arg0->unk_1C, arg0->obj.id); +} + +void func_8006A900(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + s32 i; + + for (i = ARRAY_COUNT(gObjects8C) - 1; i >= 0; i--) { + if (gObjects8C[i].obj.status == 0) { + func_8006A800(&gObjects8C[i], arg0, arg1, arg2, arg3); + break; + } + } +} + +void func_8006A96C(Object_2F4* arg0) { +} + +void func_8006A978(Object_2F4* arg0) { +} + +void func_8006A984(Object_8C* arg0, f32 arg1, f32 arg2, f32 arg3) { + Object_8C_Initialize(arg0); + arg0->obj.status = 1; + arg0->obj.id = OBJECT_365; + arg0->obj.pos.x = arg1; + arg0->obj.pos.y = arg2; + arg0->obj.pos.z = arg3; + arg0->unk_44 = 40; + arg0->unk_70 = 5.0f; + arg0->unk_6C = 2.0f * (Rand_ZeroOne() - 0.5f); + arg0->unk_54.y = 10.0f; + arg0->obj.rot.z = Rand_ZeroOne() * 360.0f; + func_800612B8(&arg0->unk_1C, arg0->obj.id); +} + +void func_8006AA3C(f32 arg0, f32 arg1, f32 arg2) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + func_8006A984(&gObjects8C[i], arg0, arg1, arg2); + break; + } + } +} + +void func_8006AA98(Object_80* arg0) { + Vec3f sp24; + Vec3f sp18; + + Texture_Scroll(D_60038F8, 32, 32, 1); + if ((gFrameCount % 4) == 0) { + Matrix_RotateY(gCalcMatrix, arg0->obj.rot.y * M_DTOR, 0); + sp18.x = (Rand_ZeroOne() - 0.5f) * 700.0f; + sp18.y = Rand_ZeroOne() * 50.0f; + sp18.z = 700.0f; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp18, &sp24); + func_8006AA3C(arg0->obj.pos.x + sp24.x, arg0->obj.pos.y + sp24.y + 50.0f, arg0->obj.pos.z + sp24.z); + } +} + +s32 func_8006ABA4(Object_2F4* arg0) { + if ((fabsf(arg0->obj.pos.x - gPlayer[0].unk_074) < 700.0f) && + (fabsf(arg0->obj.pos.y - gPlayer[0].unk_078) < 700.0f)) { + return 1; + } + return 0; +} + +// fake? gPlayer[0]. doesn't match +void func_8006AC08(Object_2F4* arg0) { + f32 sp2C; + + if ((func_8006ABA4(arg0) != 0) && (arg0->unk_0BC == 0)) { + func_8007F11C(OBJECT_353, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, D_80177828); + arg0->unk_0BC = 20; + } + sp2C = arg0->obj.pos.z + D_80177D20; + arg0->obj.rot.y = Math_RadToDeg(Math_Atan2F(gPlayer->unk_040.x - arg0->obj.pos.x, gPlayer->unk_040.z - sp2C)); + arg0->obj.rot.x = + -Math_RadToDeg(Math_Atan2F(gPlayer->unk_040.y - arg0->obj.pos.y, + sqrtf(SQ(gPlayer->unk_040.x - arg0->obj.pos.x) + SQ(gPlayer->unk_040.z - sp2C)))); +} + +void func_8006AD18(Object_2F4* arg0) { + bool sp34; + + arg0->unk_10C = 1.5f; + sp34 = false; + arg0->obj.rot.y = Math_RadToDeg( + Math_Atan2F(gPlayer[D_801778A0].unk_074 - arg0->obj.pos.x, gPlayer[D_801778A0].unk_138 - arg0->obj.pos.z)); + if (arg0->obj.pos.y < -500.0f) { + arg0->obj.pos.y = -500.0f; + arg0->unk_0E8.y = 0.0f; + arg0->unk_0E8.x = 0.0f; + arg0->unk_0E8.z = 0.0f; + sp34 = true; + arg0->unk_054 = true; + } + if (!(gFrameCount & 0x1F)) { + func_8007F11C(OBJECT_353, arg0->obj.pos.x, arg0->obj.pos.y + 180.0f, arg0->obj.pos.z, D_80177828); + } + switch (arg0->unk_0B8) { + case 0: + arg0->unk_0B6++; + if (arg0->unk_0B6 >= 30) { + arg0->unk_0B6 = 0; + } + if (arg0->unk_0B6 == 0x15) { + arg0->unk_0B8 = 1; + + arg0->unk_0E8.y = 40.0f; + arg0->unk_0E8.z = -40.0f; + arg0->unk_0E8.x = 10.0f; + + arg0->unk_050 = 1 - arg0->unk_050; + if (arg0->unk_050) { + arg0->unk_0E8.x *= -1.0f; + } + if (arg0->unk_054) { + arg0->unk_0E8.x = 0.0f; + arg0->unk_0E8.z = -20.0f; + } + } + break; + case 1: + if (arg0->unk_0E8.y > 10.0f) { + arg0->unk_0B6++; + if (arg0->unk_0B6 >= 30) { + arg0->unk_0B6 = 29; + } + } else { + arg0->unk_0B6--; + if (arg0->unk_0B6 < 0) { + arg0->unk_0B6 = 0; + } + } + if (sp34) { + arg0->unk_0B8 = 0; + } + break; + } + if (arg0->unk_0D0 != 0) { + arg0->unk_0CE -= 10; + if ((arg0->unk_0CE <= 0) || (arg0->unk_0D0 >= 2)) { + func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y + 180.0f, arg0->obj.pos.z, 10.0f); + func_8007BFFC(arg0->obj.pos.x, arg0->obj.pos.y + 180.0f, arg0->obj.pos.z, arg0->unk_0E8.x, arg0->unk_0E8.y, + arg0->unk_0E8.z, 8.0f, 30); + Object_Kill(&arg0->obj, &arg0->unk_100); + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + gHitCount += arg0->unk_01C.unk_20; + D_80177850 = 15; + } else { + arg0->unk_0D0 = 0; + arg0->unk_0C6 = 20; + func_80019218(0x2903300E, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_8007D1E0(arg0->obj.pos.x, arg0->obj.pos.y + 180.0f, arg0->obj.pos.z, 5.0f); + } + } +} + +void func_8006B094(Object_2F4* arg0) { +} + +s16 D_800CFF94[16] = { + 0, 0x62, 0x60, 0x5E, 0x5C, 0x5A, 0x58, 0x56, 0x54, 0x52, 0x50, 0x4E, 0x4C, 0x4A, 0x48, 0x46, +}; +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 }; + +void func_8006B0A0(Object_2F4* arg0) { + Vec3f sp34; + s32 temp_hi; + + arg0->unk_04E++; + if (arg0->unk_04E >= 100) { + arg0->unk_04E = 0; + } + D_80176558[arg0->unk_046][arg0->unk_04E] = arg0->obj.pos.x; + D_80176878[arg0->unk_046][arg0->unk_04E] = arg0->obj.pos.y; + D_80176B98[arg0->unk_046][arg0->unk_04E] = arg0->obj.pos.z; + D_80176EB8[arg0->unk_046][arg0->unk_04E] = arg0->obj.rot.x; + D_801771D8[arg0->unk_046][arg0->unk_04E] = arg0->obj.rot.y; + D_80177500[arg0->unk_046][arg0->unk_04E] = arg0->obj.rot.z; + arg0->obj.rot.x -= 10.0f; + arg0->obj.rot.y += 3.0f; + arg0->obj.rot.z += 5.0f; + Math_Vec3fFromAngles(&sp34, arg0->obj.rot.x, arg0->obj.rot.y, 40.0f); + arg0->unk_0E8.x = sp34.x; + arg0->unk_0E8.y = sp34.y; + arg0->unk_0E8.z = sp34.z; + if ((arg0->unk_0BC == 0) && !(gFrameCount & 3)) { + temp_hi = (D_800CFF94[arg0->unk_04A] + arg0->unk_04E) % 100; + if (arg0->unk_04A == 0) { + func_8007D2C8(D_80176558[arg0->unk_046][temp_hi], D_80176878[arg0->unk_046][temp_hi], + D_80176B98[arg0->unk_046][temp_hi], 7.0f); + } else { + func_8007D2C8(D_80176558[arg0->unk_046][temp_hi], D_80176878[arg0->unk_046][temp_hi], + D_80176B98[arg0->unk_046][temp_hi], 4.0f); + } + func_80019218(0x2903B009, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + arg0->unk_04A++; + if (arg0->unk_04A > 15) { + Object_Kill(&arg0->obj, &arg0->unk_100); + D_80176550[arg0->unk_046] = 0; + gHitCount += arg0->unk_01C.unk_20; + D_80177850 = 15; + } + } +} + +void func_8006B46C(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, u8 arg7, f32 arg8, + s32 arg9) { + Vec3f sp34 = { 0.0f, 0.0f, 0.0f }; + + Matrix_Push(&gGfxMatrix); + Matrix_Translate(gGfxMatrix, arg1, arg2, arg3 + D_80177D20, 1); + if (arg7 != 1) { + Matrix_RotateY(gGfxMatrix, M_DTOR * arg5, 1); + Matrix_RotateX(gGfxMatrix, M_DTOR * arg4, 1); + Matrix_RotateZ(gGfxMatrix, M_DTOR * arg6, 1); + } + Matrix_Scale(gGfxMatrix, arg8, arg8, 1.0f, 1); + Matrix_SetGfxMtx(&gMasterDisp); + if (arg7 != 1) { + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); + if ((arg7 == 0) && (arg0->unk_0CA[0] != 0)) { + sp34.y += arg0->unk_01C.unk_1C; + Matrix_MultVec3f(gGfxMatrix, &sp34, D_80161578); + if (D_80161578->z > -500.0f) { + arg0->unk_0CA[0] = 0; + } + } + } else { + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); + } + if (arg9 != 0) { + RCP_SetupDL_64(); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); + } + gSPDisplayList(gMasterDisp++, D_800D0004[arg7]); + Matrix_Pop(&gGfxMatrix); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); +} + +void func_8006B74C(Object_2F4* arg0) { + s16 var_s0; + s16 temp_hi; + + for (var_s0 = arg0->unk_04A; var_s0 < 16; var_s0++) { + temp_hi = (D_800CFF94[var_s0] + arg0->unk_04E) % 100; + func_8006B46C(arg0, D_80176558[arg0->unk_046][temp_hi], D_80176878[arg0->unk_046][temp_hi], + D_80176B98[arg0->unk_046][temp_hi], D_80176EB8[arg0->unk_046][temp_hi], + D_801771D8[arg0->unk_046][temp_hi], D_80177500[arg0->unk_046][temp_hi], D_800CFFB4[var_s0], + D_800CFFC4[var_s0], arg0->unk_0C6 & 1); + } +} + +void func_8006B95C(Object_80* arg0) { + arg0->obj.pos.x += arg0->unk_64.x; + arg0->obj.pos.y += arg0->unk_64.y; + arg0->obj.pos.z += arg0->unk_64.z; + switch (arg0->unk_48) { + case 0: + arg0->unk_64.y -= 1.0f; + if (arg0->obj.pos.y < D_80177940 + 40.0f) { + arg0->obj.pos.y = D_80177940 + 40.0f; + func_80019218(0x19130003, &arg0->unk_70, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + arg0->unk_48 = 2; + arg0->unk_64.y = 0.0f; + } + break; + case 2: + break; + case 1: + arg0->obj.rot.x += 10.0f; + break; + } +} + +void func_8006BA64(Object_8C* arg0, f32 arg1, f32 arg2, f32 arg3) { + Object_8C_Initialize(arg0); + arg0->obj.status = 1; + arg0->obj.id = OBJECT_375; + arg0->obj.pos.x = arg1; + arg0->obj.pos.y = arg2; + arg0->obj.pos.z = arg3; + arg0->unk_70 = 0.0f; + arg0->unk_6C = 0.12f; + arg0->obj.rot.y = Rand_ZeroOne() * 360.0f; + arg0->unk_60.y = (Rand_ZeroOne() - 0.5f) * 3.0f; + func_800612B8(&arg0->unk_1C, arg0->obj.id); +} + +void func_8006BB1C(f32 arg0, f32 arg1, f32 arg2) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + func_8006BA64(&gObjects8C[i], arg0, arg1, arg2); + break; + } + } +} + +void func_8006BB78(Object_2F4* arg0) { + Vec3f sp44; + + switch (arg0->unk_0B8) { + case 0: + arg0->unk_13C = (Rand_ZeroOne() - 0.5f) * 1000.0f; + arg0->unk_0B8 = 1; + break; + case 1: + switch (arg0->unk_046) { + case 0: + arg0->unk_114 += 2.0f; + if (arg0->unk_114 > 10.0f) { + arg0->unk_046 = 1; + } + break; + case 1: + arg0->unk_114 -= 2.0f; + if (arg0->unk_114 < -10.0f) { + arg0->unk_046 = 0; + } + break; + } + Math_Vec3fFromAngles(&sp44, arg0->obj.rot.x, arg0->obj.rot.y, 10.0f); + arg0->unk_0E8.x = sp44.x; + arg0->unk_0E8.y = sp44.y; + arg0->unk_0E8.z = sp44.z; + if (fabsf((arg0->obj.pos.z + arg0->unk_13C) - gPlayer[0].unk_138) < 3000.0f) { + arg0->unk_0B8 = 2; + arg0->unk_0BC = 20; + arg0->unk_0E8.z = 0.0f; + arg0->unk_0E8.x = 0.0f; + } + break; + case 2: + if (arg0->unk_0BC == 0) { + arg0->unk_0B8 = 3; + arg0->unk_0B6 = 1; + arg0->obj.pos.y += 30.0f; + arg0->unk_0BC = 30; + arg0->unk_0E8.y = 30.0f; + arg0->unk_10C = 1.0f; + } + break; + case 3: + if (arg0->unk_0BC == 1) { + func_8007F11C(OBJECT_353, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, D_80177828); + } + if (arg0->unk_0E8.y < 12.0f) { + Math_SmoothStepToF(&arg0->obj.rot.x, 180.0f, 0.1f, 7.0f, 0.01f); + } + if (arg0->obj.pos.y < (D_80177940 + 10.0f)) { + arg0->obj.pos.y = D_80177940; + arg0->unk_0B8 = 4; + arg0->unk_0B6 = 0; + arg0->unk_0E8.y = 0.0f; + arg0->unk_10C = 0.0f; + arg0->obj.rot.x = 0.0f; + } + break; + case 4: + if (arg0->unk_0BC == 0) { + arg0->unk_0B8 = 0; + arg0->obj.rot.y = Rand_ZeroOne() * 360.0f; + } + break; + } + if ((arg0->obj.pos.y <= (D_80177940 + 10.0f)) && !(gFrameCount & 7)) { + func_8006BB1C(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z); + } + if (!(gFrameCount & 7)) { + func_8006A900(((Rand_ZeroOne() - 0.5f) * 50.0f) + arg0->obj.pos.x, arg0->obj.pos.y + 10.0f, + ((Rand_ZeroOne() - 0.5f) * 50.0f) + arg0->obj.pos.z, 0.5f); + } + if ((arg0->unk_0D0 != 0) && (arg0->unk_0B6 != 0)) { + func_8007BFFC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 0.0f, arg0->unk_0E8.y, 0.0f, 3.0f, 5); + Object_Kill(&arg0->obj, &arg0->unk_100); + arg0->unk_044 = 1; + func_80066254(arg0); + } + arg0->unk_0D0 = 0; +} + +f32 D_800D001C[5] = { 0.0f, 30.0f, 60.0f, -60.0f, -30.0f }; // could be in-function +void func_8006BF7C(f32 arg0, f32 arg1, f32 arg2) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(D_800D001C); i++) { + func_8006A900(arg0 + D_800D001C[i], arg1, arg2, 6.0f); + } +} + +// fake? gPlayer[0]. doesn't match +Vec3f D_800D0030 = { 0.0f, -10.0f, 0.0f }; // could be in-function +void func_8006C008(Object_2F4* arg0) { + f32 sp4C; + f32 sp48; + f32 sp44; + s32 sp40; + + switch (arg0->unk_0B8) { + case 0x28: + if (arg0->unk_04A & 4) { + arg0->obj.pos.x = arg0->unk_120 + gPlayer->unk_074; + arg0->obj.pos.z = arg0->unk_124.x + gPlayer->unk_138; + } + arg0->obj.rot.x += arg0->unk_114; + arg0->obj.rot.y += arg0->unk_118; + arg0->obj.rot.z += arg0->unk_11C; + if (((arg0->unk_04A & 1) == 1) && !(arg0->unk_0BC & 3)) { + func_8007D0E0(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_110); + } + if ((arg0->unk_124.y + arg0->obj.pos.y) < 0.0f) { + if (arg0->unk_050 >= 2) { + arg0->unk_11C = 0.0f; + arg0->unk_118 = 0.0f; + arg0->unk_114 = 0.0f; + arg0->unk_0E8.x = 0.0f; + arg0->unk_0E8.y = 0.0f; + arg0->unk_0E8.z = 0.0f; + arg0->unk_10C = 0.0f; + } else { + if (arg0->unk_04A & 4) { + switch (arg0->unk_046) { + case 2: + func_80019218(0x19000024, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + case 25: + func_80019218(0x29003031, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + } + } + Math_SmoothStepToF(&arg0->unk_114, 0.0f, 0.8f, 1.0f, 0.01f); + Math_SmoothStepToF(&arg0->unk_118, 0.0f, 0.8f, 1.0f, 0.01f); + Math_SmoothStepToF(&arg0->unk_11C, 0.0f, 0.8f, 1.0f, 0.01f); + Math_SmoothStepToF(&arg0->unk_0E8.x, 0.0f, 0.5f, 1.0f, 0.01f); + arg0->obj.pos.y = 0.0f; + arg0->unk_050 += 1; + if (arg0->unk_0E8.y < 0.0f) { + if (arg0->unk_04A & 2) { + arg0->unk_0E8.y = arg0->unk_0E8.y * -0.05f; + } else { + arg0->unk_0E8.y = arg0->unk_0E8.y * -0.3f; + } + } + } + arg0->unk_04A &= ~4; + } + break; + case 0x2D: + arg0->obj.rot.y += arg0->unk_114; + arg0->obj.rot.z += arg0->unk_118; + break; + case 0x2E: + arg0->obj.rot.x += arg0->unk_114; + arg0->obj.rot.y += arg0->unk_118; + arg0->obj.rot.z += arg0->unk_11C; + func_E6A810_801B6E20(arg0->obj.pos.x, arg0->obj.pos.z + D_80177D20, &sp4C, &sp48, &sp4C); + if (arg0->obj.pos.y < sp48) { + arg0->obj.pos.y = sp48; + arg0->unk_058++; + if (arg0->unk_058 >= 2) { + arg0->unk_0E8.x = 0.0f; + arg0->unk_0E8.y = 0.0f; + arg0->unk_0E8.z = 0.0f; + arg0->unk_114 = 0.0f; + arg0->unk_118 = 0.0f; + arg0->unk_11C = 0.0f; + arg0->unk_10C = 0.0f; + } else { + arg0->unk_0E8.y = -arg0->unk_0E8.y * 0.3f; + } + } + break; + case 0x2F: + func_E6A810_801B6E20(arg0->obj.pos.x, arg0->obj.pos.z + D_80177D20, &sp4C, &sp48, &sp4C); + if (arg0->obj.pos.y < arg0->unk_120 + (-100.0f + sp48)) { + arg0->obj.pos.y = arg0->unk_120 + sp48; + arg0->unk_050 = 0; + arg0->unk_058 = 1; + arg0->unk_0E8.x = 0.0f; + arg0->unk_0E8.y = 0.0f; + arg0->unk_0E8.z = 0.0f; + arg0->unk_10C = 0.0f; + arg0->unk_114 = 0.0f; + arg0->unk_118 = 0.0f; + arg0->unk_11C = 0.0f; + } + arg0->obj.rot.x += arg0->unk_114; + arg0->obj.rot.y += arg0->unk_118; + arg0->obj.rot.z += arg0->unk_11C; + if ((arg0->unk_050 == 1) && !(gFrameCount & 7)) { + func_8007D0E0(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 2.0f); + } + if (arg0->unk_058 == 1) { + if ((arg0->unk_054 == 1) && ((arg0->unk_048 == 8) || (arg0->unk_048 == 9))) { + func_8007D2C8(arg0->obj.pos.x, sp48 + 20.0f, arg0->obj.pos.z, 8.0f); + } + Object_Kill(&arg0->obj, &arg0->unk_100); + } + break; + case 0x30: + case 0x31: + case 0x33: + case 0x34: + case 0x35: + case 0x37: + if (((arg0->unk_0BC == 0) || (func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800D0030, 1) != 0) || + (arg0->obj.pos.y < (D_80177940 + 10.0f))) && + (arg0->unk_0BE == 0)) { + func_8007B8F8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z + 50.0f, arg0->unk_110 * 10.0f); + Object_Kill(&arg0->obj, &arg0->unk_100); + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + } + break; + case 0x38: + Math_SmoothStepToF(&arg0->unk_110, 0.0f, 0.1f, 2.0f, 0.0001f); + if (((arg0->unk_0BC == 0) || (func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800D0030, 1) != 0) || + (arg0->obj.pos.y < (D_80177940 + 10.0f))) && + (arg0->unk_0BE == 0)) { + func_8007B8F8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z + 50.0f, arg0->unk_110 * 10.0f); + Object_Kill(&arg0->obj, &arg0->unk_100); + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + } + break; + case 0x3A: + if (arg0->unk_046 == 0) { + arg0->unk_046++; + arg0->unk_114 = (Rand_ZeroOne() - 0.5f) * 30.0f; + arg0->unk_118 = (Rand_ZeroOne() - 0.5f) * 30.0f; + arg0->unk_11C = (Rand_ZeroOne() - 0.5f) * 30.0f; + } + arg0->obj.rot.x += arg0->unk_114; + arg0->obj.rot.y += arg0->unk_118; + arg0->obj.rot.z += arg0->unk_11C; + if (((arg0->unk_0BC == 0) || (func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800D0030, 1) != 0) || + (arg0->obj.pos.y < (D_80177940 + 10.0f))) && + (arg0->unk_0BE == 0)) { + func_8007B8F8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z + 50.0f, arg0->unk_110 * 10.0f); + Object_Kill(&arg0->obj, &arg0->unk_100); + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + } + break; + case 0x36: + if (((arg0->unk_0BC == 0) || (func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800D0030, 1) != 0) || + (arg0->obj.pos.y < (D_80177940 + 10.0f))) && + (arg0->unk_0BE == 0)) { + func_8007B8F8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z + 70.0f, arg0->unk_110 * 20.0f); + func_8007B8F8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z + 70.0f, arg0->unk_110 * 20.0f); + Object_Kill(&arg0->obj, &arg0->unk_100); + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + } + break; + case 0x32: + if ((arg0->unk_050 == 2) && (arg0->unk_0BC == 0)) { + func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 5.0f); + arg0->unk_0BC = 4; + } + arg0->obj.rot.x += arg0->unk_114; + arg0->obj.rot.y += arg0->unk_118; + arg0->obj.rot.z += arg0->unk_11C; + if (func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800C9F2C, 1) != 0) { + arg0->unk_0E8.x *= -0.7f; + } + if (arg0->obj.pos.y < D_80177940) { + Object_Kill(&arg0->obj, &arg0->unk_100); + } + break; + case 0x39: + arg0->obj.rot.x += arg0->unk_114; + arg0->obj.rot.y += arg0->unk_118; + arg0->obj.rot.z += arg0->unk_11C; + if (func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800C9F2C, 1) != 0) { + arg0->unk_0E8.x *= -0.7f; + } + if (arg0->obj.pos.y < D_80177940) { + if (arg0->unk_050 >= 3) { + arg0->unk_0E8.y = 0.0f; + arg0->unk_10C = 0.0f; + arg0->unk_11C = 0.0f; + arg0->unk_118 = 0.0f; + arg0->unk_114 = 0.0f; + } else { + arg0->unk_050++; + arg0->unk_0E8.y = -arg0->unk_0E8.y * 0.7f; + arg0->obj.pos.y = D_80177940; + arg0->unk_114 *= 0.5f; + arg0->unk_118 *= 0.5f; + arg0->unk_11C *= 0.5f; + } + } + break; + default: + if (arg0->unk_046 == 0) { + arg0->unk_046++; + arg0->unk_13C = (Rand_ZeroOne() - 0.5f) * 30.0f; + arg0->unk_140 = (Rand_ZeroOne() - 0.5f) * 30.0f; + arg0->unk_144 = (Rand_ZeroOne() - 0.5f) * 30.0f; + } + arg0->obj.rot.x += arg0->unk_13C; + arg0->obj.rot.y += arg0->unk_140; + arg0->obj.rot.z += arg0->unk_144; + if (arg0->unk_0B8 == 0x46) { + if ((arg0->unk_0BC == 0) || (func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800D0030, 1) != 0) || + (arg0->obj.pos.y < (D_80177940 + 10.0f))) { + Object_Kill(&arg0->obj, &arg0->unk_100); + } + } else if (arg0->unk_0B8 == 0x27) { + if (((arg0->unk_0BC == 0) || (func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800D0030, 1) != 0) || + (arg0->obj.pos.y < (D_80177940 + 10.0f))) && + (arg0->unk_0BE == 0)) { + func_8007D0E0(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 10.0f); + Object_Kill(&arg0->obj, &arg0->unk_100); + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + } + } else if (((arg0->unk_0B8 >= 0x29) && (arg0->unk_0B8 < 0x2D)) || (arg0->unk_0B8 == 0x3B)) { + if (((arg0->unk_0BC == 0) || (func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800D0030, 1) != 0)) && + (arg0->unk_0BE == 0)) { + func_8007D0E0(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 2.0f * arg0->unk_110); + Object_Kill(&arg0->obj, &arg0->unk_100); + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + } + if (func_800A73E4(&sp44, &sp40, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z) != 0) { + func_8007B228(arg0->obj.pos.x, sp44, arg0->obj.pos.z, 2.0f); + Object_Kill(&arg0->obj, &arg0->unk_100); + } + } else if (arg0->unk_0B8 >= 0xA) { + if (!(arg0->unk_0BC & 3)) { + func_8007D0E0(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_110); + } + if (((arg0->unk_0BC == 0) || (func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800D0030, 1) != 0) || + (arg0->obj.pos.y < (D_80177940 + 10.0f))) && + (arg0->unk_0BE == 0)) { + func_8007BFFC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_0E8.x, arg0->unk_0E8.y, + arg0->unk_0E8.z, arg0->unk_110 * 1.5f, 4); + Object_Kill(&arg0->obj, &arg0->unk_100); + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + } + } else { + if ((arg0->unk_0B8 == 3) && !(arg0->unk_0BC & 7)) { + func_8007D0E0(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 1.5f); + } + if ((func_8006351C(arg0->unk_040, &arg0->obj.pos, &D_800D0030, 1) != 0) || + (arg0->obj.pos.y < (D_80177940 + 10.0f))) { + if (gLevelType == 1) { + func_8007D0E0(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 2.0f); + Object_Kill(&arg0->obj, &arg0->unk_100); + return; + } + + arg0->unk_0E8.y *= -0.2f; + arg0->obj.pos.y += arg0->unk_0E8.y * 5.0f; + arg0->unk_050++; + if (arg0->unk_050 >= 2) { + Object_Kill(&arg0->obj, &arg0->unk_100); + } + if ((arg0->unk_0B8 != 2) && (arg0->unk_0B8 != 4)) { + func_8006BF7C(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z); + } else if (gCurrentLevel == LEVEL_FORTUNA) { + func_8007BC7C(((Rand_ZeroOne() - 0.5f) * 10.0f) + arg0->obj.pos.x, arg0->obj.pos.y, + arg0->obj.pos.z, 1.0f); + func_8007BC7C(((Rand_ZeroOne() - 0.5f) * 10.0f) + arg0->obj.pos.x, arg0->obj.pos.y, + arg0->obj.pos.z, 1.0f); + func_8007BC7C(((Rand_ZeroOne() - 0.5f) * 10.0f) + arg0->obj.pos.x, arg0->obj.pos.y, + arg0->obj.pos.z, 1.0f); + } + } + if (arg0->unk_0B8 == 4) { + if ((gCurrentLevel == LEVEL_KATINA) && (arg0->unk_0BC == 0)) { + Object_Kill(&arg0->obj, &arg0->unk_100); + } + } else { + if (arg0->unk_0BC & 1) { + func_8007D24C(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 1.0f); + } + if ((gLevelType == 1) && (arg0->unk_0BC == 0)) { + Object_Kill(&arg0->obj, &arg0->unk_100); + } + } + } + break; + } +} + +void func_8006D0F4(Object_2F4* arg0) { + s32 i; + s32 j; + f32* var_s0; + Vec3f spA8; + Vec3f sp9C; + s32 temp_fs0; + s32 temp_fs1; + s32 temp_fs2; + s32 temp_ft4; + + D_80161A7C = 110; + D_80161A80 = 110; + D_80161A84 = 110; + D_80178544 = 40; + + for (i = 0; i < ARRAY_COUNT(gObjects80); i++) { + if ((gObjects80[i].obj.status == 2) && ((gPlayer[0].unk_138 - 3000.0f) < gObjects80[i].obj.pos.z)) { + var_s0 = D_800CF964[gObjects80[i].obj.id]; + temp_ft4 = *var_s0; + if (temp_ft4 != 0) { + Matrix_RotateY(gCalcMatrix, -gObjects80[i].obj.rot.y * M_DTOR, 0); + spA8.x = arg0->obj.pos.x - gObjects80[i].obj.pos.x; + spA8.y = arg0->obj.pos.y - gObjects80[i].obj.pos.y; + spA8.z = arg0->obj.pos.z - gObjects80[i].obj.pos.z; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &spA8, &sp9C); + var_s0++; + temp_fs0 = gObjects80[i].obj.pos.x + sp9C.x; + temp_fs1 = gObjects80[i].obj.pos.y + sp9C.y; + temp_fs2 = gObjects80[i].obj.pos.z + sp9C.z; + for (j = 0; j < temp_ft4; j++, var_s0 += 6) { + if (func_800A78C4(var_s0, gObjects80[i].obj.pos.x, gObjects80[i].obj.pos.y, gObjects80[i].obj.pos.z, + temp_fs0, temp_fs1, temp_fs2)) { + D_80161A7C = 10; + D_80161A80 = 10; + D_80161A84 = 10; + arg0->unk_0C8 = 5; + } + } + } + } + } +} + +void func_8006D350(Object_80* arg0) { + arg0->obj.rot.z += 1.0f; +} + +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 }, + { 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_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 }, + { 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_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 }, + { 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 }, + { 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 }, + { 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 }, + { 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 }, + { 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 }, + { 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 }, + { 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 }, + { 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_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 }, + { 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_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_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 }, + { 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 }, + { 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 }, +}; +u8 D_800D0DBC[6][4] = { + // could be in-function + { 255, 255, 255, 255 }, { 160, 160, 255, 255 }, { 80, 80, 255, 255 }, + { 80, 255, 80, 255 }, { 255, 80, 80, 255 }, { 255, 255, 80, 255 }, +}; + +void func_8006D36C(Object_2F4* arg0) { + u16** var_v1; + u16* temp_s1; + u16* temp_v0_4; + u16* test; + s32 i; + s32 j; + + switch (gCurrentLevel) { + case LEVEL_VENOM_2: + var_v1 = SEGMENTED_TO_VIRTUAL(D_C037E3C); + break; + case LEVEL_CORNERIA: + var_v1 = SEGMENTED_TO_VIRTUAL(D_603D9E8); + break; + case LEVEL_METEO: + var_v1 = SEGMENTED_TO_VIRTUAL(D_602F3AC); + break; + case LEVEL_AQUAS: + var_v1 = SEGMENTED_TO_VIRTUAL(D_60308B8); + break; + case LEVEL_TITANIA: + var_v1 = SEGMENTED_TO_VIRTUAL(D_600631C); + break; + case LEVEL_SECTOR_X: + var_v1 = SEGMENTED_TO_VIRTUAL(D_60320D0); + break; + case LEVEL_UNK_4: + var_v1 = SEGMENTED_TO_VIRTUAL(D_60289FC); + break; + case LEVEL_AREA_6: + var_v1 = SEGMENTED_TO_VIRTUAL(D_6027F50); + break; + case LEVEL_SECTOR_Y: + var_v1 = SEGMENTED_TO_VIRTUAL(D_6032E18); + break; + case LEVEL_SOLAR: + var_v1 = SEGMENTED_TO_VIRTUAL(D_6020DD0); + break; + case LEVEL_ZONESS: + var_v1 = SEGMENTED_TO_VIRTUAL(D_602AAC0); + break; + case LEVEL_VENOM_1: + var_v1 = SEGMENTED_TO_VIRTUAL(D_601B1E4); + break; + case LEVEL_MACBETH: + var_v1 = SEGMENTED_TO_VIRTUAL(D_60381D8); + break; + case LEVEL_TRAINING: + var_v1 = SEGMENTED_TO_VIRTUAL(D_6009B34); + break; + default: + var_v1 = SEGMENTED_TO_VIRTUAL(D_603D9E8); + break; + } + temp_s1 = SEGMENTED_TO_VIRTUAL(var_v1[arg0->unk_0E4]); + + switch (temp_s1[arg0->unk_0E6] & 0xFE00) { + case 0xFE00: + arg0->unk_0B8 = 200; + if (arg0->unk_01C.unk_10 > 10000.0f) { + arg0->unk_01C.unk_10 = 100.0f; + } + break; + case 0xD000: + func_8001A500(&arg0->unk_100); + arg0->unk_0B4 = temp_s1[arg0->unk_0E6 + 1]; + if (arg0->unk_0B4 == 40) { + arg0->unk_0C2 = 10000; + } else { + arg0->unk_0C2 = 0; + } + arg0->unk_140 = 0.0f; + arg0->unk_144 = 0.0f; + if ((arg0->unk_0B4 == 64) || (arg0->unk_0B4 == 81)) { + arg0->unk_150 = 0.0f; + } else if (arg0->unk_0B4 == 79) { + arg0->unk_01C.drawType = 2; + } + + arg0->unk_0CE = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0E6 += 2; + if ((arg0->unk_0B4 >= 200) && (arg0->unk_0B4 < 300)) { + arg0->unk_046 = 100; + arg0->unk_01C.unk_0C = D_800CBEC4; + arg0->unk_01C.unk_1C = 1.0f; + for (i = 0; i < 2; i++) { + if (D_80176550[i] == 0) { + D_80176550[i] = 1; + arg0->unk_046 = i; + for (j = 0; j < 100; j++) { + D_80176878[i][j] = arg0->obj.pos.y; + D_80176B98[i][j] = arg0->obj.pos.z; + } + if (arg0->unk_0B4 == 200) { + func_80019218(0x11032049, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + break; + } + } + + if (arg0->unk_046 == 100) { + Object_Kill(&arg0->obj, &arg0->unk_100); + } + } + if ((arg0->unk_0B4 == 2) || (arg0->unk_0B4 == 43)) { + arg0->unk_0C9 = 1; + arg0->unk_07C = 1; + } + if (arg0->unk_0B4 == 81) { + arg0->unk_0C9 = 1; + } + if (gPlayer[0].unk_1C8 == 3) { + if (arg0->unk_0B4 == 86) { + func_8001D4AC(0x36, 0x14, 0xA, 0xA); + } + if (arg0->unk_0B4 == 85) { + func_8001D4AC(0x37, 0x14, 0xA, 0xA); + } + } + if (arg0->unk_0B4 == 103) { + arg0->unk_0B6 = 0; + } + if (arg0->unk_0B4 == 104) { + arg0->unk_0B6 = Animation_GetFrameCount(&D_6014658) - 1; + } + if (arg0->unk_0B4 < 200) { + arg0->unk_01C.unk_0C = SEGMENTED_TO_VIRTUAL(D_800D003C[arg0->unk_0B4].unk_04); + arg0->unk_110 = D_800D003C[arg0->unk_0B4].unk_08; + arg0->unk_01C.unk_16 = D_800D003C[arg0->unk_0B4].unk_14; + arg0->unk_01C.unk_14 = D_800D003C[arg0->unk_0B4].unk_15; + arg0->unk_01C.unk_19 = D_800D003C[arg0->unk_0B4].unk_17; + arg0->unk_01C.unk_1C = D_800D003C[arg0->unk_0B4].unk_18; + arg0->unk_01C.unk_20 = D_800D003C[arg0->unk_0B4].unk_1C; + if (arg0->unk_0B4 == 78) { + arg0->unk_01C.unk_18 = 0; + } + arg0->unk_01C.unk_10 = D_800D003C[arg0->unk_0B4].unk_0C; + arg0->unk_178 = D_800D003C[arg0->unk_0B4].unk_10; + switch (D_800D003C[arg0->unk_0B4].unk_16) { + case 1: + if ((gCurrentLevel != LEVEL_SOLAR) && (arg0->unk_0B4 != 6) && + ((gCurrentLevel != LEVEL_CORNERIA) || (arg0->unk_0B4 != 8))) { + func_80019218(0x31000011, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + break; + case 2: + func_80019218(0x3100000C, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + case 3: + func_80019218(0x11030010, &arg0->unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + case 4: + func_80019218(0x31012039, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + case 5: + func_80019218(0x1900302B, &arg0->unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + case 6: + func_80019218(0x31000014, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + case 7: + func_80019218(0x31000015, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + break; + } + if (gPlayer[0].unk_138 < arg0->obj.pos.z) { + arg0->unk_01C.unk_10 = 3000.0f; + } + if (arg0->unk_01C.unk_16 == 0) { + arg0->obj.rot.z = arg0->unk_170 = arg0->unk_0F4.z; + if (arg0->unk_0B4 != 31) { + arg0->unk_0F4.z = 0.0f; + } + } + } + func_8006D36C(arg0); + break; + case 0xD200: + arg0->unk_080 = temp_s1[arg0->unk_0E6 + 1]; + if (arg0->unk_080 < 4) { + D_800CFF80[arg0->unk_080] = arg0->unk_040; + } + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xE200: + arg0->unk_08C = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_090 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x0600: + D_80177E78 = arg0->unk_040; + D_80177F10.x = arg0->obj.pos.x; + D_80177F10.y = arg0->obj.pos.y; + D_80177F10.z = arg0->obj.pos.z; + D_80177E88.x = arg0->obj.rot.x; + D_80177E88.y = arg0->obj.rot.y; + D_80177E88.z = arg0->obj.rot.z; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xE000: + if (temp_s1[arg0->unk_0E6 + 1] == 0xE) { + arg0->unk_0B8 = 0xA; + arg0->unk_140 = 0.0f; + arg0->unk_0E6 += 2; + break; + } + if (temp_s1[arg0->unk_0E6 + 1] == 0xF) { + arg0->unk_01C.unk_0C = SEGMENTED_TO_VIRTUAL(D_800CBEC4); + arg0->unk_0B8 = 0xB; + arg0->unk_0E6 += 2; + break; + } + arg0->unk_048 = temp_s1[arg0->unk_0E6 + 1]; + if (arg0->unk_048 == 3) { + arg0->unk_04C = 4; + } + if (arg0->unk_048 == 0xD) { + arg0->unk_0BE = 0x32; + } + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xE800: + arg0->unk_044 = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xEC00: + func_8001D400(temp_s1[arg0->unk_0E6 + 1]); + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xF000: + temp_v0_4 = Message_PtrFromId(temp_s1[arg0->unk_0E6 + 1]); + if ((temp_v0_4 != NULL) && (gPlayer[0].unk_1C8 == 3)) { + func_800BA808(temp_v0_4, temp_s1[arg0->unk_0E6] & 0x1FF); + } + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xEE00: + if ((D_80161A88 == 2) && (temp_s1[arg0->unk_0E6 + 1] != 2)) { + func_8001A55C(&gPlayer[0].unk_460, 0x1100000B); + } + D_80161A88 = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + arg0->obj.status = 0; + break; + case 0x7000: + D_800CFF90 = temp_s1[arg0->unk_0E6] & 0x1FF; + D_80161690 = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x7200: + D_801778B0[temp_s1[arg0->unk_0E6 + 1]] = 0xFF; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x7400: + func_8001D2FC(&arg0->unk_100, temp_s1[arg0->unk_0E6 + 1]); + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x7600: + func_8001D3A0(&arg0->unk_100, temp_s1[arg0->unk_0E6 + 1]); + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xF400: + func_800182F4(0x103200FF); + func_800182F4(0x113200FF); + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xF200: + if (arg0->unk_080 == temp_s1[arg0->unk_0E6 + 1]) { + arg0->unk_0D0 = 1; + arg0->unk_0D6 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0D4 = 100; + } else { + D_80177910[temp_s1[arg0->unk_0E6 + 1]] = temp_s1[arg0->unk_0E6] & 0x1FF; + } + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xF800: + arg0->unk_06C = 1; + for (i = 0; i < ARRAY_COUNT(gUnkEntities30); i++) { + if (gUnkEntities30[i].mode == 0) { + gUnkEntities30[i].mode = 1; + gUnkEntities30[i].unk_28 = 3.0f; + gUnkEntities30[i].unk_04.x = arg0->obj.pos.x - arg0->unk_0E8.x; + gUnkEntities30[i].unk_04.y = arg0->obj.pos.y - arg0->unk_0E8.y; + gUnkEntities30[i].unk_04.z = arg0->obj.pos.z - arg0->unk_0E8.z; + gUnkEntities30[i].unk_2C = D_800D0DBC[temp_s1[arg0->unk_0E6 + 1]][0]; + gUnkEntities30[i].unk_2D = D_800D0DBC[temp_s1[arg0->unk_0E6 + 1]][1]; + gUnkEntities30[i].unk_2E = D_800D0DBC[temp_s1[arg0->unk_0E6 + 1]][2]; + gUnkEntities30[i].unk_2F = D_800D0DBC[temp_s1[arg0->unk_0E6 + 1]][3]; + arg0->unk_070 = i; + break; + } + } + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xFA00: + arg0->unk_06C = 0; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x5000: + arg0->unk_0B8 = 6; + arg0->unk_0BC = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_174 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0E6 += 2; + break; + case 0x5200: + arg0->unk_0B8 = 7; + arg0->unk_0BC = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_174 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0E6 += 2; + break; + case 0x5400: + arg0->unk_0B8 = 8; + arg0->unk_0BC = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_174 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0E6 += 2; + break; + case 0x5600: + arg0->unk_0B8 = 9; + arg0->unk_0BC = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_174 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0E6 += 2; + break; + case 0x5A00: + arg0->unk_0B8 = 1; + arg0->unk_054 = D_800CFF80[temp_s1[arg0->unk_0E6] & 0x1FF]; + arg0->unk_158 = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_0BC = 0; + arg0->unk_0E6 += 2; + break; + case 0x5800: + arg0->unk_0B8 = 0xD; + arg0->unk_0BC = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_174 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0E6 += 2; + break; + case 0x5C00: + arg0->unk_0B8 = 0xE; + arg0->unk_0BC = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_174 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0E6 += 2; + break; + case 0x5E00: + arg0->unk_0B8 = 0xF; + arg0->unk_0BC = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_174 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0E6 += 2; + break; + case 0xC000: + arg0->unk_058 = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_05C = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0xFC00: + if (temp_s1[arg0->unk_0E6 + 1] < arg0->unk_050) { + arg0->unk_0E6 += 2; + arg0->unk_050 = 0; + } else if ((temp_s1[arg0->unk_0E6] & 0x1FF) < 200) { + arg0->unk_0E6 = (temp_s1[arg0->unk_0E6] & 0x1FF) * 2; + arg0->unk_050++; + } else { + arg0->unk_0E4 = (temp_s1[arg0->unk_0E6] & 0x1FF) - 200; + arg0->unk_0E6 = 0; + arg0->unk_050 = 0; + } + func_8006D36C(arg0); + break; + case 0x6000: + arg0->unk_0B8 = 1; + arg0->unk_0BC = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_0E6 += 2; + break; + case 0x0000: + arg0->unk_114 = temp_s1[arg0->unk_0E6] & 0x7F; + arg0->unk_118 = arg0->unk_114; + arg0->unk_064 = temp_s1[arg0->unk_0E6] & 0x180; + arg0->unk_0BC = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_0B8 = 1; + arg0->unk_0E6 += 2; + break; + case 0x0400: + arg0->unk_16C = temp_s1[arg0->unk_0E6 + 1] & 0xFF; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x0200: + arg0->unk_118 = temp_s1[arg0->unk_0E6] & 0x7F; + arg0->unk_064 = temp_s1[arg0->unk_0E6] & 0x180; + arg0->unk_0BC = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_0B8 = 1; + arg0->unk_0E6 += 2; + break; + case 0x0800: + arg0->unk_0C0 = temp_s1[arg0->unk_0E6 + 1]; + arg0->unk_084 = 1; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x1000: + arg0->unk_084 = 0; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x1200: + arg0->unk_0B8 = 2; + arg0->unk_11C = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_120 = temp_s1[arg0->unk_0E6 + 1] * 0.1f; + arg0->unk_0E6 += 2; + break; + case 0x1400: + arg0->unk_0B8 = 3; + arg0->unk_11C = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_120 = temp_s1[arg0->unk_0E6 + 1] * 0.1f; + arg0->unk_0E6 += 2; + break; + case 0x1600: + arg0->unk_0B8 = 4; + arg0->unk_11C = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_120 = temp_s1[arg0->unk_0E6 + 1] * 0.1f; + arg0->unk_0E6 += 2; + break; + case 0x1800: + arg0->unk_0B8 = 5; + arg0->unk_11C = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_120 = temp_s1[arg0->unk_0E6 + 1] * 0.1f; + arg0->unk_0E6 += 2; + break; + case 0x2000: + arg0->unk_124.x = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_124.y = temp_s1[arg0->unk_0E6 + 1] * 0.1f; + arg0->unk_124.z = 1.0f; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x2200: + arg0->unk_124.x = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_124.y = temp_s1[arg0->unk_0E6 + 1] * 0.1f; + arg0->unk_124.z = -1.0f; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x2400: + arg0->unk_130 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_134 = temp_s1[arg0->unk_0E6 + 1] * 0.1f; + arg0->unk_138 = 1.0f; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x2600: + arg0->unk_130 = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_134 = temp_s1[arg0->unk_0E6 + 1] * 0.1f; + arg0->unk_138 = -1.0f; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x2800: + arg0->unk_13C = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_140 = temp_s1[arg0->unk_0E6 + 1] * 0.1f; + arg0->unk_144 = 1.0f; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x2A00: + arg0->unk_13C = temp_s1[arg0->unk_0E6] & 0x1FF; + arg0->unk_140 = temp_s1[arg0->unk_0E6 + 1] * 0.1f; + arg0->unk_144 = -1.0f; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x3000: + arg0->unk_068 = 1; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + case 0x3200: + arg0->unk_068 = 0; + arg0->unk_0E6 += 2; + func_8006D36C(arg0); + break; + } +} + +void func_8006EA50(Object_2F4* arg0) { + if ((arg0->unk_06C != 0) && (gUnkEntities30[arg0->unk_070].mode != 0)) { + gUnkEntities30[arg0->unk_070].unk_10.x = arg0->obj.pos.x; + gUnkEntities30[arg0->unk_070].unk_10.y = arg0->obj.pos.y; + gUnkEntities30[arg0->unk_070].unk_10.z = arg0->obj.pos.z; + } +} + +void func_8006EAC4(Object_8C* arg0, f32 arg1, f32 arg2, f32 arg3) { + Object_8C_Initialize(arg0); + arg0->obj.status = 1; + arg0->obj.id = OBJECT_374; + arg0->obj.pos.x = arg1; + arg0->obj.pos.y = arg2; + arg0->obj.pos.z = arg3; + arg0->unk_50 = 20; + func_800612B8(&arg0->unk_1C, arg0->obj.id); + func_80019218(0x2900201D, &arg0->unk_80, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); +} + +void func_8006EB64(f32 arg0, f32 arg1, f32 arg2) { + s32 i; + + for (i = 50; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + func_8006EAC4(&gObjects8C[i], arg0, arg1, arg2); + break; + } + } +} + +void func_8006EBC0(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3) { + Object_2F4_Initialize(arg0); + arg0->obj.status = 1; + arg0->obj.id = OBJECT_225; + arg0->obj.pos.x = arg1; + arg0->obj.pos.y = arg2; + arg0->obj.pos.z = arg3; + func_800612B8(&arg0->unk_01C, arg0->obj.id); + arg0->unk_01C.unk_16 = 2; + func_80019218(0x2900201D, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); +} + +void func_8006EC60(f32 arg0, f32 arg1, f32 arg2) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) { + if (gObjects2F4[i].obj.status == 0) { + func_8006EBC0(&gObjects2F4[i], arg0, arg1, arg2); + break; + } + } +} + +void func_8006ECBC(s32 arg0, Object_70* arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, + f32 arg9, f32 argA, f32 argB) { + func_80035E48(arg1); + arg1->obj.status = 1; + arg1->unk_20.z = arg8; + arg1->unk_20.x = arg6; + arg1->unk_20.y = arg7; + arg1->obj.pos.x = arg3; + arg1->obj.pos.y = arg4; + arg1->obj.pos.z = arg5; + arg1->obj.rot.x = arg9 + 180.0f; + arg1->obj.rot.y = argA; + arg1->obj.rot.z = -argB; + arg1->obj.id = arg0; + arg1->unk_58 = 1; + arg1->unk_60 = 0; + if (arg0 == 9) { + arg1->unk_64 = 120; + } else { + arg1->unk_64 = 30; + } + arg1->unk_68 = arg2 + 100; + + if (D_80177880 == 1) { + if (arg2 + 100 < 104) { + func_80019218(0x2900000D, &arg1->unk_38, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } else { + func_80019218(0x29002002, &arg1->unk_38, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + } else if ((arg2 < 60) && (gObjects2F4[arg2].obj.id == OBJECT_200) && (gObjects2F4[arg2].unk_080 > 0)) { + func_80019218(0x2900000D, &arg1->unk_38, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } else if (arg2 + 100 == 200) { + arg1->unk_68 = 100; + func_80019218(0x19030037, &arg1->unk_38, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } else { + func_80019218(0x29002002, &arg1->unk_38, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } +} + +void func_8006EEFC(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, f32 arg9) { + s32 i; + + for (i = 0; i < 10; i++) { + if (gObjects70[i].obj.status == 0) { + func_8006ECBC(1, &gObjects70[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); + break; + } + } +} + +void func_8006EFA0(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, f32 arg9) { + s32 i; + + for (i = 0; i < 10; i++) { + if (gObjects70[i].obj.status == 0) { + func_8006ECBC(9, &gObjects70[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); + break; + } + } +} + +void func_8006F044(Object_8C* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { + Object_8C_Initialize(arg0); + arg0->obj.status = 1; + arg0->obj.id = OBJECT_347; + arg0->obj.pos.x = arg1; + arg0->obj.pos.y = arg2; + arg0->obj.pos.z = arg3; + arg0->unk_6C = arg4; + arg0->unk_44 = 100; + func_800612B8(&arg0->unk_1C, arg0->obj.id); + func_8007A6F0(&arg0->obj.pos, 0x2903B009); +} + +void func_8006F0D8(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + func_8006F044(&gObjects8C[i], arg0, arg1, arg2, arg3); + break; + } + } +} + +void func_8006F140(Object_8C* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { + Object_8C_Initialize(arg0); + arg0->obj.status = 1; + arg0->obj.id = OBJECT_394; + arg0->obj.pos.x = arg1; + arg0->obj.pos.y = arg2; + arg0->obj.pos.z = arg3; + arg0->unk_6C = arg4; + arg0->unk_44 = 100; + arg0->unk_78 = 102; + arg0->unk_7A = 18; + func_800612B8(&arg0->unk_1C, arg0->obj.id); + arg0->unk_1C.unk_18 = 40; + func_8007A6F0(&arg0->obj.pos, 0x2903B009); +} + +void func_8006F1EC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + func_8006F140(&gObjects8C[i], arg0, arg1, arg2, arg3); + break; + } + } +} + +void func_8006F254(Object_2F4* arg0) { + Vec3f sp54; + Vec3f sp48; + + Matrix_RotateY(gCalcMatrix, arg0->unk_2E8.y * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, arg0->unk_2E8.x * M_DTOR, 1); + Matrix_RotateZ(gCalcMatrix, (arg0->unk_2E8.z + arg0->unk_0F4.z) * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, arg0->unk_0F4.y * M_DTOR, 1); + Matrix_RotateX(gCalcMatrix, arg0->unk_0F4.x * M_DTOR, 1); + sp54.x = 0.0f; + sp54.y = 0.0f; + sp54.z = D_80177828; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp54, &sp48); + func_8007F04C(OBJECT_353, arg0->obj.pos.x + sp48.x, arg0->obj.pos.y + sp48.y, arg0->obj.pos.z + sp48.z, + arg0->obj.rot.x, arg0->obj.rot.y, arg0->obj.rot.z, arg0->unk_2E8.x, arg0->unk_2E8.y, + arg0->unk_2E8.z + arg0->unk_0F4.z, sp48.x, sp48.y, sp48.z, 1.0f); +} + +void func_8006F40C(Object_2F4* arg0) { + s32 var_v1; + Vec3f sp78; + Vec3f sp6C; + Object_4C* var_v0; + + if ((gPlayer[0].unk_1C8 == 3) && (arg0->unk_0B4 != 0x34) && (arg0->unk_0B4 != 0x67) && (arg0->unk_0B4 != 0x68) && + (arg0->unk_0B4 != 0x30) && (arg0->unk_0B4 != 0x31) && (arg0->unk_0B4 != 0x32)) { + switch (arg0->unk_048) { + case 0: + break; + case 1: + func_8006F254(arg0); + arg0->unk_048 = 0; + break; + case 2: + if (arg0->obj.pos.z < (gPlayer[0].unk_138 - 600.0f)) { + func_8007F11C(OBJECT_353, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, D_80177828); + } + arg0->unk_048 = 0; + break; + case 3: + if (arg0->unk_0BE == 0) { + arg0->unk_0BE = 6; + sp78.x = 0.0f; + sp78.y = 0.0f; + sp78.z = 100.0f; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); + func_8006EEFC(arg0->unk_040, arg0->obj.pos.x + (sp6C.x * 1.5), arg0->obj.pos.y + (sp6C.y * 1.5), + arg0->obj.pos.z + (sp6C.z * 1.5), sp6C.x, sp6C.y, sp6C.z, arg0->unk_0F4.x, + arg0->unk_0F4.y, arg0->unk_2E8.z + arg0->unk_0F4.z); + arg0->unk_0C2 = 2; + arg0->unk_04C--; + if (arg0->unk_04C <= 0) { + arg0->unk_048 = 0; + } + } + break; + case 4: + func_8006EB64(arg0->obj.pos.x, arg0->obj.pos.y - 20.0f, arg0->obj.pos.z); + arg0->unk_048 = 0; + break; + case 5: + Matrix_RotateY(gCalcMatrix, arg0->unk_2E8.y * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, arg0->unk_2E8.x * M_DTOR, 1); + Matrix_RotateZ(gCalcMatrix, (arg0->unk_2E8.z + arg0->unk_0F4.z) * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, arg0->unk_0F4.y * M_DTOR, 1); + Matrix_RotateX(gCalcMatrix, arg0->unk_0F4.x * M_DTOR, 1); + sp78.x = 0.0f; + sp78.y = 0.0f; + sp78.z = D_80177828; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp6C); + func_8007F04C(OBJECT_355, arg0->obj.pos.x + sp6C.x, arg0->obj.pos.y + sp6C.y, arg0->obj.pos.z + sp6C.z, + arg0->obj.rot.x, arg0->obj.rot.y, arg0->obj.rot.z, arg0->unk_2E8.x, arg0->unk_2E8.y, + arg0->unk_2E8.z + arg0->unk_0F4.z, sp6C.x, sp6C.y, sp6C.z, 1.0f); + arg0->unk_048 = 0; + break; + case 6: + if (arg0->obj.pos.z < (gPlayer[0].unk_138 - 600.0f)) { + func_8007F11C(OBJECT_355, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, D_80177828); + } + arg0->unk_048 = 0; + break; + case 7: + if (arg0->obj.pos.z < (gPlayer[0].unk_138 - 600.0f)) { + func_8007F11C(OBJECT_356, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 60.0f); + } + arg0->unk_048 = 0; + break; + case 8: + sp6C.x = gPlayer[0].unk_074; + sp6C.y = gPlayer[0].unk_078; + gPlayer[0].unk_074 += (Rand_ZeroOne() - 0.5f) * 300.0f; + gPlayer[0].unk_078 += (Rand_ZeroOne() - 0.5f) * 300.0f; + func_8007F11C(OBJECT_353, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, D_80177828); + gPlayer[0].unk_074 = sp6C.x; + gPlayer[0].unk_078 = sp6C.y; + arg0->unk_048 = 0; + break; + case 9: + if (gCurrentLevel == LEVEL_AQUAS) { + func_8006F1EC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 12.0f); + } else { + func_8006F0D8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 40.0f); + } + Object_Kill(&arg0->obj, &arg0->unk_100); + break; + case 10: + if (gCurrentLevel == LEVEL_AQUAS) { + func_8006F1EC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 6.0f); + } else { + func_8006F0D8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 15.0f); + } + Object_Kill(&arg0->obj, &arg0->unk_100); + break; + case 11: + func_8007BFFC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_0E8.x, arg0->unk_0E8.y, + arg0->unk_0E8.z, arg0->unk_110 * 3.0f, 15); + func_80066254(arg0); + Object_Kill(&arg0->obj, &arg0->unk_100); + func_8007A6F0(&arg0->obj.pos, 0x2903B009); + break; + case 12: + func_80066254(arg0); + Object_Kill(&arg0->obj, &arg0->unk_100); + break; + case 13: + if (arg0->unk_0BE > 25) { + Math_SmoothStepToF(&arg0->unk_150, 90.0f, 0.2f, 8.0f, 0.01f); + } + if (arg0->unk_0BE < 25) { + Math_SmoothStepToF(&arg0->unk_150, 0.0f, 0.2f, 8.0f, 0.01f); + } + if (arg0->unk_0BE == 30) { + func_8006EC60(arg0->obj.pos.x, arg0->obj.pos.y - 50.0f, arg0->obj.pos.z); + } + if (arg0->unk_0BE == 0) { + arg0->unk_048 = 0; + } + break; + case 16: + func_8007F11C(OBJECT_353, arg0->obj.pos.x + 190.0f, arg0->obj.pos.y + 90.0f, arg0->obj.pos.z + 220.0f, + D_80177828); + func_8007F11C(OBJECT_353, arg0->obj.pos.x - 190.0f, arg0->obj.pos.y + 90.0f, arg0->obj.pos.z + 220.0f, + D_80177828); + arg0->unk_048 = 0; + break; + case 17: + if (arg0->obj.pos.z < (gPlayer[0].unk_040.z - 600.0f)) { + func_8007F20C(OBJECT_353, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, D_80177828); + } + arg0->unk_048 = 0; + break; + case 18: + for (var_v1 = 0, var_v0 = gObjects4C; var_v1 < 40; var_v1++, var_v0++) { + + if ((var_v0->obj.status == 2) && (var_v0->obj.id == OBJECT_175)) { + f32 sp64; + f32 sp60; + f32 sp5C; + f32 sp58; + f32 sp54; + + var_v0->obj.status = 0; + sp64 = var_v0->obj.pos.x - arg0->obj.pos.x; + sp60 = var_v0->obj.pos.y - arg0->obj.pos.y; + sp5C = var_v0->obj.pos.z - arg0->obj.pos.z; + sp54 = Math_Atan2F(sp64, sp5C); + sp54 = Math_RadToDeg(sp54); + sp58 = -Math_Atan2F(sp60, sqrtf(SQ(sp64) + SQ(sp5C))); + sp58 = Math_RadToDeg(sp58); + Matrix_RotateY(gCalcMatrix, M_DTOR * sp54, 0); + Matrix_RotateX(gCalcMatrix, M_DTOR * sp58, 1); + sp6C.x = 0.0f; + sp6C.y = 0.0f; + sp6C.z = 50.0f; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp6C, &sp78); + func_8006EFA0(100, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, sp78.x, sp78.y, sp78.z, + sp58, sp54, 0.0f); + break; + } + } + + arg0->unk_048 = 0; + break; + case 19: + func_80083D2C(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 40.0f); + arg0->unk_048 = 0; + break; + } + } +} + +void func_8006FE28(Object_2F4* arg0) { + if ((fabsf(arg0->obj.pos.x - gPlayer[0].unk_074) < 100.0f) && + (fabsf(arg0->obj.pos.y - gPlayer[0].unk_078) < 100.0f) && + (fabsf(arg0->obj.pos.z - gPlayer[0].unk_138) < 50.0f)) { + func_80067A40(); + func_8001A55C(&arg0->unk_100, 0x1900302B); + Object_Kill(&arg0->obj, &arg0->unk_100); + } +} + +void func_8006FEEC(Object_2F4* arg0) { + s32 i; + + if ((arg0->unk_0D0 != 0) && (arg0->unk_0CE != 0)) { + arg0->unk_0D0 = 0; + arg0->unk_0C6 = 0xF; + arg0->unk_0CE = arg0->unk_0CE - arg0->unk_0D6; + if (arg0->unk_0CE <= 0) { + for (i = 3; i < 11; i++) { + func_E16C50_801900FC(&arg0->unk_18C[i], &arg0->unk_18C[i + 11], (Rand_ZeroOne() - 0.5f) * 20.0f, + Rand_ZeroOne() * -10.0f, Rand_ZeroOne() * 10.0f, 41, arg0->unk_110, 200, i); + } + arg0->unk_044 = 0; + func_80066254(arg0); + Object_Kill(&arg0->obj, &arg0->unk_100); + func_8007A6F0(&arg0->obj.pos, 0x29018036); + func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 4.0f); + } else { + func_80019218(0x29033037, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + } +} + +bool func_800700A4(Object_2F4* arg0) { + if ((arg0->unk_0B8 != 12) && (arg0->unk_080 > 0) && (arg0->unk_080 < 4) && (D_801778B0[arg0->unk_080] <= 0)) { + arg0->unk_0B8 = 12; + arg0->unk_058 = 0; + arg0->unk_13C = 360.0f; + arg0->unk_140 = 20.0f; + D_801778B0[arg0->unk_080] = 1; + switch (arg0->unk_080) { + case 1: + func_800BA808(gMsg_ID_20220, RCID_FALCO); + break; + case 2: + func_800BA808(gMsg_ID_20222, RCID_SLIPPY); + break; + case 3: + func_800BA808(gMsg_ID_20221, RCID_PEPPY); + break; + } + D_801778B0[arg0->unk_080] = -1; + D_80177910[arg0->unk_080] = 0; + arg0->unk_0C2 = 5000; + arg0->unk_0D0 = 0; + return true; + } + return false; +} + +void func_800701E0(Object_2F4* arg0) { + Vec3f sp3C; + f32 var_fv1; + f32 temp_fv1; + + if (func_800700A4(arg0) == 0) { + if ((arg0->unk_0D0 != 0) && (arg0->unk_0B4 == 0x43) && (arg0->unk_0D2 == 0)) { + arg0->unk_0D0 = 0; + } + if ((arg0->unk_0D0 != 0) && (arg0->unk_0B4 == 0x53) && (arg0->unk_0C2 >= 2)) { + arg0->unk_0D0 = 0; + } + if ((arg0->unk_0D0 != 0) && (((arg0->unk_0B4 == 0x40) && (arg0->unk_0D2 == 2)) || (arg0->unk_0B4 != 0x40))) { + if (arg0->unk_080 >= 4) { + arg0->unk_0D6 = 0; + } + if ((arg0->unk_080 > 0) && (arg0->unk_080 < 4)) { + D_801778B0[arg0->unk_080] -= arg0->unk_0D6; + } else if ((arg0->unk_0B4 == 0x53) && ((arg0->unk_0D6 == 0x1E) || (arg0->unk_0D6 == 0x1F))) { + arg0->unk_0CE = 0; + } else { + arg0->unk_0CE -= arg0->unk_0D6; + } + if (arg0->unk_0CE <= 0) { + if (arg0->unk_0B4 == 0x6A) { + func_80077240(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 3); + gHitCount += 4; + D_80177850 = 0xF; + } + if (arg0->unk_0B4 != 0x53) { + if ((arg0->unk_0B4 == 6) && (gCurrentLevel == LEVEL_SOLAR)) { + func_80019218(0x29018036, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } else { + func_80019218(0x2903700B, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + arg0->obj.status = 3; + var_fv1 = 0.7f; + if (gLevelType == 1) { + var_fv1 = 0.3f; + } + if (((Rand_ZeroOne() < var_fv1) || (arg0->unk_080 != 0)) && (arg0->unk_01C.unk_14 == 0) && + (arg0->unk_0B4 != 0xD) && (arg0->unk_0B4 != 0xE) && (arg0->unk_0B4 != 0x3D) && + ((s32) arg0->unk_0D6 < 0x1F) && (arg0->unk_0B4 != 0x3E) && (arg0->unk_0B4 != 0x40) && + (arg0->unk_0B4 != 0x48) && (arg0->unk_0B4 != 0x44)) { + func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_110 * 4.0f); + arg0->unk_0D0 = 0; + } + arg0->unk_0C2 = 0xA; + arg0->unk_0BE = 0; + arg0->unk_046 = 0xFF; + arg0->unk_048 = 0x384; + arg0->unk_0C9 = 1; + if (gLevelType == 0) { + arg0->unk_04C = (s16) (s32) (Rand_ZeroOne() * 2.9f); + if (arg0->unk_0B4 == 2) { + arg0->unk_04C = 1; + if (arg0->obj.pos.x < arg0->unk_0D8.x) { + func_800A69F8(1, arg0->obj.pos.x + 20.0f, arg0->obj.pos.y, arg0->obj.pos.z); + arg0->unk_158 = 777.0f; + } else { + func_800A69F8(0, arg0->obj.pos.x - 20.0f, arg0->obj.pos.y, arg0->obj.pos.z); + arg0->unk_15C = 777.0f; + } + } + arg0->unk_0BC = 0x12C; + if (D_80177880 != 1) { + arg0->unk_0E8.x *= 0.5f; + arg0->unk_0E8.y = Rand_ZeroOne() * 5.0f; + if (arg0->unk_0E8.z < 0.0f) { + arg0->unk_0E8.z = arg0->unk_0E8.z; + } else { + arg0->unk_0E8.z = arg0->unk_0E8.z * 0.3f; + } + if (((arg0->obj.pos.z + D_80177D20) > -3000.0f) && (arg0->unk_0E8.z > 0.0f)) { + arg0->unk_0E8.z = Rand_ZeroOne() * -10.0f; + } + } + if (arg0->unk_0B4 == 0x5A) { + arg0->unk_04C = 0x3E7; + } + } else { + switch (arg0->unk_0B4) { + case 0xD: + func_800654E4(&arg0->obj); + break; + case 0x3D: + func_E08400_8018CCF8(arg0); + break; + case 0x1B: + arg0->obj.pos.y -= arg0->unk_0E8.y; + arg0->obj.status = 2; + func_8007D0E0(arg0->obj.pos.x - arg0->unk_0E8.x, arg0->obj.pos.y + 30.0f, + arg0->obj.pos.z - arg0->unk_0E8.z, arg0->unk_110 * 5.0f); + arg0->unk_0D0 = 0; + arg0->unk_0C2 = 0x2710; + arg0->unk_01C.unk_1C = 0.0f; + gHitCount += arg0->unk_01C.unk_20; + D_80177850 = 0xF; + break; + default: + arg0->unk_0BC = 0x23; + arg0->unk_04C = 2; + arg0->unk_0E8.y = (Rand_ZeroOne() - 0.5f) * 20.0f; + arg0->unk_0E8.x = (Rand_ZeroOne() - 0.5f) * 20.0f; + arg0->unk_0E8.z = 0.0f; + break; + } + } + } + if (arg0->unk_0B4 == 0x52) { + func_80019218(0x11000055, &arg0->unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + arg0->unk_0D0 = 1; + func_8007C688(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 3.0f, 0x3C); + } + } else { + arg0->unk_0C6 = 0x14; + if ((arg0->unk_0B4 == 6) && (gCurrentLevel == LEVEL_SOLAR)) { + func_80019218(0x29033037, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } else if (arg0->unk_0CE < 0x14) { + func_80019218(0x2943500F, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } else { + func_80019218(0x2903300E, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + if ((arg0->unk_0B4 != 0xD) && (arg0->unk_0B4 != 0x3D) && (arg0->unk_0B4 != 0x53)) { + func_8007D10C(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_110 * 1.5f); + } + if (((D_80177880 == 1) || (D_80177880 == 2)) && (arg0->unk_0B4 != 0x15) && (arg0->unk_0B4 != 0x17)) { + arg0->unk_148 = 20.0f; + if (arg0->obj.pos.x < arg0->unk_0D8.x) { + arg0->unk_148 *= -1.0f; + } + } + + if (arg0->unk_0D4 == 1) { + switch (arg0->unk_080) { + case 1: + if (arg0->unk_0D0 == 3) { + func_8006A7B0(gMsg_ID_20210, RCID_FALCO); + } else { + func_8006A7B0(gMsg_ID_20060, RCID_FALCO); + } + break; + case 3: + if (arg0->unk_0D0 == 3) { + func_8006A7B0(gMsg_ID_20200, RCID_PEPPY); + } else { + func_8006A7B0(gMsg_ID_20070, RCID_PEPPY); + } + break; + case 2: + if (arg0->unk_0D0 == 3) { + func_8006A7B0(gMsg_ID_20190, RCID_SLIPPY); + } else { + func_8006A7B0(gMsg_ID_20080, RCID_SLIPPY); + } + break; + case 4: + func_8006A7B0(gMsg_ID_20084, RCID_KATT); + break; + case 5: + func_8006A7B0(gMsg_ID_20085, RCID_BILL); + break; + } + } + arg0->unk_0D0 = 0; + } + } + if ((arg0->unk_080 == 0) && (arg0->unk_084 == 0) && (arg0->unk_01C.unk_16 != 2) && (gLevelType == 1)) { + sp3C.x = arg0->unk_0E8.x; + sp3C.y = arg0->unk_0E8.y; + sp3C.z = arg0->unk_0E8.z; + if ((func_8006351C(arg0->unk_040, &arg0->obj.pos, &sp3C, 0) != 0) || + (arg0->obj.pos.y < (D_80177940 + 20.0f))) { + arg0->obj.status = 3; + arg0->obj.pos.z -= arg0->unk_0E8.z; + arg0->unk_0D0 = 1; + if (arg0->unk_0B4 == 13) { + arg0->obj.id = OBJECT_182; + func_800654E4(&arg0->obj); + } + if (arg0->unk_0B4 == 61) { + func_E08400_8018CCF8(arg0); + } + } + } + } +} + +void func_80070BA8(Object_2F4* arg0) { + if (arg0->unk_0D0 != 0) { + arg0->unk_0D0 = 0; + if ((arg0->unk_0B4 != 0x11) || ((arg0->unk_0B4 == 0x11) && (arg0->unk_0D2 == 0))) { + arg0->unk_0C6 = 0xA; + func_8007C120(arg0->unk_0D8.x, arg0->unk_0D8.y, arg0->unk_0D8.z, arg0->unk_0E8.x, arg0->unk_0E8.y, + arg0->unk_0E8.z, 0.2f, 0xA); + arg0->unk_0CE -= arg0->unk_0D6; + func_80019218(0x29033064, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + if (arg0->unk_0CE <= 0) { + func_80077240(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_01C.unk_20); + gHitCount += arg0->unk_01C.unk_20 + 1; + D_80177850 = 0xF; + } + } else { + func_80019218(0x29121007, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + } +} + +void func_80070CEC(Object_2F4* arg0) { + if (arg0->unk_05C < 200) { + arg0->unk_0E6 = arg0->unk_05C * 2; + arg0->unk_050 = 0; + arg0->unk_058 = 0; + func_8006D36C(arg0); + } else { + arg0->unk_0E4 = arg0->unk_05C - 200; + arg0->unk_0E6 = 0; + arg0->unk_050 = 0; + arg0->unk_058 = 0; + func_8006D36C(arg0); + } +} + +void func_80070D44(Object_2F4* arg0) { + s32 i; + s32 var_v1 = 0; + s32 var_v1_4; + Object_2F4* temp; + + for (i = 1; i < 4; i++) { + if (D_801778B0[i] > 0) { + var_v1++; + } + } + if (arg0->unk_058 >= 100) { + if (fabsf(arg0->obj.pos.z - gPlayer[0].unk_138) <= ((arg0->unk_058 - 100) * 100.0f)) { + func_80070CEC(arg0); + } + return; + } + switch (arg0->unk_058) { + case 0: + break; + case 0x1: + if ((gObjects2F4[arg0->unk_054].obj.status != 2) || (gObjects2F4[arg0->unk_054].unk_0CE <= 0) || + (arg0->unk_078 != gObjects2F4[arg0->unk_054].unk_0E4)) { + func_80070CEC(arg0); + } + break; + case 0x2: + if (var_v1 == 3) { + func_80070CEC(arg0); + } + break; + case 0x3: + if (var_v1 == 2) { + func_80070CEC(arg0); + } + break; + case 0x4: + if (var_v1 == 1) { + func_80070CEC(arg0); + } + break; + case 0x5: + if (var_v1 == 0) { + func_80070CEC(arg0); + } + break; + case 0x6: + if (D_801778B0[1] > 0) { + func_80070CEC(arg0); + } + break; + case 0x7: + if (D_801778B0[3] > 0) { + func_80070CEC(arg0); + } + break; + case 0x8: + if (D_801778B0[2] > 0) { + func_80070CEC(arg0); + } + break; + case 0x9: + if (((arg0->obj.pos.x - gPlayer[0].unk_074) <= 100.0f) && + ((arg0->obj.pos.x - gPlayer[0].unk_074) >= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0xA: + if (((arg0->obj.pos.x - gPlayer[0].unk_074) <= 400.0f) && + ((arg0->obj.pos.x - gPlayer[0].unk_074) >= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0xB: + if (((arg0->obj.pos.x - gPlayer[0].unk_074) <= 700.0f) && + ((arg0->obj.pos.x - gPlayer[0].unk_074) >= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0xC: + if (((arg0->obj.pos.x - gPlayer[0].unk_074) <= 200.0f) && + ((arg0->obj.pos.x - gPlayer[0].unk_074) >= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0xD: + if (((arg0->obj.pos.x - gPlayer[0].unk_074) >= -100.0f) && + ((arg0->obj.pos.x - gPlayer[0].unk_074) <= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0xE: + if (((arg0->obj.pos.x - gPlayer[0].unk_074) >= -400.0f) && + ((arg0->obj.pos.x - gPlayer[0].unk_074) <= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0xF: + if (((arg0->obj.pos.x - gPlayer[0].unk_074) >= -700.0f) && + ((arg0->obj.pos.x - gPlayer[0].unk_074) <= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0x10: + if (((arg0->obj.pos.x - gPlayer[0].unk_074) >= -200.0f) && + ((arg0->obj.pos.x - gPlayer[0].unk_074) <= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0x11: + if (((arg0->obj.pos.y - gPlayer[0].unk_078) <= 100.0f) && + ((arg0->obj.pos.y - gPlayer[0].unk_078) >= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0x12: + if (((arg0->obj.pos.y - gPlayer[0].unk_078) <= 400.0f) && + ((arg0->obj.pos.y - gPlayer[0].unk_078) >= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0x13: + if (((arg0->obj.pos.y - gPlayer[0].unk_078) <= 700.0f) && + ((arg0->obj.pos.y - gPlayer[0].unk_078) >= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0x14: + if (((arg0->obj.pos.y - gPlayer[0].unk_078) <= 200.0f) && + ((arg0->obj.pos.y - gPlayer[0].unk_078) >= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0x15: + if (((arg0->obj.pos.y - gPlayer[0].unk_078) >= -100.0f) && + ((arg0->obj.pos.y - gPlayer[0].unk_078) <= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0x16: + if (((arg0->obj.pos.y - gPlayer[0].unk_078) >= -400.0f) && + ((arg0->obj.pos.y - gPlayer[0].unk_078) <= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0x17: + if (((arg0->obj.pos.y - gPlayer[0].unk_078) >= -700.0f) && + ((arg0->obj.pos.y - gPlayer[0].unk_078) <= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0x18: + if (((arg0->obj.pos.y - gPlayer[0].unk_078) >= -200.0f) && + ((arg0->obj.pos.y - gPlayer[0].unk_078) <= 0.0f)) { + func_80070CEC(arg0); + } + break; + case 0x19: + if (gPlayer[0].health >= Play_GetMaxHealth()) { + func_80070CEC(arg0); + } + break; + case 0x1A: + if (gPlayer[0].health >= (Play_GetMaxHealth() * 3 / 4)) { + func_80070CEC(arg0); + } + break; + case 0x1B: + if (gPlayer[0].health >= (Play_GetMaxHealth() / 2)) { + func_80070CEC(arg0); + } + break; + case 0x1C: + if (gPlayer[0].health >= (Play_GetMaxHealth() / 4)) { + func_80070CEC(arg0); + } + break; + case 0x1D: + if (gPlayer[0].health == 0) { + func_80070CEC(arg0); + } + break; + case 0x1E: + if (gPlayer[0].unk_270 >= 5) { + func_80070CEC(arg0); + } + break; + case 0x1F: + if (gPlayer[0].unk_270 != 0) { + func_80070CEC(arg0); + } + break; + case 0x20: + if (gPlayer[0].unk_270 == 0) { + func_80070CEC(arg0); + } + break; + case 0x21: + if (gPlayer[0].unk_250 >= 16.8f) { + func_80070CEC(arg0); + } + break; + case 0x22: + if (gPlayer[0].unk_250 <= 8.4f) { + func_80070CEC(arg0); + } + break; + case 0x23: + if (gPlayer[0].wings.unk_14 > -8.0f) { + func_80070CEC(arg0); + } + break; + case 0x24: + if ((gPlayer[0].wings.unk_14 < -8.0f) && (gLaserStrength[0] == 1)) { + func_80070CEC(arg0); + } + break; + case 0x25: + if ((gPlayer[0].wings.unk_14 < -8.0f) && (gLaserStrength[0] == 2)) { + func_80070CEC(arg0); + } + break; + case 0x26: + if ((gPlayer[0].wings.unk_14 < -8.0f) && (gLaserStrength[0] == 3)) { + func_80070CEC(arg0); + } + break; + case 0x27: + for (i = 0; i < ARRAY_COUNT(gObjects70); i++) { + if ((gObjects70[i].obj.status == 1) && (fabsf(arg0->obj.pos.x - gObjects70[i].obj.pos.x) < 150.0f) && + (fabsf(arg0->obj.pos.y - gObjects70[i].obj.pos.y) < 150.0f) && + (fabsf(arg0->obj.pos.z - gObjects70[i].obj.pos.z) < 150.0f)) { + func_80070CEC(arg0); + break; + } + } + break; + case 0x28: + for (i = 0; i < ARRAY_COUNT(gObjects70); i++) { + if ((gObjects70[i].obj.status == 1) && (fabsf(arg0->obj.pos.x - gObjects70[i].obj.pos.x) < 300.0f) && + (fabsf(arg0->obj.pos.y - gObjects70[i].obj.pos.y) < 300.0f) && + (fabsf(arg0->obj.pos.z - gObjects70[i].obj.pos.z) < 300.0f)) { + func_80070CEC(arg0); + break; + } + } + break; + case 0x29: + if ((gObjects2F4[arg0->unk_074].obj.status != 2) || + ((gObjects2F4[arg0->unk_074].unk_110 < 0.0f) && (arg0->unk_0CE <= 0))) { + func_80070CEC(arg0); + } + break; + case 0x2A: + for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) { + if ((gObjects2F4[i].obj.status == 2) && (gObjects2F4[i].obj.id == OBJECT_200) && + (gObjects2F4[i].unk_084 != 0) && (i != arg0->unk_040) && + (arg0->unk_040 == gObjects2F4[i].unk_074)) { + return; + } + } + func_80070CEC(arg0); + break; + case 0x2B: + for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) { + if ((gObjects2F4[i].obj.status == 2) && (gObjects2F4[i].obj.id == OBJECT_200) && + (gObjects2F4[i].unk_084 != 0) && (i != arg0->unk_040) && + (arg0->unk_040 == gObjects2F4[i].unk_074)) { + func_80070CEC(arg0); + break; + } + } + break; + case 0x2C: + if (arg0->unk_0D0 != 0) { + func_80070CEC(arg0); + } + break; + case 0x2D: + var_v1_4 = 7; + switch (gCurrentLevel) { + case LEVEL_CORNERIA: + break; + case LEVEL_SECTOR_X: + var_v1_4 = 4; + break; + case LEVEL_TITANIA: + var_v1_4 = 9; + break; + } + if (((gCurrentLevel != LEVEL_CORNERIA) || (D_801778B0[1] > 0)) && (D_80177E80 >= var_v1_4)) { + func_80070CEC(arg0); + } + break; + case 0x2E: + for (i = 0, temp = gObjects2F4; i < ARRAY_COUNT(gObjects2F4); i++, temp++) { + if (((temp->obj.status == 3) || (temp->obj.status == 0)) && (arg0->unk_08C == temp->unk_08C) && + (temp->unk_090 != 0)) { + func_80070CEC(arg0); + } + } + break; + case 0x2F: + if (gChangedInput[D_80177AF8].button & R_CBUTTONS) { + func_8001AF40(0); + D_800CFF90 = 0; + D_80161690 = 0; + func_80070CEC(arg0); + } + break; + case 0x30: + if ((gPlayer[0].wings.rightState <= 1) || (gPlayer[0].wings.leftState <= 1)) { + func_80070CEC(arg0); + } + break; + case 0x31: + if (D_800D3180[1] != 0) { + func_80070CEC(arg0); + } + break; + case 0x32: + if (D_800D3180[0xE] != 0) { + func_80070CEC(arg0); + } + break; + case 0x33: + if (D_800D3180[2] != 0) { + func_80070CEC(arg0); + } + break; + case 0x34: + if (D_800D3180[0xC] != 0) { + func_80070CEC(arg0); + } + break; + case 0x35: + if (D_800D3180[0x11] != 0) { + func_80070CEC(arg0); + } + break; + case 0x36: + if (D_800D3180[5] != 0) { + func_80070CEC(arg0); + } + break; + case 0x37: + if (D_800D3180[0x10] != 0) { + func_80070CEC(arg0); + } + break; + case 0x38: + if (D_800D3180[7] != 0) { + func_80070CEC(arg0); + } + break; + case 0x39: + if (D_800D3180[0xB] != 0) { + func_80070CEC(arg0); + } + break; + case 0x3A: + if (D_800D3180[0xD] != 0) { + func_80070CEC(arg0); + } + break; + case 0x3B: + if (D_800D3180[8] != 0) { + func_80070CEC(arg0); + } + break; + case 0x3C: + if (D_800D3180[0x12] != 0) { + func_80070CEC(arg0); + } + break; + case 0x3D: + if (D_800D3180[3] != 0) { + func_80070CEC(arg0); + } + break; + case 0x3E: + if (D_80161670[arg0->unk_080] == 0) { + func_80070CEC(arg0); + } + break; + case 0x3F: + if (D_80161670[arg0->unk_080] != 0) { + func_80070CEC(arg0); + } + break; + case 0x40: + if (D_80161684 != 0) { + func_80070CEC(arg0); + } + break; + case 0x41: + if (gHitCount >= 30) { + func_80070CEC(arg0); + } + break; + case 0x42: + if (gHitCount >= 80) { + func_80070CEC(arg0); + } + break; + case 0x43: + if (gExpertMode != 0) { + func_80070CEC(arg0); + } + break; + } +} + +// could be in-function, but probably weren't +Vec3f D_800D0DD4[56] = { + { 158.0f, 256.0f, 1513.0f }, { 384.0f, 42.0f, 1187.0f }, { 284.0f, 129.0f, 769.0f }, + { 482.0f, 19.0f, 769.0f }, { 386.0f, 105.0f, 253.0f }, { 221.0f, 209.0f, 33.0f }, + { 78.0f, 263.0f, 637.0f }, { 78.0f, 263.0f, 76.0f }, { 18.0f, 263.0f, 1683.0f }, + { 106.0f, 98.0f, 1655.0f }, { 196.0f, -11.0f, 1365.0f }, { 104.0f, -175.0f, 1236.0f }, + { 313.0f, -175.0f, 972.0f }, { 456.0f, -132.0f, 695.0f }, { 157.0f, -360.0f, 904.0f }, + { 186.0f, -263.0f, 354.0f }, { 186.0f, -130.0f, 307.0f }, { 692.0f, 16.0f, 190.0f }, + { 337.0f, 120.0f, -297.0f }, { 337.0f, 373.0f, -242.0f }, { 240.0f, 359.0f, -611.0f }, + { 504.0f, 447.0f, -611.0f }, { 656.0f, 506.0f, -829.0f }, { 73.0f, 337.0f, -426.0f }, + { 73.0f, 548.0f, -411.0f }, { 65.0f, 391.0f, -1237.0f }, { 193.0f, 250.0f, -1026.0f }, + { 292.0f, 271.0f, -587.0f }, { -158.0f, 256.0f, 1513.0f }, { -384.0f, 42.0f, 1187.0f }, + { -284.0f, 129.0f, 769.0f }, { -482.0f, 19.0f, 769.0f }, { -386.0f, 105.0f, 253.0f }, + { -221.0f, 209.0f, 33.0f }, { -78.0f, 263.0f, 637.0f }, { -78.0f, 263.0f, 76.0f }, + { -18.0f, 263.0f, 1683.0f }, { -106.0f, 98.0f, 1655.0f }, { -196.0f, -11.0f, 1365.0f }, + { -104.0f, -175.0f, 1236.0f }, { -313.0f, -175.0f, 972.0f }, { -456.0f, -132.0f, 695.0f }, + { -157.0f, -360.0f, 904.0f }, { -186.0f, -263.0f, 354.0f }, { -186.0f, -130.0f, 307.0f }, + { -692.0f, 16.0f, 190.0f }, { -337.0f, 120.0f, -297.0f }, { -337.0f, 373.0f, -242.0f }, + { -240.0f, 359.0f, -611.0f }, { -504.0f, 447.0f, -611.0f }, { -656.0f, 506.0f, -829.0f }, + { -73.0f, 337.0f, -426.0f }, { -73.0f, 548.0f, -411.0f }, { -65.0f, 391.0f, -1237.0f }, + { -193.0f, 250.0f, -1026.0f }, { -292.0f, 271.0f, -587.0f }, +}; +Vec3f D_800D1074[24] = { + { 100.0f, 55.0f, 450.0f }, { 117.0f, 57.0f, 738.0f }, { 14.0f, 31.0f, 894.0f }, + { 204.0f, 0.0f, -72.0f }, { 204.0f, 33.0f, -253.0f }, { 344.0f, 0.0f, -295.0f }, + { 344.0f, -51.0f, -457.0f }, { 87.0f, 124.0f, -699.0f }, { 169.0f, -40.0f, -564.0f }, + { 113.0f, -147.0f, -367.0f }, { 112.0f, -146.0f, -13.0f }, { 69.0f, -118.0f, 158.0f }, + { -100.0f, 55.0f, 450.0f }, { -117.0f, 57.0f, 738.0f }, { -14.0f, 31.0f, 894.0f }, + { -204.0f, 0.0f, -72.0f }, { -204.0f, 33.0f, -253.0f }, { -344.0f, 0.0f, -295.0f }, + { -344.0f, -51.0f, -457.0f }, { -87.0f, 124.0f, -699.0f }, { -169.0f, -40.0f, -564.0f }, + { -113.0f, -147.0f, -367.0f }, { -112.0f, -146.0f, -13.0f }, { -69.0f, -118.0f, 158.0f }, +}; +Vec3f D_800D1194[21] = { + { 764.0f, 13.0f, 71.0f }, { 390.0f, 13.0f, 67.0f }, { 390.0f, 332.0f, 67.0f }, { 504.0f, 508.0f, 67.0f }, + { 251.0f, 508.0f, 67.0f }, { -35.0f, 341.0f, 67.0f }, { -35.0f, 673.0f, 67.0f }, { -354.0f, 594.0f, 67.0f }, + { -354.0f, 273.0f, 67.0f }, { -695.0f, 97.0f, 67.0f }, { -378.0f, -57.0f, 67.0f }, { -378.0f, -266.0f, 67.0f }, + { -475.0f, -518.0f, 67.0f }, { -255.0f, -518.0f, 67.0f }, { -112.0f, -375.0f, 67.0f }, { -46.0f, -628.0f, 67.0f }, + { -97.0f, -375.0f, 67.0f }, { 207.0f, -639.0f, 67.0f }, { 437.0f, -474.0f, 67.0f }, { 591.0f, -210.0f, 67.0f }, + { 453.0f, 420.0f, 67.0f }, +}; + +void func_80071DC0(Object_2F4* arg0) { + s32 rInd; + Vec3f sp38; + + Matrix_RotateY(gCalcMatrix, arg0->obj.rot.y * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, arg0->obj.rot.x * M_DTOR, 1); + Matrix_RotateZ(gCalcMatrix, arg0->obj.rot.z * M_DTOR, 1); + if (arg0->unk_0B4 == 30) { + rInd = Rand_ZeroOne() * (ARRAY_COUNT(D_800D1074) - 1.1f); // off by 1 error? + Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D1074[rInd], &sp38); + } + if (arg0->unk_0B4 == 17) { + rInd = Rand_ZeroOne() * (ARRAY_COUNT(D_800D0DD4) - 0.1f); + Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D0DD4[rInd], &sp38); + } + if (arg0->unk_0B4 == 31) { + rInd = Rand_ZeroOne() * (ARRAY_COUNT(D_800D1194) - 0.1f); + Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D1194[rInd], &sp38); + } + if (!(gFrameCount & 1)) { + func_8007C120(arg0->obj.pos.x + sp38.x, arg0->obj.pos.y + sp38.y, arg0->obj.pos.z + sp38.z, arg0->unk_0E8.x, + arg0->unk_0E8.y, arg0->unk_0E8.z, 0.3f, 0x14); + } + if (!(gFrameCount & 7)) { + func_8007BFFC(arg0->obj.pos.x + sp38.x, arg0->obj.pos.y + sp38.y, arg0->obj.pos.z + sp38.z, arg0->unk_0E8.x, + arg0->unk_0E8.y, arg0->unk_0E8.z, 10.0f, 9); + } + if (!(gFrameCount & 0xF)) { + func_80019218(0x2903B009, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + arg0->unk_0E8.y -= 0.1f; + arg0->unk_0E8.z = 0.0f; + arg0->obj.rot.x += 0.2f; + arg0->obj.rot.z += 0.3f; + if (!(gFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) { + arg0->unk_0C6 = 4; + } +} + +void func_800720E8(Object_2F4* arg0) { + switch (arg0->unk_046) { + case 0: + if (arg0->unk_0D0 != 0) { + if (arg0->unk_0D0 == 2) { + arg0->unk_0D6 = 3; + } + if ((arg0->unk_0D4 > 100) && (gObjects2F4[arg0->unk_0D4 - 101].unk_0B4 == 85)) { + arg0->unk_0D6 = 20; + } + arg0->unk_0CE -= arg0->unk_0D6; + arg0->unk_154 += 0.2f; + arg0->unk_0BC = 5; + if (arg0->unk_0BE < 20) { + arg0->unk_0BE += 5; + } + if (arg0->unk_0CE <= 0) { + arg0->unk_046 = 1; + arg0->unk_01C.unk_0C = SEGMENTED_TO_VIRTUAL(D_6032408); + func_80019218(0x1900000D, &arg0->unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } else { + func_80019218(0x2903300E, &arg0->unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + arg0->unk_0D0 = 0; + } + break; + case 1: + case 2: + Math_SmoothStepToF(&arg0->unk_154, 130.0f, 0.2f, 8.0f, 0.001f); + if (arg0->unk_154 > 45.0f) { + Math_SmoothStepToF(&arg0->unk_150, 90.0f, 0.2f, 10.0f, 0.001f); + } + break; + } +} + +void func_800722EC(Object_8C* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { + Vec3f sp2C; + Vec3f sp20; + + Object_8C_Initialize(arg0); + Matrix_RotateY(gCalcMatrix, M_DTOR * arg4, 0); + sp2C.x = 0.0f; + sp2C.y = 0.0f; + sp2C.z = 20.0f; + Matrix_MultVec3f(gCalcMatrix, &sp2C, &sp20); + arg0->unk_54.x = sp20.x; + arg0->obj.status = 1; + arg0->obj.id = OBJECT_365; + arg0->obj.pos.x = arg1; + arg0->obj.pos.y = arg2; + arg0->obj.pos.z = arg3; + arg0->unk_44 = 250; + arg0->unk_70 = 2.0f; + arg0->unk_6C = (Rand_ZeroOne() - 0.5f) * 200.0f; + arg0->obj.rot.z = Rand_ZeroOne() * 360.0f; + arg0->unk_4C = arg0->unk_4E = 1; + func_800612B8(&arg0->unk_1C, arg0->obj.id); +} + +void func_8007240C(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { + s32 i; + + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + func_800722EC(&gObjects8C[i], arg0, arg1, arg2, arg3); + break; + } + } +} + +void func_80072474(Object_2F4* arg0) { + f32 var_fv1; + if (arg0->unk_048 != 0) { + switch (arg0->unk_048) { + case 1: + arg0->unk_154 = 45.0f; + break; + case 2: + arg0->unk_154 = 0.0f; + break; + case 3: + arg0->unk_08C = 1; + break; + case 4: + arg0->unk_08C = 0; + break; + } + arg0->unk_048 = 0; + } + if (arg0->unk_08C != 0) { + var_fv1 = + Math_RadToDeg(Math_Atan2F(gPlayer[0].unk_074 - arg0->obj.pos.x, gPlayer[0].unk_138 - arg0->obj.pos.z)); + } else if (arg0->unk_068 != 0) { + var_fv1 = arg0->unk_0F4.y; + } else { + var_fv1 = 0.0f; + } + Math_SmoothStepToAngle(&arg0->obj.rot.y, var_fv1, 0.2f, 3.0f, 0.0f); + Math_SmoothStepToAngle(&arg0->unk_150, arg0->unk_154, 0.5f, 8.0f, 0.0f); +} + +Vec3f D_800D1290 = { 0.0f, 837.00006f, 0.0f }; // could be in-function +void func_80072594(Object_2F4* arg0) { + s32 spFC; + f32 var_fv0; + s32 var_s0; + f32 spF0; + f32 spEC; + f32 spE8; + f32 spE4; + f32 spE0; + f32 spDC; + f32 spD8; + f32 spD4; + s32 pad; + f32 spCC; + f32 spC8; + f32 spC4; + Vec3f spB8; + Vec3f spAC; + Vec3f spA0; + + spDC = 0.0f; + spD8 = 0.0f; + spD4 = 0.0f; + if ((gPlayer->unk_1C8 == 7) || (D_8017828C != 0)) { + Object_Kill(&arg0->obj, &arg0->unk_100); + return; + } + if (arg0->unk_0B8 == 0x3E8) { + arg0->obj.rot.y += arg0->unk_150; + arg0->obj.rot.x += arg0->unk_154; + if (!(gFrameCount & 0xF)) { + func_8007C120(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_0E8.x, arg0->unk_0E8.y, + arg0->unk_0E8.z, 0.3f, 0xA); + } + } else { + if (((arg0->unk_0B4 == 0x11) || (arg0->unk_0B4 == 0x1E) || (arg0->unk_0B4 == 0x1F)) && (arg0->unk_0CE <= 0)) { + func_80071DC0(arg0); + return; + } + if (arg0->unk_0B4 == 300) { + gPlayer->unk_1A4 = arg0->unk_040; + arg0->unk_0C2 = 100; + } else if (arg0->unk_0B4 >= 200) { + arg0->unk_04E++; + if (arg0->unk_04E >= 100) { + arg0->unk_04E = 0; + } + D_80176558[arg0->unk_046][arg0->unk_04E] = arg0->obj.pos.x; + D_80176878[arg0->unk_046][arg0->unk_04E] = arg0->obj.pos.y; + D_80176B98[arg0->unk_046][arg0->unk_04E] = arg0->obj.pos.z; + D_80176EB8[arg0->unk_046][arg0->unk_04E] = arg0->obj.rot.x; + D_801771D8[arg0->unk_046][arg0->unk_04E] = arg0->obj.rot.y; + D_80177500[arg0->unk_046][arg0->unk_04E] = arg0->obj.rot.z; + if (arg0->unk_0D0 != 0) { + arg0->unk_0D0 = 0; + arg0->unk_0C6 = 20; + arg0->unk_0CE -= arg0->unk_0D6; + func_80019218(0x29034041, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + if (arg0->unk_0CE <= 0) { + arg0->unk_0C6 = 200; + arg0->obj.status = 3; + func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 8.0f); + arg0->obj.status = 3; + arg0->unk_0BC = 20; + arg0->obj.id = OBJECT_194; + } + } + } + if ((arg0->unk_0B4 == 0x1B) && (arg0->unk_0C2 != 0)) { + arg0->unk_0B8 = 0; + } + + switch (arg0->unk_0B8) { + case 0x0: + func_8006D36C(arg0); + break; + case 0x1: + if (arg0->unk_0BC == 0) { + func_8006D36C(arg0); + } + break; + case 0x6: + case 0x7: + case 0xE: + case 0xF: + spF0 = arg0->obj.pos.x; + spEC = arg0->obj.pos.y; + spE8 = arg0->obj.pos.z; + if ((arg0->unk_0B4 == 0x21) || (arg0->unk_0B4 == 0x44)) { + Matrix_RotateZ(gCalcMatrix, -(arg0->unk_2E8.z + arg0->unk_0F4.z) * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, -arg0->unk_2E8.x * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, -arg0->unk_2E8.y * M_DTOR, 1); + if ((arg0->unk_0B8 == 0xE) || (arg0->unk_0B8 == 0xF)) { + spB8.x = gPlayer->unk_040.x - spF0; + spB8.y = gPlayer->unk_040.y - (spEC + 25.0f); + spB8.z = (gPlayer->unk_040.z * 15.0f) - spE8; + } else { + spB8.x = gPlayer->unk_074 - spF0; + spB8.y = gPlayer->unk_078 - (spEC + 25.0f); + spB8.z = (gPlayer->unk_0C0.z * 15.0f) + gPlayer->unk_07C - spE8; + } + Matrix_MultVec3fNoTranslate(gCalcMatrix, &spB8, &spAC); + spE0 = Math_RadToDeg(Math_Atan2F(spAC.x, spAC.z)); + spE4 = Math_RadToDeg(-Math_Atan2F(spAC.y, sqrtf(SQ(spAC.x) + SQ(spAC.z)))); + spFC = 0; + if ((spE4 < 305.0f) && (spE4 >= 180.0f)) { + spE4 = 305.0f; + spFC++; + } + if ((spE4 > 30.0f) && (spE4 <= 180.0f)) { + spE4 = 30.0f; + spFC++; + } + arg0->obj.rot.x = 0.0f; + Math_SmoothStepToAngle(&arg0->obj.rot.y, spE0, 0.2f, arg0->unk_174, 0.001f); + Math_SmoothStepToAngle(&arg0->unk_150, spE4, 0.2f, arg0->unk_174, 0.001f); + if (!(arg0->unk_0BC & 0x1F) && (spFC == 0)) { + Matrix_RotateY(gCalcMatrix, arg0->unk_2E8.y * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, arg0->unk_2E8.x * M_DTOR, 1); + Matrix_RotateZ(gCalcMatrix, (arg0->unk_2E8.z + arg0->unk_0F4.z) * M_DTOR, 1); + spB8.x = 0.0f; + spB8.y = 25.0f; + spB8.z = 0.0f; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &spB8, &spA0); + Matrix_RotateY(gCalcMatrix, arg0->obj.rot.y * M_DTOR, 1); + Matrix_RotateX(gCalcMatrix, arg0->unk_150 * M_DTOR, 1); + spB8.x = 0.0f; + spB8.y = 0.0f; + spB8.z = D_80177828; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &spB8, &spAC); + if (arg0->unk_0B4 == 0x44) { + var_fv0 = 80.0f; + } else { + var_fv0 = 0.0f; + } + func_8007F04C(OBJECT_353, arg0->obj.pos.x + spAC.x + spA0.x, + arg0->obj.pos.y + spAC.y + spA0.y + var_fv0, arg0->obj.pos.z + spAC.z + spA0.z, + arg0->unk_150, arg0->obj.rot.y, arg0->obj.rot.z, arg0->unk_2E8.x, arg0->unk_2E8.y, + arg0->unk_2E8.z + arg0->unk_0F4.z, spAC.x, spAC.y, spAC.z, 1.0f); + arg0->unk_154 = -15.0f; + } + } else { + if ((arg0->unk_0B8 == 0xE) || (arg0->unk_0B8 == 0xF)) { + spCC = gPlayer->unk_040.x; + spC8 = gPlayer->unk_040.y; + spC4 = gPlayer->unk_040.z; + } else { + spCC = gPlayer->unk_074; + spC8 = gPlayer->unk_078; + spC4 = gPlayer->unk_07C; + } + Math_SmoothStepToAngle(&arg0->unk_2E8.z, 0.0f, 0.1f, 5.0f, 0.0001f); + Math_SmoothStepToAngle(&arg0->unk_0F4.z, 0.0f, 0.1f, 5.0f, 0.0001f); + spE0 = Math_RadToDeg(Math_Atan2F(spCC - spF0, spC4 - spE8)); + if ((arg0->unk_0B8 == 7) || (arg0->unk_0B8 == 0xF)) { + spE0 += 180.0f; + if (spE0 > 360.0f) { + spE0 -= 360.0f; + } + } + spE4 = Math_RadToDeg(-Math_Atan2F(spC8 - spEC, sqrtf(SQ(spCC - spF0) + SQ(spC4 - spE8)))); + spEC = Math_SmoothStepToAngle(&arg0->unk_0F4.y, spE0, 0.2f, arg0->unk_174, 0.0001f); + Math_SmoothStepToAngle(&arg0->unk_0F4.x, spE4, 0.2f, arg0->unk_174, 0.0001f); + if (arg0->unk_068 != 0) { + var_fv0 = 330.0f; + if (spEC < 0.0f) { + var_fv0 = 30.0f; + } + Math_SmoothStepToAngle(&arg0->unk_170, var_fv0, 0.1f, 5.0f, 0.01f); + } + } + if (arg0->unk_0BC == 0) { + func_8006D36C(arg0); + } + break; + case 0xD: + spDC = __sinf(((arg0->unk_040 * 0x2D) + gFrameCount) * M_DTOR) * arg0[0].unk_158; + spD8 = __cosf(((arg0->unk_040 * 0x2D) + (gFrameCount * 2)) * M_DTOR) * arg0[0].unk_158; + pad = arg0->unk_054; + pad = gObjects2F4[pad].unk_080; + D_80161670[pad] = 5; + /* fallthrough */ + case 0x8: + case 0x9: + spF0 = arg0->obj.pos.x; + spEC = arg0->obj.pos.y; + spE8 = arg0->obj.pos.z; + spE0 = Math_RadToDeg(Math_Atan2F(gObjects2F4[arg0->unk_054].obj.pos.x + spDC - spF0, + gObjects2F4[arg0->unk_054].obj.pos.z + spD4 - spE8)); + if (arg0->unk_0B8 == 7) { + spE0 += 180.0f; + if (spE0 > 360.0f) { + spE0 -= 360.0f; + } + } + spE4 = Math_RadToDeg(-Math_Atan2F(gObjects2F4[arg0->unk_054].obj.pos.y + spD8 - spEC, + sqrtf(SQ(gObjects2F4[arg0->unk_054].obj.pos.x + spDC - spF0) + + SQ(gObjects2F4[arg0->unk_054].obj.pos.z + spD4 - spE8)))); + spEC = Math_SmoothStepToAngle(&arg0->unk_0F4.y, spE0, 0.2f, arg0->unk_174, 0.0001f); + Math_SmoothStepToAngle(&arg0->unk_0F4.x, spE4, 0.2f, arg0->unk_174, 0.0001f); + if (arg0->unk_068 != 0) { + var_fv0 = 310.0f; + if (spEC < 0.0f) { + var_fv0 = 50.0f; + } + Math_SmoothStepToAngle(&arg0->unk_170, var_fv0, 0.1f, 5.0f, 0.01f); + } + if (arg0->unk_0BC == 0) { + func_8006D36C(arg0); + } + break; + case 0x2: + arg0->unk_0F4.x += arg0->unk_120; + arg0->unk_11C -= arg0->unk_120; + if (arg0->unk_11C <= 0.0f) { + func_8006D36C(arg0); + } + break; + case 0x3: + arg0->unk_0F4.x -= arg0->unk_120; + arg0->unk_11C -= arg0->unk_120; + if (arg0->unk_11C <= 0.0f) { + func_8006D36C(arg0); + } + break; + case 0x4: + arg0->unk_0F4.y += arg0->unk_120; + arg0->unk_11C -= arg0->unk_120; + if (arg0->unk_11C <= 0.0f) { + func_8006D36C(arg0); + } + break; + case 0x5: + arg0->unk_0F4.y -= arg0->unk_120; + arg0->unk_11C -= arg0->unk_120; + if (arg0->unk_11C <= 0.0f) { + func_8006D36C(arg0); + } + break; + case 0xA: + var_s0 = 0; + if (Math_SmoothStepToAngle(&arg0->obj.rot.x, 0.0f, 0.3f, 10.0f, 1.0f) == 0.0f) { + var_s0++; + } + if (Math_SmoothStepToAngle(&arg0->obj.rot.y, 0.0f, 0.3f, 10.0f, 1.0f) == 0.0f) { + var_s0++; + } + if (Math_SmoothStepToF(&arg0->unk_150, 40.0f, 0.3f, 10.0f, 1.0f) == 0.0f) { + var_s0++; + } + if (var_s0 == 3) { + arg0->unk_01C.unk_0C = SEGMENTED_TO_VIRTUAL(D_602F638); + func_8006D36C(arg0); + } + break; + case 0xB: + if (Math_SmoothStepToF(&arg0->unk_150, 0.0f, 0.3f, 10.0f, 1.0f) == 0.0f) { + func_8006D36C(arg0); + } + break; + case 0xC: + Math_SmoothStepToAngle(&arg0->unk_0F4.x, 270.0f, 0.1f, 2.0f, 0.0f); + D_801778B0[arg0->unk_080] = -1; + D_80177910[arg0->unk_080] = 0; + break; + case 200: + break; + } + if (arg0->unk_084 != 0) { + if (gObjects2F4[arg0->unk_074].obj.status != 2) { + arg0->unk_084 = 0; + } else { + Matrix_RotateY(gCalcMatrix, gObjects2F4[arg0->unk_074].obj.rot.y * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, gObjects2F4[arg0->unk_074].obj.rot.x * M_DTOR, 1); + Matrix_RotateZ(gCalcMatrix, gObjects2F4[arg0->unk_074].obj.rot.z * M_DTOR, 1); + Matrix_MultVec3fNoTranslate(gCalcMatrix, &arg0->unk_2DC, &spAC); + arg0->obj.pos.x = gObjects2F4[arg0->unk_074].obj.pos.x + spAC.x; + arg0->obj.pos.y = gObjects2F4[arg0->unk_074].obj.pos.y + spAC.y; + arg0->obj.pos.z = gObjects2F4[arg0->unk_074].obj.pos.z + spAC.z; + arg0->unk_2E8.x = gObjects2F4[arg0->unk_074].obj.rot.x; + arg0->unk_2E8.y = gObjects2F4[arg0->unk_074].obj.rot.y; + arg0->unk_2E8.z = gObjects2F4[arg0->unk_074].obj.rot.z; + if (arg0->unk_0C0 == 0) { + arg0->unk_084 = 0; + } + } + } + Math_SmoothStepToF(&arg0->unk_114, arg0->unk_118, 0.1f, 5.0f, 0.0001f); + if (arg0->unk_0F4.x >= 360.0f) { + arg0->unk_0F4.x -= 360.0f; + } + if (arg0->unk_0F4.x < 0.0f) { + arg0->unk_0F4.x += 360.0f; + } + if (arg0->unk_0F4.y >= 360.0f) { + arg0->unk_0F4.y -= 360.0f; + } + if (arg0->unk_0F4.y < 0.0f) { + arg0->unk_0F4.y += 360.0f; + } + if (arg0->unk_068 != 0) { + if ((D_80177880 == 2) && (arg0->unk_0B4 == 0xC8)) { + Math_SmoothStepToAngle(&arg0->obj.rot.x, arg0->unk_0F4.x, 0.1f, 10.0f, 0.00001f); + Math_SmoothStepToAngle(&arg0->obj.rot.y, arg0->unk_0F4.y, 0.1f, 10.0f, 0.00001f); + } else { + Math_SmoothStepToAngle(&arg0->obj.rot.x, arg0->unk_0F4.x, 0.2f, 100.0f, 0.00001f); + Math_SmoothStepToAngle(&arg0->obj.rot.y, arg0->unk_0F4.y, 0.2f, 100.0f, 0.00001f); + } + } + if (arg0->unk_124.x > 0.0f) { + arg0->unk_124.x -= arg0->unk_124.y; + arg0->obj.rot.x += arg0->unk_124.y * arg0->unk_124.z; + if (arg0->obj.rot.x >= 360.0f) { + arg0->obj.rot.x -= 360.0f; + } + if (arg0->obj.rot.x < 0.0f) { + arg0->obj.rot.x += 360.0f; + } + } + if (arg0->unk_130 > 0.0f) { + arg0->unk_130 -= arg0->unk_134; + arg0->obj.rot.y += arg0->unk_134 * arg0->unk_138; + if (arg0->obj.rot.y >= 360.0f) { + arg0->obj.rot.y = arg0->obj.rot.y - 360.0f; + } + if (arg0->obj.rot.y < 0.0f) { + arg0->obj.rot.y += 360.0f; + } + } + if (arg0->unk_13C > 0.0f) { + if ((arg0->unk_0B4 == 0xD) || (arg0->unk_0B4 == 0xE) || (arg0->unk_0B4 == 0x3D) || + (arg0->unk_0B4 == 0x3E) || (arg0->unk_0B4 == 0x3F) || (arg0->unk_0B4 == 0x40) || + (arg0->unk_0B4 == 0x41) || (arg0->unk_0B4 == 0x42) || (arg0->unk_0B4 == 0x5E) || + (arg0->unk_0B4 == 0x5F) || (arg0->unk_0B4 == 0x61)) { + arg0->obj.rot.y -= arg0->unk_140 * arg0->unk_144; + arg0->obj.rot.x += arg0->unk_140 * arg0->unk_144; + } else { + arg0->unk_13C -= arg0->unk_140; + arg0->unk_170 += arg0->unk_140 * arg0->unk_144; + } + } + if (arg0->unk_170 >= 360.0f) { + arg0->unk_170 -= 360.0f; + } + if (arg0->unk_170 < 0.0f) { + arg0->unk_170 += 360.0f; + } + Math_SmoothStepToAngle(&arg0->obj.rot.z, arg0->unk_170, 0.2f, 100.0f, 0.0001f); + Matrix_RotateZ(gCalcMatrix, (arg0->unk_2E8.z + arg0->unk_0F4.z) * M_DTOR, 0); + Matrix_RotateY(gCalcMatrix, arg0->unk_0F4.y * M_DTOR, 1); + Matrix_RotateX(gCalcMatrix, arg0->unk_0F4.x * M_DTOR, 1); + spB8.x = 0.0f; + spB8.y = 0.0f; + spB8.z = arg0->unk_114; + Matrix_MultVec3fNoTranslate(gCalcMatrix, &spB8, &spAC); + arg0->unk_0E8.x = arg0->unk_148 + spAC.x; + arg0->unk_0E8.y = arg0->unk_14C + spAC.y; + arg0->unk_0E8.z = spAC.z; + arg0->unk_148 -= arg0->unk_148 * 0.1f; + arg0->unk_14C -= arg0->unk_14C * 0.1f; + if (arg0->unk_064 == 0x80) { + arg0->unk_0E8.z -= arg0->unk_16C; + if ((gCurrentLevel == 5) && (D_80177D08 < 0.0f)) { + arg0->unk_0E8.z -= D_80177D08; + } + } + if (arg0->unk_064 == 0x100) { + arg0->unk_0E8.z -= D_80177D08; + } + if (gPlayer->unk_1C8 == 8) { + arg0->unk_0E8.z = 100.0f; + } + func_80070D44(arg0); + func_8006F40C(arg0); + func_8006EA50(arg0); + if (arg0->unk_0B4 == 0x26) { + func_800720E8(arg0); + } else { + if (arg0->unk_110 <= -1.999f) { + func_80070BA8(arg0); + } else { + if ((arg0->unk_0D0 == 1) && (arg0->unk_110 < 0.5f) && (arg0->unk_0B4 != 0x30) && + (arg0->unk_0B4 != 0x31) && (arg0->unk_0B4 != 0x32)) { + arg0->unk_0D0 = 0; + if (gCurrentLevel == 1) { + func_80019218(0x2902107D, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } else { + func_80019218(0x29121007, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + } + if ((arg0->unk_0B4 < 0xC8) && (arg0->unk_0B4 != 0x4E) && (arg0->unk_110 >= 0.5f)) { + switch (arg0->unk_0B4) { + case 0x47: + func_8006FE28(arg0); + break; + case 0x4F: + func_8006FEEC(arg0); + break; + default: + func_800701E0(arg0); + break; + } + } + } + } + switch (arg0->unk_0B4) { + case 0x5C: + case 0x5D: + case 0x5E: + case 0x5F: + case 0x60: + if (!(gFrameCount & 7)) { + arg0->unk_15C = Rand_ZeroOne() * 255.0f; + arg0->unk_160 = Rand_ZeroOne() * 255.0f; + arg0->unk_164 = Rand_ZeroOne() * 255.0f; + } + Math_SmoothStepToF(&arg0->unk_150, arg0->unk_15C, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&arg0->unk_154, arg0->unk_160, 1.0f, 10.0f, 0.0f); + Math_SmoothStepToF(&arg0->unk_158, arg0->unk_164, 1.0f, 10.0f, 0.0f); + break; + case 0x2E: + if (func_800A73E4(&spEC, &spFC, arg0->obj.pos.x, -100.0f, arg0->obj.pos.z) != 0) { + spF0 = 10.0f; + if (Math_SmoothStepToF(&arg0->obj.pos.y, spEC, 0.5f, 7.0f, 0.0f) >= 0.0f) { + spF0 = 350.0f; + if (!(gFrameCount & 3)) { + func_8007240C(arg0->obj.pos.x, spEC, arg0->obj.pos.z, arg0->obj.rot.y); + func_80019218(0x19800017, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + } + } + Math_SmoothStepToAngle(&arg0->obj.rot.x, spF0, 0.1f, 1.0f, 0.0f); + if ((arg0->unk_0B8 == 4) || (arg0->unk_0B8 == 5)) { + var_fv0 = arg0->unk_120 * 20.0f; + if (arg0->unk_0B8 == 4) { + var_fv0 *= -1.0f; + } + Math_SmoothStepToAngle(&arg0->obj.rot.z, var_fv0, 0.1f, 3.0f, 0.0f); + } + } + arg0->obj.rot.y = arg0->unk_0F4.y; + break; + case 0x1F: + arg0->obj.rot.z = (f32) gFrameCount; + break; + case 0x15: + case 0x16: + arg0->obj.rot.z = (f32) gFrameCount * 3.0f; + break; + case 0x3: + arg0->unk_0C9 = 1; + arg0->obj.rot.y -= 10.0f; + break; + case 0x6: + arg0->unk_0B6++; + if (gCurrentLevel == 7) { + if (arg0->unk_0B6 >= Animation_GetFrameCount(&D_600636C)) { + arg0->unk_0B6 = 0; + } + if (((s32) gFrameCount % 3) == 0) { + func_E16C50_8019E9F4(arg0->obj.pos.x, arg0->obj.pos.y - 20, arg0->obj.pos.z - 180.0f, 0.0f, + Rand_ZeroOne() * 20.0f * -1.0f, 0.0f, 4.0f, 2); + } + } else if (arg0->unk_0B6 >= Animation_GetFrameCount(&D_40057AC)) { + arg0->unk_0B6 = 0; + } + break; + case 0x9: + arg0->unk_0B6++; + if (arg0->unk_0B6 >= Animation_GetFrameCount(&D_40001A4)) { + arg0->unk_0B6 = 0; + } + if (arg0->unk_068 == 0) { + arg0->obj.rot.y = 0.0f; + } + break; + case 0x30: + case 0x31: + case 0x32: + func_E9F1D0_801A3BD4(arg0); + break; + case 0x34: + func_80072474(arg0); + break; + case 0x4E: + func_8006753C(arg0); + break; + case 0x4F: + if (arg0->unk_0C4 == 0) { + arg0->unk_0B6 += 1; + if (Animation_GetFrameCount(&D_600E5EC) < arg0->unk_0B6) { + arg0->unk_0B6 = 0; + } + } + break; + case 0x50: { + Object_8C* temp_v0_8; + Vec3f sp90; + Vec3f sp84; + Vec3f sp78; + s32 sp74; + + switch (arg0->unk_046) { + case 1: + break; + case 0: + Matrix_RotateZ(gCalcMatrix, arg0->unk_0F4.z * M_DTOR, 0); + Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D1290, &sp90); + if ((arg0->obj.pos.y + sp90.y) > -30.0f) { + for (sp74 = 0; sp74 < 7; sp74++) { + temp_v0_8 = func_8007783C(OBJECT_394); + if (temp_v0_8 != NULL) { + temp_v0_8->unk_78 = temp_v0_8->unk_7A = 12; + temp_v0_8->obj.status = 2; + temp_v0_8->obj.pos.x = arg0->obj.pos.x + sp90.x; + temp_v0_8->obj.pos.y = arg0->obj.pos.y + sp90.y; + temp_v0_8->obj.pos.z = arg0->obj.pos.z; + temp_v0_8->obj.rot.x = Rand_ZeroOne() * 360.0f; + temp_v0_8->obj.rot.y = Rand_ZeroOne() * 360.0f; + temp_v0_8->obj.rot.z = Rand_ZeroOne() * 360.0f; + sp84.x = (Rand_ZeroOne() * 25.0f) + 30.0f; + sp84.y = (Rand_ZeroOne() * 25.0f) + 20.0f; + sp84.z = 0.0f; + temp_v0_8->unk_44 = 10; + temp_v0_8->unk_70 = 1.0f; + Matrix_RotateY(gCalcMatrix, ((Rand_ZeroOne() * 180.0f) + 180.0f) * M_DTOR, 0); + Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp84, &sp78); + temp_v0_8->unk_54.x = sp78.x; + temp_v0_8->unk_54.y = sp78.y; + temp_v0_8->unk_54.z = sp78.z; + temp_v0_8->unk_60.x = (Rand_ZeroOne() - 0.5f) + 5.0f; + temp_v0_8->unk_60.y = (Rand_ZeroOne() - 0.5f) + 5.0f; + temp_v0_8->unk_60.z = (Rand_ZeroOne() - 0.5f) + 5.0f; + } + } + arg0->unk_046++; + } + break; + } + if ((fabsf(arg0->unk_114) > 10.0f) && !(gFrameCount & 1)) { + temp_v0_8 = func_8007783C(OBJECT_394); + if (temp_v0_8 != NULL) { + Matrix_RotateZ(gCalcMatrix, arg0->unk_0F4.z * M_DTOR, 0); + Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D1290, &sp90); + temp_v0_8->unk_78 = temp_v0_8->unk_7A = 0xB; + temp_v0_8->obj.status = 2; + temp_v0_8->obj.pos.x = ((Rand_ZeroOne() - 0.5f) * 3.0f) + arg0->obj.pos.x + sp90.x; + temp_v0_8->obj.pos.y = ((Rand_ZeroOne() - 0.5f) * 3.0f) + arg0->obj.pos.y + sp90.y; + temp_v0_8->obj.pos.z = ((Rand_ZeroOne() - 0.5f) * 3.0f) + arg0->obj.pos.z + 180.0f; + temp_v0_8->unk_70 = 9.0f; + temp_v0_8->obj.rot.z = Rand_ZeroOne() * 360.0f; + temp_v0_8->unk_54.x = (Rand_ZeroOne() - 0.5f) * 5.0f; + temp_v0_8->unk_54.y = (Rand_ZeroOne() - 0.5f) * 3.0f + 30.0f; + temp_v0_8->unk_44 = 100; + temp_v0_8->unk_46 = -8; + temp_v0_8->unk_60.z = 3; + if (Rand_ZeroOne() < 0.5f) { + temp_v0_8->unk_60.z = -temp_v0_8->unk_60.z; + } + if (gFrameCount & 2) { + temp_v0_8->unk_54.y = -temp_v0_8->unk_54.y; + } + } + if (!(gFrameCount & 3)) { + temp_v0_8 = func_8007783C(OBJECT_394); + if (temp_v0_8 != NULL) { + temp_v0_8->unk_78 = temp_v0_8->unk_7A = 0xB; + temp_v0_8->obj.status = 2; + temp_v0_8->obj.pos.x = ((Rand_ZeroOne() - 0.5f) * 3.0f) + arg0->obj.pos.x; + temp_v0_8->obj.pos.y = ((Rand_ZeroOne() - 0.5f) * 5.0f) + arg0->obj.pos.y + 50.0f; + temp_v0_8->obj.pos.z = ((Rand_ZeroOne() - 0.5f) * 3.0f) + arg0->obj.pos.z + 200.0f; + temp_v0_8->unk_70 = 9.0f; + temp_v0_8->obj.rot.z = Rand_ZeroOne() * 360.0f; + temp_v0_8->unk_54.x = (Rand_ZeroOne() - 0.5f) * 5.0f; + temp_v0_8->unk_54.y = (Rand_ZeroOne() - 0.5f) * 3.0f + 10.0f; + temp_v0_8->unk_44 = 100; + temp_v0_8->unk_46 = -8; + temp_v0_8->unk_60.z = 3; + if (Rand_ZeroOne() < 0.5f) { + temp_v0_8->unk_60.z = -temp_v0_8->unk_60.z; + } + if (gFrameCount & 4) { + temp_v0_8->unk_54.y = -temp_v0_8->unk_54.y; + } + } + } + } + } break; + case 0x51: + Math_SmoothStepToF(&arg0->unk_150, 1.0f, 0.1f, 0.1f, 0.001f); + if (arg0->unk_150 > 0.5f) { + arg0->unk_01C.unk_0C = SEGMENTED_TO_VIRTUAL(D_601B4C4); + } + if (arg0->unk_046 == 0) { + arg0->unk_154 += 4.0f; + if (arg0->unk_154 >= 100.0f) { + arg0->unk_046 = 1; + arg0->unk_154 = 100.0f; + } + } else { + arg0->unk_154 -= 4.0f; + if (arg0->unk_154 <= 0.0f) { + arg0->unk_046 = 0; + arg0->unk_154 = 0.0f; + } + } + break; + case 0x53: + if (arg0->unk_0CE <= 0) { + if (arg0->unk_0B6 == 0x14) { + spD4 = arg0->obj.pos.z; + spD8 = arg0->obj.pos.y; + + arg0->obj.pos.y += 80.0f; + arg0->obj.pos.z += 40.0f; + func_80066254(arg0); + arg0->obj.pos.y = spD8; + arg0->obj.pos.z = spD4; + } + if ((arg0->unk_0B6 >= 0x12) && (arg0->unk_0B6 < 0x18)) { + func_8007BC7C(arg0->obj.pos.x, arg0->obj.pos.y + 80.0f, arg0->obj.pos.z + 60.0f, 20.0f); + } + if (arg0->unk_0B6 < 49) { + arg0->unk_0B6++; + if (arg0->unk_0B6 >= 49) { + arg0->unk_0B6 = 49; + } + if (gFrameCount & 1) { + func_E16C50_801AC8A8(((Rand_ZeroOne() - 0.5f) * 100.0f) + arg0->obj.pos.x, + (Rand_ZeroOne() * 50.0f) + arg0->obj.pos.y, + ((Rand_ZeroOne() - 0.5f) * 100.0f) + arg0->obj.pos.z, 1.0f, 0); + } + } + arg0->unk_0C2 = 10000; + } + break; + case 0x58: + if (arg0->unk_04A == 0) { + arg0->unk_046 += 4; + if (arg0->unk_046 >= 0xFF) { + arg0->unk_046 = 0xFF; + arg0->unk_04A = 1; + } + } else { + arg0->unk_046 -= 4; + if (arg0->unk_046 <= 0) { + arg0->unk_046 = 0; + arg0->unk_04A = 0; + } + } + break; + case 0x67: + case 0x68: + func_80187530(arg0); + break; + case 0x6A: + arg0->unk_0B6 += 1; + if (arg0->unk_0B6 >= 6) { + arg0->unk_0B6 = 0; + } + break; + } + if (D_80177880 == 1) { + D_80177F24[arg0->unk_040] = arg0->obj.pos.x; + D_8017802C[arg0->unk_040] = arg0->obj.pos.z; + D_80178134[arg0->unk_040] = Math_ModF(arg0->unk_0F4.y, 360.0f) + 180.0f; + D_80178238[arg0->unk_040 + 1] = 1; + } + } +} + +UNK_TYPE D_800D129C[0x8C] = { 0 }; // unused + +bool func_80074BFC(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg42) { + Object_2F4* arg4 = arg42; + + if (arg0 == 1) { + arg2->x += arg4->unk_154; + } + if (arg0 == 2) { + arg3->z -= arg4->unk_150; + } + return false; +} + +bool func_80074C44(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg42) { + Object_2F4* arg4 = arg42; + s32 var_s1; + + if (arg0 == 5) { + var_s1 = (s32) (arg4->unk_0CE * 0.6375f); + if (var_s1 > 255) { + var_s1 = 255; + } + if (var_s1 < 0) { + var_s1 = 1.0f / 70.925f; + } + Matrix_Translate(gCalcMatrix, arg2->x, arg2->y, arg2->z, 1); + Matrix_RotateZ(gCalcMatrix, arg3->z * M_DTOR, 1); + Matrix_RotateY(gCalcMatrix, arg3->y * M_DTOR, 1); + Matrix_RotateX(gCalcMatrix, arg3->x * M_DTOR, 1); + Matrix_Mult(gGfxMatrix, gCalcMatrix, 1); + Matrix_SetGfxMtx(&gMasterDisp); + if (*arg1 != NULL) { + RCP_SetupDL(&gMasterDisp, 0x22); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, var_s1, var_s1, 255); + gSPDisplayList(gMasterDisp++, *arg1); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); + } + return true; + } + return false; +} + +void func_80074E3C(Object_2F4* arg0) { + Vec3f sp30[10]; + + Animation_GetFrameData(&D_6013820, 0, sp30); + sp30[6].y += arg0->unk_150; + sp30[5].z += arg0->unk_154 + ((arg0->unk_0BE >> 2) & 1); + sp30[4].z -= arg0->unk_154 + ((arg0->unk_0BE >> 2) & 1); + Animation_DrawSkeleton(1, D_601390C, sp30, func_80074C44, NULL, arg0, &gIdentityMatrix); +} + +bool func_80074F04(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { + + gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN); + if ((arg0 == 3) || (arg0 == 5)) { + gSPTexture(gMasterDisp++, 5000, 5000, 0, G_TX_RENDERTILE, G_ON); + gSPSetGeometryMode(gMasterDisp++, G_TEXTURE_GEN); + } + return false; +} + +s32 func_80074F90(Object_80* arg0) { + RCP_SetupDL(&gMasterDisp, 0x3C); + gSPDisplayList(gMasterDisp++, D_601AD70); + RCP_SetupDL(&gMasterDisp, 0x40); + return 0; +} + +void func_80074FF0(Object_2F4* arg0) { + Vec3f sp114[31]; + f32 sp40; + s16 temp_s0; + s32 pad; + + if (arg0->unk_0C6 && (arg0->unk_0B4 != 0x5A) && (arg0->unk_0B4 != 0x44) && (arg0->unk_0B4 != 0x48)) { + if ((arg0->unk_0B4 != 0xD) && (arg0->unk_0B4 != 0xE) && (arg0->unk_0B4 != 0x3D) && (arg0->unk_0B4 != 0x3E) && + (arg0->unk_0B4 != 0x53) && (arg0->unk_0B4 != 0x62) && (arg0->unk_110 > 0.5f) && (arg0->unk_0C6 >= 9) && + !(arg0->unk_0C6 & 3) && (D_80177854 != 0x64)) { + func_8007C120(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_0E8.x, arg0->unk_0E8.y, + arg0->unk_0E8.z, arg0->unk_110 * 0.07f, 3); + } + if ((arg0->unk_0B4 != 0x15) && (arg0->unk_0B4 != 0x17) && (arg0->unk_0B4 != 0x4F) && (arg0->unk_0B4 != 0x53) && + (arg0->unk_0B4 != 0x1B) && (arg0->unk_0B4 != 0x33) && (arg0->unk_0B4 != 0xD) && (arg0->unk_0B4 != 0x48) && + (arg0->unk_0B4 != 0x1C) && (arg0->unk_110 > 0.5f)) { + sp40 = __sinf(arg0->unk_0C6 * 400.0f * M_DTOR) * arg0->unk_0C6; + Matrix_RotateY(gGfxMatrix, M_DTOR * sp40, 1); + Matrix_RotateX(gGfxMatrix, M_DTOR * sp40, 1); + Matrix_RotateZ(gGfxMatrix, M_DTOR * sp40, 1); + Matrix_SetGfxMtx(&gMasterDisp); + } + } + if ((arg0->obj.status == 3) && (arg0->unk_0BE != 0)) { + RCP_SetupDL_27(); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255); + } + if ((arg0->unk_0B4 == 0x1D) || (arg0->unk_0B4 == 0x3B) || (arg0->unk_0B4 == 0x3C)) { + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); + } else if ((arg0->unk_0B4 == 0x52) || (arg0->unk_0B4 == 0x5A) || + ((arg0->unk_0B4 == 6) && (gCurrentLevel == LEVEL_SOLAR))) { + if (!(arg0->unk_0C6 & 1)) { + RCP_SetupDL(&gMasterDisp, 0x39); + } else { + RCP_SetupDL(&gMasterDisp, 0x3D); + } + } + switch (arg0->unk_0B4) { + case 0x5C: + case 0x5D: + case 0x5E: + case 0x5F: + case 0x60: + RCP_SetupDL(&gMasterDisp, 0x22); + gDPSetTextureFilter(gMasterDisp++, G_TF_POINT); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, (s32) arg0[0].unk_150, (s32) arg0[0].unk_154, + (s32) arg0[0].unk_158, 255); + gSPDisplayList(gMasterDisp++, D_800D003C[arg0->unk_0B4].unk_00); + gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP); + break; + default: { + + if ((arg0->unk_0B4 < 0xC8) && (D_800D003C[arg0->unk_0B4].unk_00 != NULL)) { + gSPDisplayList(gMasterDisp++, D_800D003C[arg0->unk_0B4].unk_00); + } + switch (arg0->unk_0B4) { + case 0x38: + func_800515C4(); + break; + case 0x0: + arg0->unk_07C = 1; + func_8005ADAC(arg0); + break; + case 0x2: + arg0->unk_150 -= arg0->unk_150 * 0.1f; + arg0->unk_17C -= arg0->unk_17C * 0.1f; + arg0->unk_154 -= arg0->unk_154 * 0.1f; + arg0->unk_180 -= arg0->unk_180 * 0.1f; + if (arg0->obj.rot.z > 0.0f) { + arg0->unk_150 += (arg0->obj.rot.z * 0.7f - arg0->unk_150) * 0.2f; + arg0->unk_17C += (-arg0->obj.rot.z * 0.7f - arg0->unk_17C) * 0.2f; + } + if (arg0->obj.rot.z < 0.0f) { + arg0->unk_154 += (-arg0->obj.rot.z * 0.7f - arg0->unk_154) * 0.2f; + arg0->unk_180 += (arg0->obj.rot.z * 0.7f - arg0->unk_180) * 0.2f; + } + func_8005B388(arg0); + break; + case 0x2B: + if (gLevelType == 0) { + gSPDisplayList(gMasterDisp++, D_40018A0); + } else { + gSPDisplayList(gMasterDisp++, D_4007870); + } + func_8005ADAC(arg0); + break; + case 0x5: + arg0->unk_07C = 1; + func_8005ADAC(arg0); + break; + case 0x6: + if (gCurrentLevel == LEVEL_SOLAR) { + gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); + Animation_GetFrameData(&D_600636C, arg0->unk_0B6, sp114); + Animation_DrawSkeleton(1, D_6006558, sp114, NULL, NULL, arg0, &gIdentityMatrix); + gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); + } else { + Animation_GetFrameData(&D_40057AC, arg0->unk_0B6, sp114); + Animation_DrawSkeleton(1, D_40058B8, sp114, NULL, NULL, arg0, &gIdentityMatrix); + } + break; + case 0x7: + arg0->unk_07C = 1; + func_8005ADAC(arg0); + break; + case 0x9: + Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1); + Animation_GetFrameData(&D_40001A4, arg0->unk_0B6, sp114); + Animation_DrawSkeleton(1, D_4000270, sp114, NULL, NULL, arg0, &gIdentityMatrix); + break; + case 0x12: + if (arg0->unk_114 > 0.1f) { + arg0->unk_07C = 1; + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1); + Matrix_Scale(gGfxMatrix, 2.5f, 2.5f, 2.5f, 1); + func_8005B1E8(arg0, 2); + } + break; + case 0x13: + if (arg0->unk_114 > 0.1f) { + arg0->unk_07C = 1; + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1); + Matrix_Scale(gGfxMatrix, 2.5f, 2.5f, 2.5f, 1); + func_8005B1E8(arg0, 2); + } + break; + case 0x14: + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); + gSPDisplayList(gMasterDisp++, D_601A120); + break; + case 0x15: + gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); + gSPDisplayList(gMasterDisp++, D_6018BF0); + gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1); + arg0->unk_07C = 1; + func_8005B1E8(arg0, 2); + break; + case 0x16: + gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); + gSPDisplayList(gMasterDisp++, D_6019730); + gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); + Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1); + arg0->unk_07C = 1; + func_8005B1E8(arg0, 2); + break; + case 0x1B: + if (arg0->unk_0C2 != 0) { + if (!(arg0->unk_0C2 & 3) && (D_80177854 != 0x64)) { + func_8007D0E0(((Rand_ZeroOne() - 0.5f) * 200.0f) + arg0->obj.pos.x, + ((Rand_ZeroOne() - 0.5f) * 200.0f) + arg0->obj.pos.y, + ((Rand_ZeroOne() - 0.5f) * 200.0f) + arg0->obj.pos.z, + (Rand_ZeroOne() * 1.5f) + 2.5f); + } + RCP_SetupDL(&gMasterDisp, 0x39); + gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); + gSPDisplayList(gMasterDisp++, D_6001950); + } else { + gSPDisplayList(gMasterDisp++, D_60066F0); + } + break; + case 0x1F: + Matrix_RotateX(gGfxMatrix, M_PI / 2.0f, 1); + Matrix_SetGfxMtx(&gMasterDisp); + gSPDisplayList(gMasterDisp++, D_600E0C0); + break; + case 0x21: + Animation_GetFrameData(&D_400A30C, arg0->unk_0B6, sp114); + Matrix_RotateY(gGfxMatrix, M_PI, 1); + Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1); + Animation_DrawSkeleton(1, D_400A398, sp114, func_80074BFC, NULL, arg0, &gIdentityMatrix); + Math_SmoothStepToF(&arg0[0].unk_154, 0.0f, 0.3f, 2.0f, 0.0001f); + break; + case 0x24: + Animation_GetFrameData(&D_700CAF4, arg0->unk_0B6, sp114); + sp114[2].z += arg0->unk_150; + Animation_DrawSkeleton(1, D_700CB60, sp114, NULL, NULL, arg0, &gIdentityMatrix); + break; + case 0x26: + func_80074E3C(arg0); + break; + case 0x30: + case 0x31: + case 0x32: + func_E9F1D0_801A4CB0(arg0); + break; + case 0x34: + Animation_GetFrameData(&D_601F874, arg0->unk_0B6, sp114); + sp114[2].z -= arg0->unk_150; + gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); + Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, 1); + Animation_DrawSkeleton(1, D_601F920, sp114, NULL, NULL, arg0, &gIdentityMatrix); + gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); + break; + case 0x40: + Matrix_Push(&gGfxMatrix); + Matrix_RotateX(gGfxMatrix, arg0->unk_0F4.x * M_DTOR, 1); + Matrix_RotateY(gGfxMatrix, arg0->unk_0F4.y * M_DTOR, 1); + Matrix_Push(&gGfxMatrix); + Matrix_Translate(gGfxMatrix, 0.0f, arg0->unk_150, 0.0f, 1); + Matrix_SetGfxMtx(&gMasterDisp); + gSPDisplayList(gMasterDisp++, D_600CAA0); + Matrix_Pop(&gGfxMatrix); + gSPDisplayList(gMasterDisp++, D_600C130); + Matrix_Translate(gGfxMatrix, 0.0f, -arg0->unk_150, 0.0f, 1); + Matrix_SetGfxMtx(&gMasterDisp); + gSPDisplayList(gMasterDisp++, D_600C740); + Matrix_Pop(&gGfxMatrix); + break; + case 0x43: + gSPDisplayList(gMasterDisp++, D_6008AA0); + RCP_SetupDL(&gMasterDisp, 0x35); + gSPDisplayList(gMasterDisp++, D_6009E30); + break; + case 0x4E: + func_80067874(arg0); + break; + case 0x4F: + temp_s0 = arg0->unk_0B8; + arg0->unk_0B8 = 2; + func_E16C50_80190430(arg0); + arg0->unk_0B8 = temp_s0; + break; + case 0x50: + Matrix_Scale(gGfxMatrix, 0.6f, 0.6f, 0.6f, 1); + Matrix_SetGfxMtx(&gMasterDisp); + gSPDisplayList(gMasterDisp++, D_9011200); + break; + case 0x51: + if (arg0->unk_150 > 0.001f) { + Matrix_Scale(gGfxMatrix, arg0->unk_150, arg0->unk_150, arg0->unk_150, 1); + Matrix_SetGfxMtx(&gMasterDisp); + func_800A1558(arg0->unk_154, 0xB0, D_9003890, D_9003DF0, D_9003330); + gSPDisplayList(gMasterDisp++, D_9002CF0); + } + break; + case 0x52: + gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); + gSPDisplayList(gMasterDisp++, D_600DA10); + gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); + break; + case 0x53: + Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, 1); + Animation_GetFrameData(&D_602201C, arg0->unk_0B6, sp114); + Animation_DrawSkeleton(1, D_60220E8, sp114, NULL, NULL, arg0, &gIdentityMatrix); + break; + case 0x55: + gSPDisplayList(gMasterDisp++, D_D00B880); + func_8005ADAC(arg0); + break; + case 0x56: + gSPDisplayList(gMasterDisp++, D_D009A40); + func_8005ADAC(arg0); + break; + case 0x58: + RCP_SetupDL(&gMasterDisp, 0x16); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, arg0->unk_046, arg0->unk_046, arg0->unk_046, 255); + gSPDisplayList(gMasterDisp++, D_6008970); + break; + case 0x59: + RCP_SetupDL(&gMasterDisp, 0x15); + gSPDisplayList(gMasterDisp++, D_6000E10); + break; + case 0x67: + case 0x68: + func_E6A810_8018769C(arg0); + break; + case 0x69: + RCP_SetupDL(&gMasterDisp, 0x23); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 0x8F); + gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0); + gSPDisplayList(gMasterDisp++, D_7000000); + break; + case 0x6A: + Animation_GetFrameData(&D_4000080, arg0->unk_0B6, sp114); + Animation_DrawSkeleton(1, D_400014C, sp114, NULL, NULL, arg0, &gIdentityMatrix); + break; + case 0xFFF: + arg0->unk_0C2 = 10; + break; + } + if ((D_80161410 > 0) && ((arg0->unk_080 > 0) && (arg0->unk_080 < 6))) { + Vec3f sp58 = { 0.0f, 0.0f, 0.0f }; + + if ((arg0->unk_080 == 4) || (arg0->unk_080 == 5)) { + Matrix_MultVec3f(gGfxMatrix, &sp58, &D_80177E98[arg0->unk_080 + 4]); + return; + } else { + Matrix_MultVec3f(gGfxMatrix, &sp58, &D_80177E98[arg0->unk_080]); + } + } + } break; + } +} + +void func_800763A4(Object_2F4* arg0) { + s32 var_s0; + s32 sp60; + s32 sp5C; + f32 sp58; + Vec3f sp4C; + s32 pad; + + if (arg0->unk_0B4 == 0x1B) { + arg0->obj.pos.y -= arg0->unk_0E8.y; + arg0->obj.status = 2; + func_8007D0E0(arg0->obj.pos.x - arg0->unk_0E8.x, arg0->obj.pos.y + 30.0f, arg0->obj.pos.z - arg0->unk_0E8.z, + arg0->unk_110 * 5.0f); + arg0->unk_0C2 = 10000; + return; + } + if (arg0->unk_0BE != 0) { + arg0->unk_0E8.z = 0.0f; + arg0->unk_0E8.x = 0.0f; + arg0->unk_0E8.y = 0.0f; + if (arg0->unk_0BE == 1) { + Object_Kill(&arg0->obj, &arg0->unk_100); + func_80066254(arg0); + if (D_80177880 == 1) { + D_80177F24[arg0->unk_040] = arg0->obj.pos.x; + D_8017802C[arg0->unk_040] = arg0->obj.pos.z; + D_80178134[arg0->unk_040] = 1001.0f; + } + return; + } + } else { + if ((gLevelType == 0) || (gCurrentLevel == 0x11)) { + arg0->unk_10C = 0.4f; + } + switch (arg0->unk_04C) { + case 0: + case 1: + if (arg0->unk_040 & 1) { + arg0->obj.rot.z -= 8.0f; + } else { + arg0->obj.rot.z += 8.0f; + } + break; + case 2: + arg0->obj.rot.y += 5.0f; + arg0->obj.rot.x += 7.3f; + break; + case 3: + arg0->obj.rot.y += 6.0f; + arg0->obj.rot.x += 18.3f; + arg0->unk_10C = 0.7f; + break; + case 4: + arg0->obj.rot.x += (-90.0f - arg0->obj.rot.x) * 0.1f; + break; + } + if (((arg0->unk_0BC & 3) == 1) && (arg0->unk_0B4 != 0xD) && (arg0->unk_0B4 != 0x3D)) { + func_8007D24C(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 2.2f); + } + if ((D_80178294 != 0) && + (func_800A73E4(&sp58, &sp5C, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z) != 0)) { + func_8007BFFC(arg0->obj.pos.x, sp58 + 20.0f, arg0->obj.pos.z, 0.0f, 0.0f, 0.0f, arg0->unk_110 * 3.0f, 5); + func_8007B228(arg0->obj.pos.x, sp58, arg0->obj.pos.z, 2.0f); + arg0->unk_0BE = 2; + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + return; + } + if (D_801784AC == 4) { + if (func_E6A810_801B6AEC(arg0->obj.pos.x, arg0->obj.pos.y - 10.0f, arg0->obj.pos.z + D_80177D20) != 0) { + func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y + 20.0f, arg0->obj.pos.z, arg0->unk_110 * 6.0f); + func_8007BFFC(arg0->obj.pos.x - arg0->unk_0E8.x, arg0->obj.pos.y + 30.0f, + arg0->obj.pos.z - arg0->unk_0E8.z, 0.0f, 0.0f, 0.0f, arg0->unk_110 * 4.0f, 0x14); + func_80062C38(arg0->obj.pos.x, arg0->obj.pos.z); + arg0->unk_0BE = 2; + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + return; + } + } else { + sp4C.x = arg0->unk_0E8.x; + sp4C.y = arg0->unk_0E8.y; + sp4C.z = arg0->unk_0E8.z; + sp60 = func_8006351C(arg0->unk_040, &arg0->obj.pos, &sp4C, 0); + if ((sp60 != 0) || (arg0->obj.pos.y < (D_80177940 + 30.0f))) { + if ((Rand_ZeroOne() < 0.5f) && (arg0->unk_04C < 3) && (gLevelType == 0) && (sp60 != 999) && + (D_80161A88 != 2) && ((arg0->unk_0E8.z < -20.0f) || (arg0->unk_0E8.z > 0.0f))) { + if (gCurrentLevel == 0xE) { + func_8006BF7C(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z - arg0->unk_0E8.z); + func_80062C38(arg0->obj.pos.x, arg0->obj.pos.z); + } + arg0->obj.pos.y -= arg0->unk_0E8.y; + arg0->unk_0E8.y = Rand_ZeroOne() * 10.0f; + arg0->unk_04C = 3; + if (D_80177880 == 1) { + func_8007D2C8(arg0->obj.pos.x - arg0->unk_0E8.x, arg0->obj.pos.y, + arg0->obj.pos.z - arg0->unk_0E8.z, arg0->unk_110 * 3.0f); + } + func_8007D2C8(arg0->obj.pos.x - arg0->unk_0E8.x, arg0->obj.pos.y, arg0->obj.pos.z - arg0->unk_0E8.z, + arg0->unk_110 * 3.0f); + if ((arg0->obj.id == 0xC5) && (arg0->unk_0E4 < 8)) { + func_8007A6F0(&arg0->obj.pos, 0x2903B009); + } else { + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + } + if ((arg0->obj.id == 0xC8) && (arg0->unk_0B4 == 2)) { + if (arg0->unk_158 < 360.0f) { + func_800A69F8(1, arg0->obj.pos.x + 20.0f, arg0->obj.pos.y, arg0->obj.pos.z); + arg0->unk_158 = 777.0f; + } + if (arg0->unk_15C < 360.0f) { + func_800A69F8(0, arg0->obj.pos.x - 20.0f, arg0->obj.pos.y, arg0->obj.pos.z); + arg0->unk_15C = 777.0f; + } + } + } else { + if ((arg0->obj.pos.y < (D_80177940 + 30.0f)) && (gLevelType == 0)) { + arg0->unk_0E8.z = 0.0f; + if (D_80161A88 == 2) { + func_8007D9DC(arg0->obj.pos.x, D_80177940 + 2.0f, arg0->obj.pos.z, 3.0f, 20.0f, 0); + func_8007D9DC(arg0->obj.pos.x, D_80177940 + 2.0f, arg0->obj.pos.z, 3.0f, 20.0f, 0xA); + func_8007D9DC(arg0->obj.pos.x, D_80177940 + 2.0f, arg0->obj.pos.z, 3.0f, 20.0f, 0x14); + func_8007ADF4(arg0->obj.pos.x, D_80177940, arg0->obj.pos.z, 0.1f, 3.0f); + } else { + func_800365E4(arg0->obj.pos.x, 3.0f, arg0->obj.pos.z, arg0->obj.pos.x, arg0->obj.pos.z, + 0.0f, 0.0f, 90.0f, 6.5f, 0, 0); + } + func_8007C120(arg0->obj.pos.x, 20.0f, arg0->obj.pos.z, 0.0f, 0.0f, 0.0f, arg0->unk_110 * 0.05f, + 0x1E); + if ((gCurrentLevel == 0xE) || (gCurrentLevel == 0x13)) { + func_8007C688(arg0->obj.pos.x, D_80177940 + 30.0f, arg0->obj.pos.z, 3.0f, 0x3C); + if (gCurrentLevel == 0xE) { + func_80062C38(arg0->obj.pos.x, arg0->obj.pos.z); + } + } + } + arg0->obj.pos.y -= arg0->unk_0E8.y; + func_8007D0E0(arg0->obj.pos.x - arg0->unk_0E8.x, arg0->obj.pos.y + 30.0f, + arg0->obj.pos.z - arg0->unk_0E8.z, arg0->unk_110 * 5.0f); + if (D_80177880 == 1) { + func_8007BFFC(arg0->obj.pos.x, arg0->obj.pos.y + 30.0f, arg0->obj.pos.z, arg0->unk_0E8.x, 10.0f, + arg0->unk_0E8.z, arg0->unk_110 * 3.0f, 0x14); + if (sp60 == 0x3E7) { + func_8007C688(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_110 * 3.0f, + 0x46); + } + for (var_s0 = 0; var_s0 < 4; var_s0++) { + if (Rand_ZeroOne() < 0.7f) { + if (gCurrentLevel == 0xE) { + func_800A69F8(4, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z); + } else { + func_800794CC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 1.0f); + } + } + } + } else { + func_8007BFFC(arg0->obj.pos.x - arg0->unk_0E8.x, arg0->obj.pos.y + 30.0f, + (arg0->obj.pos.z - arg0->unk_0E8.z) + 48.0f, 0.0f, 0.0f, 0.0f, + arg0->unk_110 * 3.0f, 5); + } + arg0->unk_0BE = 2; + if ((arg0->obj.id == 0xC5) && (arg0->unk_0E4 < 8)) { + func_8007A6F0(&arg0->obj.pos, 0x2903B009); + } else { + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + } + } + } + } + if ((arg0->unk_0D0 != 0) || (arg0->unk_0BC == 0) || ((arg0->unk_044 != 0) && (arg0->obj.id != 0xC5))) { + if (D_80177880 == 1) { + for (var_s0 = 0; var_s0 < 4; var_s0++) { + if (Rand_ZeroOne() < 0.7f) { + if (gCurrentLevel == 0xE) { + func_800A69F8(4, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z); + } else { + func_800794CC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 1.0f); + } + } + } + func_8007BFFC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_0E8.x, arg0->unk_0E8.y, + arg0->unk_0E8.z, 5.0f, 0xF); + func_8007D0E0(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z - arg0->unk_0E8.z, 8.0f); + } else { + if ((arg0->unk_0B4 != 0xD) && (arg0->unk_0B4 != 0x3D)) { + func_8007D0E0(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z - arg0->unk_0E8.z, + arg0->unk_110 * 5.0f); + } + if (arg0->unk_0B4 == 0x24) { + func_8007BFFC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, arg0->unk_0E8.x, arg0->unk_0E8.y, + arg0->unk_0E8.z, 5.0f, 0xF); + } + } + arg0->unk_0BE = 2; + if ((arg0->obj.id == 0xC5) && (arg0->unk_0E4 < 8)) { + func_8007A6F0(&arg0->obj.pos, 0x2903B009); + } else { + func_8007A6F0(&arg0->obj.pos, 0x2903A008); + } + } + } + if (D_80177880 == 1) { + D_80177F24[arg0->unk_040] = arg0->obj.pos.x; + D_8017802C[arg0->unk_040] = arg0->obj.pos.z; + D_80178134[arg0->unk_040] = arg0->unk_0F4.y + 180.0f; + } + if (arg0->obj.id == 0xC5) { + func_8002EE64(arg0); + } +} + +void func_8007717C(Object_2F4* arg0) { + if ((arg0->unk_0B4 == 0x30) || (arg0->unk_0B4 == 0x31) || (arg0->unk_0B4 == 0x32)) { + func_E9F1D0_801A3BD4(arg0); + } else { + func_800763A4(arg0); + } +} + +void func_800771CC(Object_2F4* arg0) { + Vec3f sp24; + + Math_Vec3fFromAngles(&sp24, arg0->obj.rot.x, arg0->obj.rot.y, 50.0f); + arg0->unk_0E8.x = sp24.x; + arg0->unk_0E8.y = sp24.y; + arg0->unk_0E8.z = sp24.z; +} + +void func_80077218(Object_2F4* arg0) { + func_800515C4(); +} diff --git a/src/main/fox_97F80.c b/src/main/fox_97F80.c index dedf9610..3eb1553b 100644 --- a/src/main/fox_97F80.c +++ b/src/main/fox_97F80.c @@ -551,7 +551,7 @@ s32 func_80099254(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, CollisionHeader* arg3, sp108.dist = var_s0->dist; if ((DOT_XYZ(sp108.normal, temp_V3f1) + sp108.dist) <= 0.0f) { temp_fs0 = sp108.normal.x * arg2->x + sp108.normal.y * arg2->y + sp108.normal.z * arg2->z; - if (Math_FAcosF(temp_fs0 / (sqrtf(VEC3F_SQ(sp108.normal)) * spEC)) > 1.5707964f) { + if (Math_FAcosF(temp_fs0 / (sqrtf(VEC3F_SQ(sp108.normal)) * spEC)) > M_PI / 2.0f) { temp_fs0 = (DOT_XYZ(sp108.normal, temp_V3f1) + sp108.dist) / temp_fs0; spDC.x = temp_V3f1.x - (arg2->x * temp_fs0); spDC.y = temp_V3f1.y - (arg2->y * temp_fs0); @@ -574,7 +574,7 @@ s32 func_80099254(Vec3f* arg0, Vec3f* arg1, Vec3f* arg2, CollisionHeader* arg3, arg5[1] = -Math_Atan2F_XY(__sinf(Math_Atan2F_XY(sp108.normal.y, sp108.normal.z)) * sp108.normal.z, sp108.normal.x); - } else if (arg5[0] >= 3.1415927f) { + } else if (arg5[0] >= M_PI) { arg5[1] = Math_Atan2F_XY(sp108.normal.y, sp108.normal.x); } else { arg5[1] = -Math_Atan2F_XY(sp108.normal.y, sp108.normal.x); diff --git a/src/main/fox_A24B0.c b/src/main/fox_A24B0.c index fd1cae1b..6c2e067d 100644 --- a/src/main/fox_A24B0.c +++ b/src/main/fox_A24B0.c @@ -9,11 +9,11 @@ s32 D_80161A18[4]; s32 D_80161A28; u8 D_80161A2C; u16 D_80161A2E; -u16 D_80161A30; -u16 D_80161A32; +u16 gNextLevel; +u16 gNextGameState; u16 D_80161A34; -u16 D_80161A36; -u8 D_80161A38; +u16 gBgColor; +u8 gBlurAlpha; u8 D_80161A39; f32 D_80161A3C; f32 D_80161A40; @@ -25,75 +25,94 @@ s32 D_800D2874[] = { 0, 160, 0, 160 }; s32 D_800D2884[] = { 159, 319, 159, 319 }; s32 D_800D2894[] = { 0, 0, 120, 120 }; s32 D_800D28A4[] = { 119, 119, 239, 239 }; -s32 D_800D28B4[] = { - 0x05, 0x06, 0x08, 0x0A, 0x0C, 0x0D, 0x12, 0x0E, 0x0F, 0x10, 0x11, - 0x15, 0x07, 0x09, 0x0B, 0x00, 0x13, 0x16, 0x17, 0x18, 0x32, +s32 sOverlaySetups[] = { + /* LEVEL_CORNERIA */ OVL_SETUP_CORNERIA, + /* LEVEL_METEO */ OVL_SETUP_METEO, + /* LEVEL_SECTOR_X */ OVL_SETUP_SECTOR_X, + /* LEVEL_AREA_6 */ OVL_SETUP_AREA_6, + /* LEVEL_UNK_4 */ OVL_SETUP_UNK_4, + /* LEVEL_SECTOR_Y */ OVL_SETUP_SECTOR_Y, + /* LEVEL_VENOM_1 */ OVL_SETUP_VENOM_1, + /* LEVEL_SOLAR */ OVL_SETUP_SOLAR, + /* LEVEL_ZONESS */ OVL_SETUP_ZONESS, + /* LEVEL_VENOM_2 */ OVL_SETUP_VENOM_2, + /* LEVEL_TRAINING */ OVL_SETUP_TRAINING, + /* LEVEL_MACBETH */ OVL_SETUP_MACBETH, + /* LEVEL_TITANIA */ OVL_SETUP_TITANIA, + /* LEVEL_AQUAS */ OVL_SETUP_AQUAS, + /* LEVEL_FORTUNA */ OVL_SETUP_FORTUNA, + /* LEVEL_UNK_15 */ OVL_SETUP_TITLE, + /* LEVEL_KATINA */ OVL_SETUP_KATINA, + /* LEVEL_BOLSE */ OVL_SETUP_BOLSE, + /* LEVEL_SECTOR_Z */ OVL_SETUP_SECTOR_Z, + /* LEVEL_VENOM_SW */ OVL_SETUP_VENOM_SW, + /* LEVEL_VERSUS */ OVL_SETUP_VERSUS, }; -void func_800A18B0(void) { +void Game_Initialize(void) { Memory_FreeAll(); Rand_Init(); Rand_SetSeed(1, 29000, 9876); - D_80177834 = 100; + gGameState = GSTATE_BOOT; D_8017783C = 0; - D_80161A36 = 0; - D_80161A38 = 0xFF; + gBgColor = 0; + gBlurAlpha = 0xFF; D_80161A3C = 45.0f; D_80161A40 = 10.0f; D_80161A44 = 12800.0f; D_80161A10 = D_80161A14 = 0.0f; - D_801774F8 = 99; - D_80177820 = 0; + gOverlaySetup = OVL_SETUP_LOGO; + gOverlayStage = 0; Overlay_InitDma(); D_80161A39 = true; } -void func_800A1980(void) { - u16 temp; +void Game_SetGameState(void) { D_80161A14 = D_80161A10; - temp = D_80161A32; // fake? - switch (temp) { - case 7: - D_80178234 = D_80161A30; + if (gNextGameState == GSTATE_NONE) { + return; + } + + switch (gNextGameState) { + case GSTATE_PLAY: + gCurrentLevel = gNextLevel; func_800A5844(); D_80177854 = 0; D_8017827C = D_80161A2E; D_80161A2E = 0; - if ((D_8017827C != 0) && (D_80178234 != 9)) { + if ((D_8017827C != 0) && (gCurrentLevel != LEVEL_VENOM_2)) { D_8017782C = 0; } break; - case 4: + case GSTATE_MAP: D_80177B40 = 0; break; - case 5: + case GSTATE_STATE_5: D_80177868 = 0; break; - case 0: - return; } Memory_FreeAll(); func_800A6148(); - D_80177834 = D_80161A32; + gGameState = gNextGameState; D_8017783C = 3; D_8015F924 = 0; - D_80161A32 = 0; - D_80177820 = 0; - gFillScreenColor = D_80161A36 = 0; + gNextGameState = GSTATE_NONE; + gOverlayStage = 0; + gFillScreenColor = gBgColor = 0; D_80177D20 = 0.0f; - if ((D_80178234 == 0x13) && (D_8017827C == 2)) { - gFillScreenColor = D_80161A36 = 0xFFFF; - D_80178348 = D_80178350 = D_80178354 = 0xFF; + if ((gCurrentLevel == LEVEL_VENOM_SW) && (D_8017827C == 2)) { + gFillScreenColor = gBgColor = 0xFFFF; + D_80178348 = D_80178350 = D_80178354 = 255; } else { D_80178348 = D_80178350 = D_80178354 = 0; func_8001DBD0(1); } - D_80178340 = 0xFF; + D_80178340 = 255; D_80178380[0] = 0; D_8017829C = 0; D_80178428 = 0.0f; - D_80161A38 = 0xFF; + gBlurAlpha = 255; D_80177898 = 0; func_8001AE58(); func_8001D400(0); @@ -103,17 +122,17 @@ bool func_800A1B6C(void) { static u8 sHoldTimer = 0; static u8 sOverlaySelect = 99; static u8 sCurrentOverlay = 99; - static u8 sOverlayMode = 99; + static u8 sCurrentStage = 99; - if (D_801774F8 != sCurrentOverlay) { + if (gOverlaySetup != sCurrentOverlay) { sHoldTimer = 2; - sCurrentOverlay = D_801774F8; + sCurrentOverlay = gOverlaySetup; } if (sHoldTimer == 0) { sOverlaySelect = sCurrentOverlay; - sOverlayMode = D_80177820; + sCurrentStage = gOverlayStage; } - Overlay_Load(sOverlaySelect, sOverlayMode); + Overlay_Load(sOverlaySelect, sCurrentStage); if (sHoldTimer) { sHoldTimer--; @@ -127,19 +146,19 @@ void func_800A1C14(Gfx** arg0) { gDPSetScissor((*arg0)++, G_SC_NON_INTERLACE, 8, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8); gDPSetDepthImage((*arg0)++, &gZBuffer); gDPSetColorImage((*arg0)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, &gZBuffer); - gDPSetFillColor((*arg0)++, 0xFFFCFFFC); + gDPSetFillColor((*arg0)++, FILL_COLOR(GPACK_ZDZ(G_MAXFBZ, 0))); gDPFillRectangle((*arg0)++, 8, 8, SCREEN_WIDTH - 8 - 1, SCREEN_HEIGHT - 8 - 1); gDPSetColorImage((*arg0)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, gFrameBuffer); - if (D_80161A38 < 0xFF) { + if (gBlurAlpha < 0xFF) { gDPPipeSync((*arg0)++); gDPSetCycleType((*arg0)++, G_CYC_1CYCLE); gDPSetCombineMode((*arg0)++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); gDPSetRenderMode((*arg0)++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetPrimColor((*arg0)++, 0x00, 0x00, RGBA16_RED(D_80161A36) * 8, RGBA16_GRN(D_80161A36) * 8, - RGBA16_BLU(D_80161A36) * 8, D_80161A38); + gDPSetPrimColor((*arg0)++, 0x00, 0x00, RGBA16_RED(gBgColor) * 8, RGBA16_GRN(gBgColor) * 8, + RGBA16_BLU(gBgColor) * 8, gBlurAlpha); } else { - gDPSetFillColor((*arg0)++, (((D_80161A36 | 1) << 0x10) | (D_80161A36 | 1))); + gDPSetFillColor((*arg0)++, FILL_COLOR(gBgColor | 1)); } gDPFillRectangle((*arg0)++, 8, 8, SCREEN_WIDTH - 8 - 1, SCREEN_HEIGHT - 8); gDPPipeSync((*arg0)++); @@ -262,35 +281,35 @@ void func_800A24DC(s32 arg0) { } void func_800A25DC(void) { - switch (D_80177834) { + switch (gGameState) { case 1: - D_801774F8 = 0; - D_80177820 = 0; + gOverlaySetup = OVL_SETUP_TITLE; + gOverlayStage = 0; break; case 2: - D_801774F8 = 0; - D_80177820 = 0; + gOverlaySetup = OVL_SETUP_TITLE; + gOverlayStage = 0; break; case 3: - D_801774F8 = 1; - D_80177820 = 0; + gOverlaySetup = OVL_SETUP_MENU; + gOverlayStage = 0; break; case 4: - D_801774F8 = 2; - D_80177820 = 0; + gOverlaySetup = OVL_SETUP_MAP; + gOverlayStage = 0; return; case 6: - D_801774F8 = 50; + gOverlaySetup = OVL_SETUP_VERSUS; break; case 7: - D_801774F8 = D_800D28B4[D_80178234]; + gOverlaySetup = sOverlaySetups[gCurrentLevel]; break; case 5: - D_801774F8 = 3; - D_80177820 = 0; + gOverlaySetup = OVL_SETUP_STATE_5; + gOverlayStage = 0; break; case 8: - D_801774F8 = 4; + gOverlaySetup = OVL_SETUP_CREDITS; break; } } @@ -300,7 +319,7 @@ void func_800A26C0(void) { u8 spBB; u16 var_v0_3; - func_800A1980(); + Game_SetGameState(); if (D_80161A39) { func_800A1E68(&gUnkDisp1); D_80161A39 = false; @@ -310,21 +329,21 @@ void func_800A26C0(void) { func_800A25DC(); if (func_800A1B6C() != true) { Lib_Perspective(&gUnkDisp1); - func_800A1FB0(&gUnkDisp1, D_801778A8, 0); + func_800A1FB0(&gUnkDisp1, gCamCount, 0); if (D_8017783C != 0) { D_8017783C--; } - switch (D_80177834) { - case 0x64: + switch (gGameState) { + case GSTATE_BOOT: D_8017783C = 2; - D_80177834++; + gGameState++; break; - case 0x65: + case GSTATE_BOOT_WAIT: if (D_8017783C == 0) { - D_80177834++; + gGameState++; } break; - case 0x66: + case GSTATE_SHOW_LOGO: RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); TextureRect_8bIA(&gMasterDisp, D_F000000, 128, 16, 100.0f, 86.0f, 1.0f, 1.0f); @@ -332,16 +351,17 @@ void func_800A26C0(void) { TextureRect_8bIA(&gMasterDisp, D_F001000, 128, 16, 100.0f, 118.0f, 1.0f, 1.0f); TextureRect_8bIA(&gMasterDisp, D_F001800, 128, 16, 100.0f, 134.0f, 1.0f, 1.0f); TextureRect_8bIA(&gMasterDisp, D_F002000, 128, 10, 100.0f, 150.0f, 1.0f, 1.0f); - D_80177834++; + gGameState++; break; - case 0x67: + case GSTATE_CHECK_SAVE: if (Save_Read() != 0) { gSaveFile = *((SaveFile*) &gDefaultSave); Save_Write(); } - D_80177834++; - Timer_CreateTask(MSEC_TO_CYCLES(1000), Timer_Increment, &D_80177834, 1); - case 0x68: + gGameState++; + Timer_CreateTask(MSEC_TO_CYCLES(1000), Timer_Increment, &gGameState, 1); + /* fallthrough */ + case GSTATE_LOGO_WAIT: RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); TextureRect_8bIA(&gMasterDisp, D_F000000, 128, 16, 100.0f, 86.0f, 1.0f, 1.0f); @@ -350,25 +370,25 @@ void func_800A26C0(void) { TextureRect_8bIA(&gMasterDisp, D_F001800, 128, 16, 100.0f, 134.0f, 1.0f, 1.0f); TextureRect_8bIA(&gMasterDisp, D_F002000, 128, 10, 100.0f, 150.0f, 1.0f, 1.0f); break; - case 0x69: - D_80177834 = 1; - D_801774F8 = 0; - D_80177820 = 0; + case GSTATE_START: + gGameState = GSTATE_INIT; + gOverlaySetup = OVL_SETUP_TITLE; + gOverlayStage = 0; break; - case 0x1: - D_80177834 = 2; + case GSTATE_INIT: + gGameState = GSTATE_TITLE; D_80177AE0 = 1; D_80177824 = 1; Memory_FreeAll(); func_800A6148(); - D_801778A8 = 1; - D_80161AA0[0] = 2; + gCamCount = 1; + gLifeCount[0] = 2; D_80177D20 = 0.0f; D_8016170C = D_80177A80 = D_80177830 = D_80177838 = D_80177840 = D_80178754 = D_801778E8 = D_80177AE0 = D_80178410 = D_80177B40 = D_80177854 = D_8017784C = D_80177898 = D_80161734 = D_80161A2C = - D_80161A36 = D_80178340 = 0; - D_80161A32 = D_80177C94 = D_80177CAC = D_80177CB4 = D_80177CBC = D_80177CC4 = D_80177C9C = D_80177CA4 = - D_80161A5C = D_80161A34 = 0; + gBgColor = D_80178340 = 0; + gNextGameState = D_80177C94 = D_80177CAC = D_80177CB4 = D_80177CBC = D_80177CC4 = D_80177C9C = + D_80177CA4 = D_80161A5C = D_80161A34 = 0; for (i = 0; i < 4; i++) { D_80177908[i] = 2; D_80177928[i] = 4; @@ -384,13 +404,13 @@ void func_800A26C0(void) { } D_8017789C = 0; D_801778A4 = 3; - D_80161A38 = 0xFF; + gBlurAlpha = 255; for (i = 0; i < 30; i++) { D_800D3180[i] = 0; } gExpertMode = false; - D_80177C74 = gSaveFile.save.data.unk_14; - switch (D_80177C74) { + gSoundMode = gSaveFile.save.data.soundMode; + switch (gSoundMode) { case 0: var_v0_3 = 0; break; @@ -401,46 +421,46 @@ void func_800A26C0(void) { var_v0_3 = 1; break; default: - D_80177C74 = 0; + gSoundMode = 0; var_v0_3 = 0; break; } func_800182F4(var_v0_3 | 0xE0000000); - D_80177C80[0] = gSaveFile.save.data.unk_15; - D_80177C80[1] = gSaveFile.save.data.unk_16; - D_80177C80[2] = gSaveFile.save.data.unk_17; - if (D_80177C80[0] > 99) { - D_80177C80[0] = 99; + gVolumeSettings[0] = gSaveFile.save.data.musicVolume; + gVolumeSettings[1] = gSaveFile.save.data.voiceVolume; + gVolumeSettings[2] = gSaveFile.save.data.sfxVolume; + if (gVolumeSettings[0] > 99) { + gVolumeSettings[0] = 99; } - if (D_80177C80[1] > 99) { - D_80177C80[1] = 99; + if (gVolumeSettings[1] > 99) { + gVolumeSettings[1] = 99; } - if (D_80177C80[2] > 99) { - D_80177C80[2] = 99; + if (gVolumeSettings[2] > 99) { + gVolumeSettings[2] = 99; } - func_8001D8A8(0, D_80177C80[0]); - func_8001D8A8(1, D_80177C80[1]); - func_8001D8A8(2, D_80177C80[2]); + func_8001D8A8(0, gVolumeSettings[0]); + func_8001D8A8(1, gVolumeSettings[1]); + func_8001D8A8(2, gVolumeSettings[2]); break; - case 0x2: + case GSTATE_TITLE: // title screen func_80187520(0x67, NULL); break; - case 0x3: + case GSTATE_MENU: // main menu func_80187520(0x6B, NULL); break; - case 0x4: + case GSTATE_MAP: // world map func_EBFBE0_8019E8D0(); break; - case 0x6: + case GSTATE_VS_INIT: // vs mode func_800C20B0(); break; - case 0x7: + case GSTATE_PLAY: // play func_800B86CC(); break; - case 0x5: + case GSTATE_STATE_5: // world map func_80187520(0x6D, NULL); break; - case 0x8: + case GSTATE_CREDITS: // credits D_80177898 = 8; func_EF0260_8018A96C(); break; @@ -448,17 +468,17 @@ void func_800A26C0(void) { break; } func_800A24DC(0); - if (D_801778A8 == 2) { - func_800A1FB0(&gMasterDisp, D_801778A8, 1); + if (gCamCount == 2) { + func_800A1FB0(&gMasterDisp, gCamCount, 1); func_800A24DC(1); gDPPipeSync(gMasterDisp++); gDPSetScissor(gMasterDisp++, G_SC_NON_INTERLACE, 8, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8); - } else if ((D_801778A8 == 4) && (D_80177898 != 0)) { - func_800A1FB0(&gMasterDisp, D_801778A8, 3); + } else if ((gCamCount == 4) && (D_80177898 != 0)) { + func_800A1FB0(&gMasterDisp, gCamCount, 3); func_800A24DC(3); - func_800A1FB0(&gMasterDisp, D_801778A8, 2); + func_800A1FB0(&gMasterDisp, gCamCount, 2); func_800A24DC(2); - func_800A1FB0(&gMasterDisp, D_801778A8, 1); + func_800A1FB0(&gMasterDisp, gCamCount, 1); func_800A24DC(1); gDPPipeSync(gMasterDisp++); gDPSetScissor(gMasterDisp++, G_SC_NON_INTERLACE, 8, 8, SCREEN_WIDTH - 8, SCREEN_HEIGHT - 8); @@ -471,7 +491,7 @@ void func_800A26C0(void) { gDPFillRectangle(gMasterDisp++, SCREEN_WIDTH / 2 - 3, 8, SCREEN_WIDTH / 2 + 2, SCREEN_HEIGHT - 8); gDPFillRectangle(gMasterDisp++, 8, SCREEN_HEIGHT / 2 - 3, SCREEN_WIDTH - 8, SCREEN_HEIGHT / 2 + 2); - if (D_80177C98 == 0) { + if (gLevelType == 0) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x0, 0, 0, 0, 255); } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x0, 100, 100, 255, 255); @@ -482,7 +502,7 @@ void func_800A26C0(void) { func_8008CB8C(); } spBB = 0; - if (D_801778A8 == 1) { + if (gCamCount == 1) { Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, D_80178390[0], D_801783A0[0], D_801783B0[0], D_80178380[0]); if ((D_80177898 == 4) || (D_80177898 == 8)) { @@ -494,8 +514,8 @@ void func_800A26C0(void) { func_8008DE68(); } } else { - for (i = 0; i < D_801778A8; i++) { - if (D_80178280[i].unk_224 != 0) { + for (i = 0; i < gCamCount; i++) { + if (gPlayer[i].unk_224 != 0) { Graphics_FillRectangle(&gMasterDisp, D_800D2874[i], D_800D2894[i], D_800D2884[i], D_800D28A4[i], D_80178348, D_80178350, D_80178354, D_80178340); @@ -509,7 +529,7 @@ void func_800A26C0(void) { func_80040CDC(); func_8008865C(); func_8002E548(); - if ((D_80177834 == 7) && (D_801778E8 != 0)) { + if ((gGameState == GSTATE_PLAY) && (D_801778E8 != 0)) { func_800C1ED4(); } func_80084688(0, D_80177C50); @@ -522,19 +542,19 @@ void func_800A26C0(void) { } Object_2F4* func_800A3608(s32 arg0) { - Object_2F4* var_a2 = D_80163FE0; + Object_2F4* var_a2 = gObjects2F4; s32 i; - for (i = 0; i < ARRAY_COUNT(D_80163FE0); i++, var_a2++) { + for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++, var_a2++) { if (var_a2->obj.status == 0) { - func_800613C4(var_a2); + Object_2F4_Initialize(var_a2); var_a2->obj.status = 1; var_a2->obj.id = arg0; func_800612B8(&var_a2->unk_01C, var_a2->obj.id); break; } } - if (i == ARRAY_COUNT(D_80163FE0)) { + if (i == ARRAY_COUNT(gObjects2F4)) { var_a2 = NULL; } return var_a2; diff --git a/src/main/fox_A4290.c b/src/main/fox_A4290.c index 03bfbddc..44e8df9b 100644 --- a/src/main/fox_A4290.c +++ b/src/main/fox_A4290.c @@ -67,12 +67,12 @@ bool func_800A36FC(Vec3f* arg0, Vec3f* arg1, CollisionHeader2* arg2, Vec3f* arg3 arg3->x = Math_Atan2F_XY(sp48.y, sp48.z); if (sp48.z != 0.0f) { arg3->z = -Math_Atan2F_XY(__sinf(Math_Atan2F_XY(sp48.y, sp48.z)) * sp48.z, sp48.x); - } else if (arg3->x >= 3.1415927f) { + } else if (arg3->x >= M_PI) { arg3->z = Math_Atan2F_XY(sp48.y, sp48.x); } else { arg3->z = -Math_Atan2F_XY(sp48.y, sp48.x); } - if ((arg0->y <= arg3->y) || (D_80178234 == 11)) { + if ((arg0->y <= arg3->y) || (gCurrentLevel == LEVEL_MACBETH)) { sp38 = true; } } diff --git a/src/main/fox_A48A0.c b/src/main/fox_A48A0.c index 797d95e4..96e2ca63 100644 --- a/src/main/fox_A48A0.c +++ b/src/main/fox_A48A0.c @@ -5,8 +5,8 @@ void func_800A3CA0(void) { Matrix_LookAt(gGfxMatrix, D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0, 0.0f, 1.0f, 0.0f, 1); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1); - Matrix_RotateY(gGfxMatrix, gChangedInput[D_801778A0].stick_x * 0.017453292f, 1); - Matrix_RotateX(gGfxMatrix, gChangedInput[D_801778A0].stick_y * 0.017453292f, 1); + Matrix_RotateY(gGfxMatrix, gChangedInput[D_801778A0].stick_x * M_DTOR, 1); + Matrix_RotateX(gGfxMatrix, gChangedInput[D_801778A0].stick_y * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL_23(); Matrix_Pop(&gGfxMatrix); diff --git a/src/main/fox_display.c b/src/main/fox_display.c index a7a59cbf..f0357d94 100644 --- a/src/main/fox_display.c +++ b/src/main/fox_display.c @@ -82,7 +82,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) { switch (mode) { case 2: for (var_s3 = 0; var_s3 < 0x400; var_s3 += 0x20) { - temp_ft3 = 3.0f * __sinf((s32) (((var_s3 / 32) + (D_80177DB0 / 4)) % 0x20U) * (M_PI / 16.0f)); + temp_ft3 = 3.0f * __sinf((s32) (((var_s3 / 32) + (gFrameCount / 4)) % 0x20U) * (M_PI / 16.0f)); for (var_v1 = 0; var_v1 < 0x20; var_v1++) { ((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 0x20U] = ((u16*) src)[var_s3 + var_v1]; } @@ -90,7 +90,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) { break; case 3: for (var_s3 = 0; var_s3 < 0x580; var_s3 += 0x40) { - temp_ft3 = __sinf((s32) (((var_s3 / 64) + (D_80177DB0 / 4)) % 0x20U) * (M_PI / 4.0f)); + temp_ft3 = __sinf((s32) (((var_s3 / 64) + (gFrameCount / 4)) % 0x20U) * (M_PI / 4.0f)); for (var_v1 = 0; var_v1 < 0x40; var_v1++) { ((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 0x40U] = ((u16*) src)[var_s3 + var_v1]; } @@ -98,7 +98,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) { break; case 1: for (var_s3 = 0; var_s3 < 0x100; var_s3 += 0x10) { - temp_ft3 = 2.0f * __sinf((s32) (((var_s3 / 16) + (D_80177DB0 / 2)) % 0x10U) * (M_PI / 8.0f)); + temp_ft3 = 2.0f * __sinf((s32) (((var_s3 / 16) + (gFrameCount / 2)) % 0x10U) * (M_PI / 8.0f)); for (var_v1 = 0; var_v1 < 0x10; var_v1++) { ((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 0x10U] = ((u16*) src)[var_s3 + var_v1]; } @@ -106,7 +106,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) { break; case 0: for (var_s3 = 0; var_s3 < 0x400; var_s3 += 0x20) { - temp_ft3 = 2.0f * __sinf((s32) (((var_s3 / 32) + (D_80177DB0 / 2)) % 0x20U) * (M_PI / 16.0f)); + temp_ft3 = 2.0f * __sinf((s32) (((var_s3 / 32) + (gFrameCount / 2)) % 0x20U) * (M_PI / 16.0f)); for (var_v1 = 0; var_v1 < 0x20; var_v1++) { ((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 0x20U] = ((u16*) src)[var_s3 + var_v1]; } @@ -116,7 +116,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) { var_s0_2 = (u8*) dst; var_s4_2 = (u8*) src; for (var_s3 = 0; var_s3 < 0x1000; var_s3 += 0x40) { - temp_ft3 = 4.0f * __sinf((s32) (((var_s3 / 64) + (D_80177DB0 / 4)) % 0x20U) * (M_PI / 16.0f)); + temp_ft3 = 4.0f * __sinf((s32) (((var_s3 / 64) + (gFrameCount / 4)) % 0x20U) * (M_PI / 16.0f)); for (var_v1 = 0; var_v1 < 0x40; var_v1++) { var_s0_2[var_s3 + (temp_ft3 + var_v1) % 0x40U] = var_s4_2[var_s3 + var_v1]; } @@ -744,14 +744,14 @@ u16* func_8009F7B4(Gfx** gfxPtr, u8 width, u8 height) { gDPSetScissorFrac((*gfxPtr)++, G_SC_NON_INTERLACE, 0, 0, width * 4.0f, height * 4.0f); gDPSetDepthImage((*gfxPtr)++, &gZBuffer); gDPSetColorImage((*gfxPtr)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, &gZBuffer); - gDPSetFillColor((*gfxPtr)++, 0xFFFCFFFC); + gDPSetFillColor((*gfxPtr)++, FILL_COLOR(GPACK_ZDZ(G_MAXFBZ, 0))); gDPFillRectangle((*gfxPtr)++, 0, 0, width - 1, height - 1); gDPPipeSync((*gfxPtr)++); gDPSetDepthSource((*gfxPtr)++, G_ZS_PIXEL); gDPSetColorImage((*gfxPtr)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, spB4); gDPSetColorDither((*gfxPtr)++, G_CD_DISABLE); gDPSetFillColor((*gfxPtr)++, 0); - gDPSetFillColor((*gfxPtr)++, ((D_80161A36 | 1) << 0x10) | (D_80161A36 | 1)); + gDPSetFillColor((*gfxPtr)++, FILL_COLOR(gBgColor | 1)); gDPFillRectangle((*gfxPtr)++, 0, 0, width - 1, height - 1); gDPPipeSync((*gfxPtr)++); guPerspective(gGfxMtx, &norm, D_80161A3C, (f32) width / height, 10.0f, 12800.0f, 1.0f); diff --git a/src/main/fox_edata.c b/src/main/fox_edata.c index a0af4e03..f95e1895 100644 --- a/src/main/fox_edata.c +++ b/src/main/fox_edata.c @@ -5,19 +5,19 @@ f32* D_800CF964[] = { NULL }; void func_800594F0(Object_80* arg0) { - RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6007D90); - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } void func_800595D0(Object_80* arg0) { - RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6007CF0); - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } void func_800596B0(Object_2F4* arg0) { diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c index 1afececf..c3e2355e 100644 --- a/src/main/fox_edata_1C.c +++ b/src/main/fox_edata_1C.c @@ -1,8 +1,7 @@ #include "global.h" // these are overlay functions. They will need to be replaced with their proper overlay names -void func_80187530(Object*); -void func_8018753C(Object*); + void func_8018756C(Object*); void func_801875A4(Object*); void func_80187650(Object*); @@ -192,13 +191,11 @@ void func_801A2A78(Object*); void func_801A2B24(Object*); void func_801A2DD8(Object*); void func_801A3240(Object*); -void func_801A3BD4(Object*); void func_801A3E98(Object*); void func_801A43BC(Object*); void func_801A46A0(Object*); void func_801A4A64(Object*); void func_801A4B24(Object*); -void func_801A4CB0(Object*); void func_801A4E44(Object*); void func_801A52B8(Object*); void func_801A54E8(Object*); @@ -279,8 +276,13 @@ f32 D_800CBEA8[] = { 1.0f, 0.0f, 75.0f, 0.0f, 75.0f, 0.0f, 75.0f, }; f32 D_800CBEC4[] = { - 1.0f, 0.0f, 100.0f, 0.0f, 100.0f, 0.0f, 100.0f, 1.0f, 0.0f, 150.0f, 0.0f, - 150.0f, 0.0f, 150.0f, 1.0f, 0.0f, 200.0f, 0.0f, 200.0f, 0.0f, 200.0f, + 1.0f, 0.0f, 100.0f, 0.0f, 100.0f, 0.0f, 100.0f, +}; +f32 D_800CBEE0[] = { + 1.0f, 0.0f, 150.0f, 0.0f, 150.0f, 0.0f, 150.0f, +}; +f32 D_800CBEFC[] = { + 1.0f, 0.0f, 200.0f, 0.0f, 200.0f, 0.0f, 200.0f, }; f32 D_800CBF18[] = { 1.0f, -113.0f, 61.0f, 98.0f, 100.0f, 0.0f, 219.0f, @@ -316,414 +318,423 @@ f32 D_800CC01C[] = { 1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f, }; f32 D_800CC038[] = { - 1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f, 1.0f, 0.0f, 140.0f, 0.0f, 170.0f, - 0.0f, 140.0f, 4.0f, 0.0f, 140.0f, -675.0f, 140.0f, 0.0f, 810.0f, 0.0f, 140.0f, 675.0f, - 140.0f, 0.0f, 810.0f, 0.0f, 140.0f, 0.0f, 810.0f, 675.0f, 140.0f, 0.0f, 140.0f, 0.0f, - 810.0f, -675.0f, 140.0f, 1.0f, 0.0f, 140.0f, 0.0f, 140.0f, 0.0f, 1800.0f, 2.0f, 0.0f, - 140.0f, 0.0f, 140.0f, 0.0f, 1800.0f, 1.0f, 141.0f, 1.0f, 1800.0f, 1.0f, 140.0f, + 1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f, +}; +f32 D_800CC054[] = { + 1.0f, 0.0f, 140.0f, 0.0f, 170.0f, 0.0f, 140.0f, +}; +f32 D_800CC070[] = { + 4.0f, 0.0f, 140.0f, -675.0f, 140.0f, 0.0f, 810.0f, 0.0f, 140.0f, 675.0f, 140.0f, 0.0f, 810.0f, + 0.0f, 140.0f, 0.0f, 810.0f, 675.0f, 140.0f, 0.0f, 140.0f, 0.0f, 810.0f, -675.0f, 140.0f, +}; +f32 D_800CC0D4[] = { + 1.0f, 0.0f, 140.0f, 0.0f, 140.0f, 0.0f, 1800.0f, +}; +f32 D_800CC0F0[] = { + 2.0f, 0.0f, 140.0f, 0.0f, 140.0f, 0.0f, 1800.0f, 1.0f, 141.0f, 1.0f, 1800.0f, 1.0f, 140.0f, }; // clang-format off ObjectStruct_1C D_800CC124[0x190] = { - {(void*) D_6015F00, 0, (ObjectFunc) NULL, D_603E3E0, 800.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_602E9E0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_601BEC0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_602E7A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_60244A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_602E570, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_60132B0, 0, (ObjectFunc) NULL, D_603DCA4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_602E080, 0, (ObjectFunc) NULL, D_603DD40, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_60164F0, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6014500, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_602D5F0, 0, (ObjectFunc) NULL, D_603DDF0, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_601A7D0, 0, (ObjectFunc) NULL, D_603DE8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_6014B50, 0, (ObjectFunc) NULL, D_603DEF4, 500.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_6016580, 0, (ObjectFunc) NULL, D_603DF8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_601B560, 0, (ObjectFunc) func_80066EA8, D_603DFDC, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_60361F0, 0, (ObjectFunc) func_80066EA8, D_603E014, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_6018E80, 0, (ObjectFunc) func_80066EA8, D_603E030, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_6035F10, 0, (ObjectFunc) func_80066EA8, D_603E09C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) func_8018753C, 1, (ObjectFunc) func_80187530, D_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_60153B0, 0, (ObjectFunc) NULL, D_603E118, 100.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_601F5A0, 0, (ObjectFunc) NULL, D_603E14C, 500.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_60137B0, 0, (ObjectFunc) NULL, D_603E1B4, 400.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_6006A80, 0, (ObjectFunc) NULL, D_603E21C, 400.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_6016270, 0, (ObjectFunc) NULL, D_603E4A0, 200.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6010E00, 0, (ObjectFunc) NULL, D_603E9EC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6014670, 0, (ObjectFunc) NULL, D_603EA08, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6010A50, 0, (ObjectFunc) NULL, D_603EA74, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_60143E0, 0, (ObjectFunc) NULL, D_603EAE0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6014A20, 0, (ObjectFunc) NULL, D_603EB0C, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60064FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006518, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006564, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60065B0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60065FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006648, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006694, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60066E0_f32, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_600672C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006778, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059AEC, 1, (ObjectFunc) func_8006D350, D_800CBF34, 6000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059F68, 1, (ObjectFunc) func_80066D5C, D_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059FDC, 1, (ObjectFunc) func_80066EA8, D_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059BBC, 1, (ObjectFunc) func_8006B95C, D_603E514, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6024AC0, 0, (ObjectFunc) NULL, D_602B9EC, 200.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_600F560, 0, (ObjectFunc) NULL, D_602BA20, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_600EC90, 0, (ObjectFunc) NULL, D_602BAE4, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_600E820, 0, (ObjectFunc) NULL, D_602BBD8, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_601FCB0, 0, (ObjectFunc) NULL, D_602BC54, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_800594F0, 1, (ObjectFunc) NULL, D_601B4E0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_800595D0, 1, (ObjectFunc) NULL, D_601B4FC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6007410, 0, (ObjectFunc) NULL, D_601B518, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6006F50, 0, (ObjectFunc) NULL, D_601B584, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6005780, 0, (ObjectFunc) func_80193540, D_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6003610, 0, (ObjectFunc) NULL, D_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6000E00, 0, (ObjectFunc) func_8006AA98, D_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6013B50, 0, (ObjectFunc) NULL, D_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) func_8018F31C, 2, (ObjectFunc) func_8018F044, D_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) func_8018F8B8, 1, (ObjectFunc) func_8018F4D8, D_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_700BE00, 0, (ObjectFunc) NULL, D_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6024010, 0, (ObjectFunc) NULL, D_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 }, - {(void*) D_6027180, 0, (ObjectFunc) NULL, D_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 }, - {(void*) func_801A2A78, 1, (ObjectFunc) NULL, D_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 }, - {(void*) D_60270E0, 0, (ObjectFunc) NULL, D_800CBF34, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_6013960, 0, (ObjectFunc) NULL, D_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 }, - {(void*) D_600AF40, 0, (ObjectFunc) NULL, D_60368E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_801A6608, 1, (ObjectFunc) NULL, D_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_601F1D0, 0, (ObjectFunc) NULL, D_60362D8, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, - {(void*) D_60238F0, 0, (ObjectFunc) NULL, D_6036328, 2000.0f, 0, 0, 5, 0, 0.0f, 0 }, - {(void*) D_601B7C0, 0, (ObjectFunc) NULL, D_60362F4, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, - {(void*) D_6030500, 0, (ObjectFunc) NULL, D_6036370, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_602DAE0, 0, (ObjectFunc) NULL, D_603638C, 1900.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_6027900, 0, (ObjectFunc) NULL, D_60363B8, 1900.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_602DB80, 0, (ObjectFunc) NULL, D_60363E4, 1100.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_6030630, 0, (ObjectFunc) NULL, D_6036410, 1100.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_602DC20, 0, (ObjectFunc) NULL, D_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_601B0D0, 0, (ObjectFunc) NULL, D_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_60075D0, 0, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A3240, 1, (ObjectFunc) func_801A2DD8, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) func_801A0BD8, D_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_60097E0, 0, (ObjectFunc) NULL, D_6034478, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_601D730, 0, (ObjectFunc) NULL, D_603450C, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_60102C0, 0, (ObjectFunc) NULL, D_6034588, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_60036A0, 0, (ObjectFunc) func_801A4E44, D_6034664, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_6005360, 0, (ObjectFunc) NULL, D_6034770, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) func_80074F90, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_600F6C0, 0, (ObjectFunc) func_801A52B8, D_60347F0, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_601B610, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_601C6A0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_60188D0, 0, (ObjectFunc) NULL, D_603486C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_60034D0, 0, (ObjectFunc) NULL, D_60347D4, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_60231C0, 0, (ObjectFunc) NULL, D_6030C60, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6011EE0, 0, (ObjectFunc) NULL, D_6030C7C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_6015730, 0, (ObjectFunc) NULL, D_6030D74, 2000.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_601DE60, 0, (ObjectFunc) NULL, D_6030DF8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_602B4C0, 0, (ObjectFunc) NULL, D_6030E14, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_600EE10, 0, (ObjectFunc) NULL, D_6030E30, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_60120F0, 0, (ObjectFunc) NULL, D_6030E4C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_600EEF0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_600BF80, 0, (ObjectFunc) NULL, D_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) func_801BE1FC, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_9005C80, 0, (ObjectFunc) func_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 }, - {(void*) D_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, - {(void*) D_900F060, 0, (ObjectFunc) NULL, D_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, - {(void*) D_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, - {(void*) func_801935D4, 1, (ObjectFunc) func_8019356C, D_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) func_8019350C, 1, (ObjectFunc) func_80193380, D_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, - {(void*) D_60030F0, 0, (ObjectFunc) NULL, D_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, - {(void*) D_6003000, 0, (ObjectFunc) NULL, D_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, - {(void*) D_6006890_Gfx, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, - {(void*) D_6002990, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, - {(void*) D_6004170, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 }, - {(void*) D_3017600, 0, (ObjectFunc) NULL, D_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_3017600, 0, (ObjectFunc) NULL, D_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_30173C0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_30174E0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_301B080, 0, (ObjectFunc) NULL, D_302EE9C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_3016B00, 0, (ObjectFunc) NULL, D_302EE00, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_3013780, 0, (ObjectFunc) NULL, D_302ED4C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_3013580, 0, (ObjectFunc) NULL, D_302ED98, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_3012ED0, 0, (ObjectFunc) NULL, D_302EDB4, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_60079B0, 0, (ObjectFunc) NULL, D_600FF80, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6007D80, 0, (ObjectFunc) NULL, D_600FFA0, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6006310, 0, (ObjectFunc) NULL, D_600FFC0, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_60066E0_Gfx, 0, (ObjectFunc) NULL, D_600FEB8, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_600F4C0, 0, (ObjectFunc) NULL, D_6011C10, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_600B8B0, 0, (ObjectFunc) NULL, D_6011C48, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_600BAF0, 0, (ObjectFunc) NULL, D_601115C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80197CB8, 1, (ObjectFunc) NULL, D_6034368, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6001DA0, 0, (ObjectFunc) NULL, D_600924C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6001360, 0, (ObjectFunc) NULL, D_60092E8, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6008370, 0, (ObjectFunc) NULL, D_601668C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_6010960, 0, (ObjectFunc) NULL, D_6016714, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_602F7C0, 0, (ObjectFunc) func_80068FE0, D_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_601C9B0, 0, (ObjectFunc) func_80068FE0, D_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_600A420, 0, (ObjectFunc) func_80068FE0, D_600FE9C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059C40, 1, (ObjectFunc) NULL, D_800CBF34, 1800.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_602DCA0, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_601F500, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059C34, 1, (ObjectFunc) func_80066E8C, D_800CBF34, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80059850, 1, (ObjectFunc) NULL, D_800CBF34, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) D_60023B0, 0, (ObjectFunc) func_8018F038, D_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_801875A4, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_801922DC, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_80192358, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_801923C0, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_8019243C, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_8018BAAC, 2, (ObjectFunc) func_8018AED0, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, - {(void*) func_8018BBA4, 2, (ObjectFunc) func_8018B15C, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, - {(void*) func_8018BBF8, 2, (ObjectFunc) func_8018B418, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, - {(void*) func_8018BD7C, 2, (ObjectFunc) func_8018B58C, D_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 }, - {(void*) func_8005B6A4, 1, (ObjectFunc) func_80066A80, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 1 }, - {(void*) D_6018C00, 0, (ObjectFunc) func_8018756C, D_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, - {(void*) func_8005B71C, 1, (ObjectFunc) func_80187650, D_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 }, - {(void*) func_8018DA6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, - {(void*) func_8018DAEC, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, - {(void*) func_8018DB6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, - {(void*) func_8005B7CC, 1, (ObjectFunc) func_8018795C, D_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, - {(void*) D_6018450, 0, (ObjectFunc) func_801877C4, D_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, - {(void*) func_801BEC74, 1, (ObjectFunc) func_801BEC68, D_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, - {(void*) func_8005A094, 1, (ObjectFunc) func_8006C008, D_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 }, - {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 }, - {(void*) func_8005B9A4, 1, (ObjectFunc) func_8006654C, D_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 }, - {(void*) func_8005BA30, 1, (ObjectFunc) func_800669A0, D_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 }, - {(void*) func_8006B74C, 1, (ObjectFunc) func_8006B094, D_800CC000, 200.0f, 0, 1, 39, 0, 0.0f, 1 }, - {(void*) func_8004FEC0, 1, (ObjectFunc) func_8004F8AC, D_800CBF34, 20000.0f, 0, 1, 39, 0, 0.0f, 0 }, - {(void*) func_80059BF0, 1, (ObjectFunc) func_8006BB78, D_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, - {(void*) func_80035448, 1, (ObjectFunc) func_800319AC, D_800CC038, 20000.0f, 0, 1, 39, 1, 1.0f, 1 }, - {(void*) func_80035448, 1, (ObjectFunc) func_80092EC0, D_800CC01C, 20000.0f, 0, 0, 39, 1, 0.0f, 0 }, - {(void*) func_80188448, 1, (ObjectFunc) func_801880E4, D_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 }, - {(void*) func_80074FF0, 1, (ObjectFunc) func_80072594, D_800CBF34, 2000.0f, 0, 1, 39, 0, 0.0f, 1 }, - {(void*) func_800598E8, 1, (ObjectFunc) func_8006AC08, D_602F684, 100.0f, 0, 1, 39, 0, 1.0f, 1 }, - {(void*) func_80059A24, 1, (ObjectFunc) func_8006AD18, D_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 }, - {(void*) func_8018F884, 1, (ObjectFunc) func_8018F330, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) func_801A4CB0, 1, (ObjectFunc) func_801A3BD4, D_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 }, - {(void*) func_801A12C4, 1, (ObjectFunc) func_8019C778, D_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A12C4, 1, (ObjectFunc) func_801AC438, D_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801AC294, 2, (ObjectFunc) func_801A7E7C, D_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A12C4, 1, (ObjectFunc) func_8019EA60, D_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A12C4, 1, (ObjectFunc) func_8019D700, D_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A12C4, 1, (ObjectFunc) func_8019CE88, D_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A12C4, 1, (ObjectFunc) func_8019E410, D_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A12C4, 1, (ObjectFunc) func_8019FF9C, D_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A12C4, 1, (ObjectFunc) func_8019EE68, D_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A43BC, 1, (ObjectFunc) func_801A3E98, D_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A4A64, 1, (ObjectFunc) func_801A46A0, D_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 }, - {(void*) func_801A5F90, 1, (ObjectFunc) func_801A5E54, D_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A6100, 1, (ObjectFunc) func_801A5FD0, D_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A6540, 1, (ObjectFunc) func_801A6144, D_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801A68EC, 1, (ObjectFunc) func_801A67C8, D_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801ADAC8, 1, (ObjectFunc) func_801AD6F0, D_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801AE2C0, 1, (ObjectFunc) func_801ADD68, D_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, - {(void*) func_801AEEFC, 1, (ObjectFunc) func_801AEC04, D_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, - {(void*) func_801A54E8, 1, (ObjectFunc) func_801A4B24, D_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_80189194, D_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, - {(void*) D_700AB70, 0, (ObjectFunc) func_8018AB44, D_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 }, - {(void*) func_80189AFC, 1, (ObjectFunc) func_801895B8, D_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 }, - {(void*) func_8018E5B4, 1, (ObjectFunc) func_8018E54C, D_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 }, - {(void*) func_8018EF14, 1, (ObjectFunc) func_8018E5F8, D_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 }, - {(void*) func_8018E2D8, 1, (ObjectFunc) func_8018C8A8, D_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 }, - {(void*) func_8018AABC, 1, (ObjectFunc) func_8018A544, D_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 }, - {(void*) func_8018BE84, 1, (ObjectFunc) func_8018B9D0, D_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 }, - {(void*) func_8018B6AC, 1, (ObjectFunc) func_8018B268, D_6006890_f32, 0.0f, 0, 0, 39, 1, 20.0f, 1 }, - {(void*) func_8018A1C0, 1, (ObjectFunc) func_80189CC8, D_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 }, - {(void*) func_80077218, 1, (ObjectFunc) func_800771CC, D_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 }, - {(void*) func_80190430, 2, (ObjectFunc) func_801904CC, D_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 }, - {(void*) func_80190F08, 1, (ObjectFunc) func_80190A00, D_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_8006A978, 1, (ObjectFunc) func_8006A96C, D_800CBF34, 200.0f, 0, 0, 40, 0, 0.0f, 2 }, - {(void*) func_801914C4, 2, (ObjectFunc) func_80191010, D_800CBE8C, 200.0f, 0, 1, 40, 0, 1.0f, 1 }, - {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_80191B4C, 1, (ObjectFunc) func_80191680, D_800CBE8C, 1500.0f, 0, 1, 40, 0, 20.0f, 0 }, - {(void*) func_80191DB0, 1, (ObjectFunc) func_80191BC4, D_800CBE70, 1500.0f, 0, 1, 40, 0, 0.0f, 0 }, - {(void*) func_80191FFC, 2, (ObjectFunc) func_80192094, D_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 }, - {(void*) func_80192C18, 2, (ObjectFunc) func_80192834, D_800CBE8C, 0.0f, 0, 1, 40, 0, 1.0f, 1 }, - {(void*) func_80193240, 2, (ObjectFunc) func_80192E64, D_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 }, - {(void*) func_8019983C, 1, (ObjectFunc) func_8019969C, D_800CBE8C, 200.0f, 0, 0, 40, 0, 1.0f, 0 }, - {(void*) func_80199E24, 1, (ObjectFunc) func_80199A28, D_800CBE8C, 2000.0f, 0, 0, 40, 0, 1.0f, 0 }, - {(void*) func_8019D3C4, 1, (ObjectFunc) func_8019D15C, D_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_8019A1FC, 1, (ObjectFunc) func_80199F10, D_800CBEA8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_8019ACCC, 1, (ObjectFunc) func_8019A5D4, D_800CBEC4, 5000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_8019B7DC, 1, (ObjectFunc) func_8019B548, D_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_8019BDE0, 2, (ObjectFunc) func_8019B854, D_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 }, - {(void*) func_8019C1CC, 1, (ObjectFunc) func_8019BE48, D_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 }, - {(void*) func_8019C83C, 1, (ObjectFunc) func_8019C454, D_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_8019CE58, 1, (ObjectFunc) func_8019CBEC, D_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801AE168, 1, (ObjectFunc) func_801AD6C0, D_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_801AEB44, 1, (ObjectFunc) func_801AE3D8, D_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_801B099C, 1, (ObjectFunc) func_801AFA5C, D_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_801B0EC0, 1, (ObjectFunc) func_801B0B60, D_800CBE8C, 200.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_801B619C, 2, (ObjectFunc) func_801B638C, D_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_801B90DC, 2, (ObjectFunc) func_801B7C78, D_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_801B504C, 2, (ObjectFunc) func_801B50E8, D_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 }, - {(void*) func_801B7A24, 2, (ObjectFunc) func_801B6FF8, D_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_801BA108, 2, (ObjectFunc) func_801B91A4, D_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 }, - {(void*) func_801BA4E4, 1, (ObjectFunc) func_801BA26C, D_800CBE8C, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801BAD7C, 1, (ObjectFunc) func_801BA6A4, D_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 }, - {(void*) func_801BB204, 2, (ObjectFunc) func_801BADF8, D_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801BC930, 2, (ObjectFunc) func_801BB79C, D_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_801BDE6C, 1, (ObjectFunc) func_801BD54C, D_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801BD264, 1, (ObjectFunc) func_801BC9A0, D_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_801BEB1C, 1, (ObjectFunc) func_801BE3F8, D_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_8002E694, 2, (ObjectFunc) func_8002E670, D_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 }, - {(void*) func_8002E6DC, 1, (ObjectFunc) func_8002E6B8, D_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 }, - {(void*) func_80188FE4, 2, (ObjectFunc) func_80188AD0, D_600FF30, 0.0f, 0, 0, 39, 0, 220.0f, 1 }, - {(void*) func_8019E3A8, 1, (ObjectFunc) func_8019E234, D_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 }, - {(void*) func_8019F7AC, 1, (ObjectFunc) func_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, - {(void*) func_8019F7AC, 1, (ObjectFunc) func_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, - {(void*) func_8019F7AC, 1, (ObjectFunc) func_8019F20C, D_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, - {(void*) NULL, 1, (ObjectFunc) func_8019EA7C, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 }, - {(void*) NULL, 1, (ObjectFunc) func_801A003C, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 }, - {(void*) D_900DD20, 0, (ObjectFunc) func_80192518, D_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_80192E2C, 1, (ObjectFunc) func_80192CD4, D_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) D_901DA50, 0, (ObjectFunc) func_80192CD4, D_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) D_9023AD0, 0, (ObjectFunc) func_80192EB0, D_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) func_801934D0, 1, (ObjectFunc) func_801933DC, D_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80193244, 1, (ObjectFunc) func_80192E94, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 }, - {(void*) func_80188660, 1, (ObjectFunc) func_80188528, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_80189724, D_800CBF34, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_801893B8, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 }, - {(void*) func_800596B0, 1, (ObjectFunc) func_80189470, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_8018933C, D_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, - {(void*) func_80067874, 1, (ObjectFunc) func_8006753C, D_800CBEA8, 1000.0f, 0, 0, 0, 0, 1.0f, 0 }, - {(void*) func_8018AA74, 2, (ObjectFunc) func_80189058, D_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 }, - {(void*) func_8018ECAC, 1, (ObjectFunc) func_8018C19C, D_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_8018ED78, 1, (ObjectFunc) func_8018DDAC, D_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_8018EE84, 1, (ObjectFunc) func_8018E290, D_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_8018EF90, 1, (ObjectFunc) func_8018E76C, D_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_8018BACC, 1, (ObjectFunc) func_8018978C, D_602F75C, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_801887D0, 1, (ObjectFunc) func_80188344, D_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_80042FC4, 2, (ObjectFunc) func_80042FB8, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_80042FE8, 1, (ObjectFunc) func_80042FDC, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_801BEC5C, 1, (ObjectFunc) func_801BEC50, D_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_8018C54C, 1, (ObjectFunc) func_80187944, D_6028454, 2000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_80193434, 2, (ObjectFunc) func_80190078, D_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 }, - {(void*) func_8018FF84, 2, (ObjectFunc) func_8018FE38, D_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, - {(void*) func_80190020, 2, (ObjectFunc) func_8018FF20, D_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, - {(void*) func_801982A8, 1, (ObjectFunc) func_80197A94,D_E6A810_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 }, - {(void*) func_801949DC, 2, (ObjectFunc) func_80194A84, D_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 }, - {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - {(void*) func_8002E604, 1, (ObjectFunc) func_8002E5E0, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - {(void*) func_8002E64C, 1, (ObjectFunc) func_8002E628, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - {(void*) func_80191AFC, 2, (ObjectFunc) func_801912FC, D_6011C80, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - {(void*) func_80196288, 2, (ObjectFunc) func_80196210, D_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - {(void*) func_8019E98C, 1, (ObjectFunc) func_8019E454, D_6009388, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_8019E2C4, 2, (ObjectFunc) func_8019C888, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_801A71B8, 2, (ObjectFunc) func_801A5B3C, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_801968F4, 1, (ObjectFunc) func_801946C4, D_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_80193B1C, 1, (ObjectFunc) func_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, - {(void*) func_801B4D84, 2, (ObjectFunc) func_801B134C, D_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_801985E4, 1, (ObjectFunc) func_80194398,D_DF4260_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 }, - {(void*) func_801928C8, 2, (ObjectFunc) func_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_8018B8C0, 1, (ObjectFunc) func_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, - {(void*) func_8005CC9C, 1, (ObjectFunc) func_80067F6C, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_8005C5F0, 1, (ObjectFunc) func_80068914, D_800CBF38, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_8005C900, 1, (ObjectFunc) func_80068020, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_8005C9C0, 1, (ObjectFunc) func_800685D8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_8005CDA8, 1, (ObjectFunc) func_80068688, D_800CBF70, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_8005CB44, 1, (ObjectFunc) func_80067BEC, D_800CBFC8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_80068C48, D_800CBF18, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_1022120, 0, (ObjectFunc) func_80067B1C, D_800CBE8C, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_8005CA80, 1, (ObjectFunc) func_800685F8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_3007650, 0, (ObjectFunc) func_80068618, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) D_6006140, 0, (ObjectFunc) func_80198968, D_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D2F4, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D748, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D8A8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_8007E330, 1, (ObjectFunc) func_8007E298, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_8007CAF0, 1, (ObjectFunc) func_8007C9E0, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_8007868C, 1, (ObjectFunc) func_8007E014, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_8007879C, 1, (ObjectFunc) func_8007E258, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_800788B0, 1, (ObjectFunc) func_8007F438, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 }, - {(void*) func_800783C0, 1, (ObjectFunc) func_8007B758, NULL, 100.0f, 1, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80078A64, 1, (ObjectFunc) func_8007F6B0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_8007F958, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_8007FBE0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80078438, 1, (ObjectFunc) func_8007E3E4, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_800784B4, 1, (ObjectFunc) func_8007B62C, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_80078B8C, 1, (ObjectFunc) func_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, - {(void*) func_80197C64, 1, (ObjectFunc) func_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, - {(void*) func_80078AEC, 1, (ObjectFunc) func_800802B8, NULL, 100.0f, 1, 0, 20, 1, 0.0f, 0 }, - {(void*) func_80078C84, 1, (ObjectFunc) func_800802F8, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 }, - {(void*) func_800798F0, 1, (ObjectFunc) func_8007968C, NULL, 100.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80192A68, 1, (ObjectFunc) func_80192984, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_8007AA60, 1, (ObjectFunc) func_8007A994, NULL, -100.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BE54, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BDE0, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BCE8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_80094BBC, 1, (ObjectFunc) func_80094954, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_8007B9DC, 1, (ObjectFunc) func_8007B960, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_8007E5CC, 1, (ObjectFunc) func_8007E45C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80078550, 1, (ObjectFunc) func_801AC918, NULL, 100.0f, 1, 2, 0, 0, 0.0f, 0 }, - {(void*) func_80078604, 1, (ObjectFunc) func_8007E648, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80188FA8, 1, (ObjectFunc) func_80188F60, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_8018DCE4, 1, (ObjectFunc) func_80188CAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, - {(void*) func_8018DBEC, 1, (ObjectFunc) func_80188FAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, - {(void*) func_8018DE14, 1, (ObjectFunc) func_80189114, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, - {(void*) func_80077A00, 1, (ObjectFunc) func_8007AB50, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_8007A748, NULL, 500.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) func_8007DED4, 1, (ObjectFunc) func_8007DB70, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, - {(void*) func_8007DAE4, 1, (ObjectFunc) func_8007DA58, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80078CE8, 1, (ObjectFunc) func_80080360, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 }, - {(void*) func_80078BE0, 1, (ObjectFunc) func_800802D8, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 }, - {(void*) func_801A5AF0, 1, (ObjectFunc) func_801A57D0, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, - {(void*) func_801AEAA0, 1, (ObjectFunc) func_801AE87C, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_801A5D68, 1, (ObjectFunc) func_801A5B4C, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, - {(void*) func_80077A7C, 1, (ObjectFunc) func_8007B0F4, NULL, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_8007B040, NULL, 200.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) func_8007A3C0, 1, (ObjectFunc) func_8007A28C, NULL, 10000.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80077B84, 1, (ObjectFunc) func_8007B3B8, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80078038, 1, (ObjectFunc) func_8007B5C0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_8007C250, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_8007C8C4, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80077B78, 1, (ObjectFunc) func_8007B670, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_800780F8, 1, (ObjectFunc) func_8007B67C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, - {(void*) NULL, 1, (ObjectFunc) func_8007C50C, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80083B8C, 1, (ObjectFunc) func_800837EC, NULL, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, - {(void*) func_801A0AF0, 1, (ObjectFunc) func_801A0120, NULL, 300.0f, 1, 2, 10, 0, 0.0f, 0 }, - {(void*) func_80078F78, 1, (ObjectFunc) func_80078EBC, NULL, 300.0f, 1, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80080D04, 1, (ObjectFunc) func_80080ACC, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, - {(void*) func_80082F78, 1, (ObjectFunc) func_80081C5C, NULL, 300.0f, 0, 1, 40, 0, 0.0f, 0 }, - {(void*) func_8018CF98, 1, (ObjectFunc) func_8018CAD4, NULL, 2000.0f, 0, 1, 40, 2, 0.0f, 0 }, - {(void*) func_80191180, 1, (ObjectFunc) func_80191054, NULL, 2000.0f, 0, 1, 20, 0, 0.0f, 0 }, - {(void*) func_8008092C, 1, (ObjectFunc) func_8008040C, NULL, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, - {(void*) func_80084194, 1, (ObjectFunc) func_80083FA8, NULL, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_0, */ {(void*) D_6015F00, 0, (ObjectFunc) NULL, D_603E3E0, 800.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_1, */ {(void*) D_602E9E0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_2, */ {(void*) D_601BEC0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_3, */ {(void*) D_602E7A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_4, */ {(void*) D_60244A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_5, */ {(void*) D_602E570, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_6, */ {(void*) D_60132B0, 0, (ObjectFunc) NULL, D_603DCA4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_7, */ {(void*) D_602E080, 0, (ObjectFunc) NULL, D_603DD40, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_8, */ {(void*) D_60164F0, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_9, */ {(void*) D_6014500, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_10, */ {(void*) D_602D5F0, 0, (ObjectFunc) NULL, D_603DDF0, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_11, */ {(void*) D_601A7D0, 0, (ObjectFunc) NULL, D_603DE8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_12, */ {(void*) D_6014B50, 0, (ObjectFunc) NULL, D_603DEF4, 500.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_13, */ {(void*) D_6016580, 0, (ObjectFunc) NULL, D_603DF8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_14, */ {(void*) D_601B560, 0, (ObjectFunc) func_80066EA8, D_603DFDC, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_15, */ {(void*) D_60361F0, 0, (ObjectFunc) func_80066EA8, D_603E014, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_16, */ {(void*) D_6018E80, 0, (ObjectFunc) func_80066EA8, D_603E030, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_17, */ {(void*) D_6035F10, 0, (ObjectFunc) func_80066EA8, D_603E09C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_18, */ {(void*) func_DF4260_8018753C, 1, (ObjectFunc) func_DF4260_80187530, D_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_19, */ {(void*) D_60153B0, 0, (ObjectFunc) NULL, D_603E118, 100.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_20, */ {(void*) D_601F5A0, 0, (ObjectFunc) NULL, D_603E14C, 500.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_21, */ {(void*) D_60137B0, 0, (ObjectFunc) NULL, D_603E1B4, 400.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_22, */ {(void*) D_6006A80, 0, (ObjectFunc) NULL, D_603E21C, 400.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_23, */ {(void*) D_6016270, 0, (ObjectFunc) NULL, D_603E4A0, 200.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_24, */ {(void*) D_6010E00, 0, (ObjectFunc) NULL, D_603E9EC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_25, */ {(void*) D_6014670, 0, (ObjectFunc) NULL, D_603EA08, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_26, */ {(void*) D_6010A50, 0, (ObjectFunc) NULL, D_603EA74, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_27, */ {(void*) D_60143E0, 0, (ObjectFunc) NULL, D_603EAE0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_28, */ {(void*) D_6014A20, 0, (ObjectFunc) NULL, D_603EB0C, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_29, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60064FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_30, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006518, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_31, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006564, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_32, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60065B0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_33, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60065FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_34, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006648, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_35, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006694, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_36, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60066E0_f32, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_37, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_600672C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_38, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006778, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_39, */ {(void*) func_80059AEC, 1, (ObjectFunc) func_8006D350, D_800CBF34, 6000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_40, */ {(void*) func_80059F68, 1, (ObjectFunc) func_80066D5C, D_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_41, */ {(void*) func_80059FDC, 1, (ObjectFunc) func_80066EA8, D_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_42, */ {(void*) func_80059BBC, 1, (ObjectFunc) func_8006B95C, D_603E514, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_43, */ {(void*) D_6024AC0, 0, (ObjectFunc) NULL, D_602B9EC, 200.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_44, */ {(void*) D_600F560, 0, (ObjectFunc) NULL, D_602BA20, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_45, */ {(void*) D_600EC90, 0, (ObjectFunc) NULL, D_602BAE4, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_46, */ {(void*) D_600E820, 0, (ObjectFunc) NULL, D_602BBD8, 1500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_47, */ {(void*) D_601FCB0, 0, (ObjectFunc) NULL, D_602BC54, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_48, */ {(void*) func_800594F0, 1, (ObjectFunc) NULL, D_601B4E0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_49, */ {(void*) func_800595D0, 1, (ObjectFunc) NULL, D_601B4FC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_50, */ {(void*) D_6007410, 0, (ObjectFunc) NULL, D_601B518, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_51, */ {(void*) D_6006F50, 0, (ObjectFunc) NULL, D_601B584, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_52, */ {(void*) D_6005780, 0, (ObjectFunc) func_80193540, D_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_53, */ {(void*) D_6003610, 0, (ObjectFunc) NULL, D_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_54, */ {(void*) D_6000E00, 0, (ObjectFunc) func_8006AA98, D_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_55, */ {(void*) D_6013B50, 0, (ObjectFunc) NULL, D_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_56, */ {(void*) func_8018F31C, 2, (ObjectFunc) func_8018F044, D_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_57, */ {(void*) func_8018F8B8, 1, (ObjectFunc) func_8018F4D8, D_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_58, */ {(void*) D_700BE00, 0, (ObjectFunc) NULL, D_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_59, */ {(void*) D_6024010, 0, (ObjectFunc) NULL, D_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJECT_80_60, */ {(void*) D_6027180, 0, (ObjectFunc) NULL, D_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJECT_80_61, */ {(void*) func_801A2A78, 1, (ObjectFunc) NULL, D_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJECT_80_62, */ {(void*) D_60270E0, 0, (ObjectFunc) NULL, D_800CBF34, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_63, */ {(void*) D_6013960, 0, (ObjectFunc) NULL, D_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJECT_80_64, */ {(void*) D_600AF40, 0, (ObjectFunc) NULL, D_60368E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_65, */ {(void*) func_801A6608, 1, (ObjectFunc) NULL, D_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_66, */ {(void*) D_601F1D0, 0, (ObjectFunc) NULL, D_60362D8, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJECT_80_67, */ {(void*) D_60238F0, 0, (ObjectFunc) NULL, D_6036328, 2000.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJECT_80_68, */ {(void*) D_601B7C0, 0, (ObjectFunc) NULL, D_60362F4, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJECT_80_69, */ {(void*) D_6030500, 0, (ObjectFunc) NULL, D_6036370, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_70, */ {(void*) D_602DAE0, 0, (ObjectFunc) NULL, D_603638C, 1900.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_71, */ {(void*) D_6027900, 0, (ObjectFunc) NULL, D_60363B8, 1900.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_72, */ {(void*) D_602DB80, 0, (ObjectFunc) NULL, D_60363E4, 1100.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_73, */ {(void*) D_6030630, 0, (ObjectFunc) NULL, D_6036410, 1100.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_74, */ {(void*) D_602DC20, 0, (ObjectFunc) NULL, D_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_75, */ {(void*) D_601B0D0, 0, (ObjectFunc) NULL, D_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_76, */ {(void*) D_60075D0, 0, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_77, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_78, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_79, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_80, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_81, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_82, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_83, */ {(void*) func_801A3240, 1, (ObjectFunc) func_801A2DD8, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_84, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_85, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_86, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_87, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_88, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_89, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_90, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_91, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_92, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_93, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_94, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_95, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_96, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_97, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_98, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_99, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_100 */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_101 */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_102 */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_103 */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_104 */ {(void*) func_801A23AC, 1, (ObjectFunc) func_801A0BD8, D_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_105 */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_106 */ {(void*) D_60097E0, 0, (ObjectFunc) NULL, D_6034478, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_107 */ {(void*) D_601D730, 0, (ObjectFunc) NULL, D_603450C, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_108 */ {(void*) D_60102C0, 0, (ObjectFunc) NULL, D_6034588, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_109 */ {(void*) D_60036A0, 0, (ObjectFunc) func_801A4E44, D_6034664, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_110 */ {(void*) D_6005360, 0, (ObjectFunc) NULL, D_6034770, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_111 */ {(void*) func_80074F90, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_112 */ {(void*) D_600F6C0, 0, (ObjectFunc) func_801A52B8, D_60347F0, 4000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_113 */ {(void*) D_601B610, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_114 */ {(void*) D_601C6A0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_115 */ {(void*) D_60188D0, 0, (ObjectFunc) NULL, D_603486C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_116 */ {(void*) D_60034D0, 0, (ObjectFunc) NULL, D_60347D4, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_117 */ {(void*) D_60231C0, 0, (ObjectFunc) NULL, D_6030C60, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_118 */ {(void*) D_6011EE0, 0, (ObjectFunc) NULL, D_6030C7C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_119 */ {(void*) D_6015730, 0, (ObjectFunc) NULL, D_6030D74, 2000.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_80_120 */ {(void*) D_601DE60, 0, (ObjectFunc) NULL, D_6030DF8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_121 */ {(void*) D_602B4C0, 0, (ObjectFunc) NULL, D_6030E14, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_122 */ {(void*) D_600EE10, 0, (ObjectFunc) NULL, D_6030E30, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_123 */ {(void*) D_60120F0, 0, (ObjectFunc) NULL, D_6030E4C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_124 */ {(void*) D_600EEF0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_125 */ {(void*) D_600BF80, 0, (ObjectFunc) NULL, D_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_126 */ {(void*) func_801BE1FC, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_127 */ {(void*) D_9005C80, 0, (ObjectFunc) func_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJECT_80_128 */ {(void*) D_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJECT_80_129 */ {(void*) D_900F060, 0, (ObjectFunc) NULL, D_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJECT_80_130 */ {(void*) D_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 }, + /* OBJECT_80_131 */ {(void*) func_801935D4, 1, (ObjectFunc) func_8019356C, D_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_132 */ {(void*) func_8019350C, 1, (ObjectFunc) func_80193380, D_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, + /* OBJECT_80_133 */ {(void*) D_60030F0, 0, (ObjectFunc) NULL, D_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJECT_80_134 */ {(void*) D_6003000, 0, (ObjectFunc) NULL, D_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, + /* OBJECT_80_135 */ {(void*) D_6006890_Gfx, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, + /* OBJECT_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, + /* OBJECT_80_137 */ {(void*) D_6004170, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 }, + /* OBJECT_80_138 */ {(void*) D_3017600, 0, (ObjectFunc) NULL, D_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_139 */ {(void*) D_3017600, 0, (ObjectFunc) NULL, D_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_140 */ {(void*) D_30173C0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_141 */ {(void*) D_30174E0, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_142 */ {(void*) D_301B080, 0, (ObjectFunc) NULL, D_302EE9C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_143 */ {(void*) D_3016B00, 0, (ObjectFunc) NULL, D_302EE00, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_144 */ {(void*) D_3013780, 0, (ObjectFunc) NULL, D_302ED4C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_145 */ {(void*) D_3013580, 0, (ObjectFunc) NULL, D_302ED98, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_146 */ {(void*) D_3012ED0, 0, (ObjectFunc) NULL, D_302EDB4, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_147 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_80_148 */ {(void*) D_60079B0, 0, (ObjectFunc) NULL, D_600FF80, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_149 */ {(void*) D_6007D80, 0, (ObjectFunc) NULL, D_600FFA0, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_150 */ {(void*) D_6006310, 0, (ObjectFunc) NULL, D_600FFC0, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_151 */ {(void*) D_60066E0_Gfx, 0, (ObjectFunc) NULL, D_600FEB8, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_152 */ {(void*) D_600F4C0, 0, (ObjectFunc) NULL, D_6011C10, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_153 */ {(void*) D_600B8B0, 0, (ObjectFunc) NULL, D_6011C48, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_154 */ {(void*) D_600BAF0, 0, (ObjectFunc) NULL, D_601115C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_155 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_156 */ {(void*) func_80197CB8, 1, (ObjectFunc) NULL, D_6034368, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_157 */ {(void*) D_6001DA0, 0, (ObjectFunc) NULL, D_600924C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_158 */ {(void*) D_6001360, 0, (ObjectFunc) NULL, D_60092E8, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_159 */ {(void*) D_6008370, 0, (ObjectFunc) NULL, D_601668C, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_80_160 */ {(void*) D_6010960, 0, (ObjectFunc) NULL, D_6016714, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_4C_161 */ {(void*) D_602F7C0, 0, (ObjectFunc) func_80068FE0, D_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_4C_162 */ {(void*) D_601C9B0, 0, (ObjectFunc) func_80068FE0, D_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_4C_163 */ {(void*) D_600A420, 0, (ObjectFunc) func_80068FE0, D_600FE9C, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_4C_164 */ {(void*) func_80059C40, 1, (ObjectFunc) NULL, D_800CBF34, 1800.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_4C_165 */ {(void*) D_602DCA0, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_4C_166 */ {(void*) D_601F500, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_4C_167 */ {(void*) func_80059C34, 1, (ObjectFunc) func_80066E8C, D_800CBF34, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_4C_168 */ {(void*) func_80059850, 1, (ObjectFunc) NULL, D_800CBF34, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_4C_169 */ {(void*) D_60023B0, 0, (ObjectFunc) func_8018F038, D_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_4C_170 */ {(void*) NULL, 1, (ObjectFunc) func_801875A4, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_4C_171 */ {(void*) NULL, 1, (ObjectFunc) func_801922DC, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_4C_172 */ {(void*) NULL, 1, (ObjectFunc) func_80192358, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_4C_173 */ {(void*) NULL, 1, (ObjectFunc) func_801923C0, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_4C_174 */ {(void*) NULL, 1, (ObjectFunc) func_8019243C, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_4C_175 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_2F4_176 */ {(void*) func_8018BAAC, 2, (ObjectFunc) func_8018AED0, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, + /* OBJECT_2F4_177 */ {(void*) func_8018BBA4, 2, (ObjectFunc) func_8018B15C, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, + /* OBJECT_2F4_178 */ {(void*) func_8018BBF8, 2, (ObjectFunc) func_8018B418, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 }, + /* OBJECT_2F4_179 */ {(void*) func_8018BD7C, 2, (ObjectFunc) func_8018B58C, D_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 }, + /* OBJECT_2F4_180 */ {(void*) func_8005B6A4, 1, (ObjectFunc) func_80066A80, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 1 }, + /* OBJECT_2F4_181 */ {(void*) D_6018C00, 0, (ObjectFunc) func_8018756C, D_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_182 */ {(void*) func_8005B71C, 1, (ObjectFunc) func_80187650, D_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_183 */ {(void*) func_8018DA6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, + /* OBJECT_2F4_184 */ {(void*) func_8018DAEC, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, + /* OBJECT_2F4_185 */ {(void*) func_8018DB6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 }, + /* OBJECT_2F4_186 */ {(void*) func_8005B7CC, 1, (ObjectFunc) func_8018795C, D_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_187 */ {(void*) D_6018450, 0, (ObjectFunc) func_801877C4, D_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_188 */ {(void*) func_801BEC74, 1, (ObjectFunc) func_801BEC68, D_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_189 */ {(void*) func_8005A094, 1, (ObjectFunc) func_8006C008, D_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_2F4_190 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 }, + /* OBJECT_2F4_191 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 }, + /* OBJECT_2F4_192 */ {(void*) func_8005B9A4, 1, (ObjectFunc) func_8006654C, D_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 }, + /* OBJECT_2F4_193 */ {(void*) func_8005BA30, 1, (ObjectFunc) func_800669A0, D_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 }, + /* OBJECT_2F4_194 */ {(void*) func_8006B74C, 1, (ObjectFunc) func_8006B094, D_800CC000, 200.0f, 0, 1, 39, 0, 0.0f, 1 }, + /* OBJECT_2F4_195 */ {(void*) func_8004FEC0, 1, (ObjectFunc) func_8004F8AC, D_800CBF34, 20000.0f, 0, 1, 39, 0, 0.0f, 0 }, + /* OBJECT_2F4_196 */ {(void*) func_80059BF0, 1, (ObjectFunc) func_8006BB78, D_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_197 */ {(void*) func_80035448, 1, (ObjectFunc) func_800319AC, D_800CC038, 20000.0f, 0, 1, 39, 1, 1.0f, 1 }, + /* OBJECT_2F4_198 */ {(void*) func_80035448, 1, (ObjectFunc) func_80092EC0, D_800CC01C, 20000.0f, 0, 0, 39, 1, 0.0f, 0 }, + /* OBJECT_2F4_199 */ {(void*) func_80188448, 1, (ObjectFunc) func_801880E4, D_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 }, + /* OBJECT_2F4_200 */ {(void*) func_80074FF0, 1, (ObjectFunc) func_80072594, D_800CBF34, 2000.0f, 0, 1, 39, 0, 0.0f, 1 }, + /* OBJECT_2F4_201 */ {(void*) func_800598E8, 1, (ObjectFunc) func_8006AC08, D_602F684, 100.0f, 0, 1, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_202 */ {(void*) func_80059A24, 1, (ObjectFunc) func_8006AD18, D_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 }, + /* OBJECT_2F4_203 */ {(void*) func_8018F884, 1, (ObjectFunc) func_8018F330, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_2F4_204 */ {(void*) func_E9F1D0_801A4CB0, 1, (ObjectFunc) func_E9F1D0_801A3BD4, D_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_205 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019C778, D_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_206 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_801AC438, D_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_207 */ {(void*) func_801AC294, 2, (ObjectFunc) func_801A7E7C, D_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_208 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019EA60, D_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_209 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019D700, D_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_210 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019CE88, D_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_211 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019E410, D_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_212 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019FF9C, D_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_213 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019EE68, D_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_214 */ {(void*) func_801A43BC, 1, (ObjectFunc) func_801A3E98, D_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_215 */ {(void*) func_801A4A64, 1, (ObjectFunc) func_801A46A0, D_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 }, + /* OBJECT_2F4_216 */ {(void*) func_801A5F90, 1, (ObjectFunc) func_801A5E54, D_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_217 */ {(void*) func_801A6100, 1, (ObjectFunc) func_801A5FD0, D_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_218 */ {(void*) func_801A6540, 1, (ObjectFunc) func_801A6144, D_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_219 */ {(void*) func_801A68EC, 1, (ObjectFunc) func_801A67C8, D_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_220 */ {(void*) func_801ADAC8, 1, (ObjectFunc) func_801AD6F0, D_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_221 */ {(void*) func_801AE2C0, 1, (ObjectFunc) func_801ADD68, D_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, + /* OBJECT_2F4_222 */ {(void*) func_801AEEFC, 1, (ObjectFunc) func_801AEC04, D_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 }, + /* OBJECT_2F4_223 */ {(void*) func_801A54E8, 1, (ObjectFunc) func_801A4B24, D_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_224 */ {(void*) NULL, 1, (ObjectFunc) func_80189194, D_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 }, + /* OBJECT_2F4_225 */ {(void*) D_700AB70, 0, (ObjectFunc) func_8018AB44, D_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 }, + /* OBJECT_2F4_226 */ {(void*) func_80189AFC, 1, (ObjectFunc) func_801895B8, D_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 }, + /* OBJECT_2F4_227 */ {(void*) func_8018E5B4, 1, (ObjectFunc) func_8018E54C, D_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 }, + /* OBJECT_2F4_228 */ {(void*) func_8018EF14, 1, (ObjectFunc) func_8018E5F8, D_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 }, + /* OBJECT_2F4_229 */ {(void*) func_8018E2D8, 1, (ObjectFunc) func_8018C8A8, D_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 }, + /* OBJECT_2F4_230 */ {(void*) func_8018AABC, 1, (ObjectFunc) func_8018A544, D_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 }, + /* OBJECT_2F4_231 */ {(void*) func_8018BE84, 1, (ObjectFunc) func_8018B9D0, D_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 }, + /* OBJECT_2F4_232 */ {(void*) func_8018B6AC, 1, (ObjectFunc) func_8018B268, D_6006890_f32, 0.0f, 0, 0, 39, 1, 20.0f, 1 }, + /* OBJECT_2F4_233 */ {(void*) func_8018A1C0, 1, (ObjectFunc) func_80189CC8, D_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 }, + /* OBJECT_2F4_234 */ {(void*) func_80077218, 1, (ObjectFunc) func_800771CC, D_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 }, + /* OBJECT_2F4_235 */ {(void*) func_80190430, 2, (ObjectFunc) func_801904CC, D_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 }, + /* OBJECT_2F4_236 */ {(void*) func_80190F08, 1, (ObjectFunc) func_80190A00, D_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_237 */ {(void*) func_8006A978, 1, (ObjectFunc) func_8006A96C, D_800CBF34, 200.0f, 0, 0, 40, 0, 0.0f, 2 }, + /* OBJECT_2F4_238 */ {(void*) func_801914C4, 2, (ObjectFunc) func_80191010, D_800CBE8C, 200.0f, 0, 1, 40, 0, 1.0f, 1 }, + /* OBJECT_2F4_239 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_2F4_240 */ {(void*) func_80191B4C, 1, (ObjectFunc) func_80191680, D_800CBE8C, 1500.0f, 0, 1, 40, 0, 20.0f, 0 }, + /* OBJECT_2F4_241 */ {(void*) func_80191DB0, 1, (ObjectFunc) func_80191BC4, D_800CBE70, 1500.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_242 */ {(void*) func_80191FFC, 2, (ObjectFunc) func_80192094, D_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 }, + /* OBJECT_2F4_243 */ {(void*) func_80192C18, 2, (ObjectFunc) func_80192834, D_800CBE8C, 0.0f, 0, 1, 40, 0, 1.0f, 1 }, + /* OBJECT_2F4_244 */ {(void*) func_80193240, 2, (ObjectFunc) func_80192E64, D_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 }, + /* OBJECT_2F4_245 */ {(void*) func_8019983C, 1, (ObjectFunc) func_8019969C, D_800CBE8C, 200.0f, 0, 0, 40, 0, 1.0f, 0 }, + /* OBJECT_2F4_246 */ {(void*) func_80199E24, 1, (ObjectFunc) func_80199A28, D_800CBE8C, 2000.0f, 0, 0, 40, 0, 1.0f, 0 }, + /* OBJECT_2F4_247 */ {(void*) func_8019D3C4, 1, (ObjectFunc) func_8019D15C, D_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_248 */ {(void*) func_8019A1FC, 1, (ObjectFunc) func_80199F10, D_800CBEA8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_249 */ {(void*) func_8019ACCC, 1, (ObjectFunc) func_8019A5D4, D_800CBEC4, 5000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_250 */ {(void*) func_8019B7DC, 1, (ObjectFunc) func_8019B548, D_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_251 */ {(void*) func_8019BDE0, 2, (ObjectFunc) func_8019B854, D_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 }, + /* OBJECT_2F4_252 */ {(void*) func_8019C1CC, 1, (ObjectFunc) func_8019BE48, D_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 }, + /* OBJECT_2F4_253 */ {(void*) func_8019C83C, 1, (ObjectFunc) func_8019C454, D_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_254 */ {(void*) func_8019CE58, 1, (ObjectFunc) func_8019CBEC, D_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_2F4_255 */ {(void*) func_801AE168, 1, (ObjectFunc) func_801AD6C0, D_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_256 */ {(void*) func_801AEB44, 1, (ObjectFunc) func_801AE3D8, D_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_257 */ {(void*) func_801B099C, 1, (ObjectFunc) func_801AFA5C, D_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_258 */ {(void*) func_801B0EC0, 1, (ObjectFunc) func_801B0B60, D_800CBE8C, 200.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_259 */ {(void*) func_801B619C, 2, (ObjectFunc) func_801B638C, D_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_260 */ {(void*) func_801B90DC, 2, (ObjectFunc) func_801B7C78, D_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_261 */ {(void*) func_801B504C, 2, (ObjectFunc) func_801B50E8, D_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 }, + /* OBJECT_2F4_262 */ {(void*) func_801B7A24, 2, (ObjectFunc) func_801B6FF8, D_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_263 */ {(void*) func_801BA108, 2, (ObjectFunc) func_801B91A4, D_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 }, + /* OBJECT_2F4_264 */ {(void*) func_801BA4E4, 1, (ObjectFunc) func_801BA26C, D_800CBE8C, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_2F4_265 */ {(void*) func_801BAD7C, 1, (ObjectFunc) func_801BA6A4, D_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 }, + /* OBJECT_2F4_266 */ {(void*) func_801BB204, 2, (ObjectFunc) func_801BADF8, D_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_2F4_267 */ {(void*) func_801BC930, 2, (ObjectFunc) func_801BB79C, D_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_268 */ {(void*) func_801BDE6C, 1, (ObjectFunc) func_801BD54C, D_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_2F4_269 */ {(void*) func_801BD264, 1, (ObjectFunc) func_801BC9A0, D_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_270 */ {(void*) func_801BEB1C, 1, (ObjectFunc) func_801BE3F8, D_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_271 */ {(void*) func_8002E694, 2, (ObjectFunc) func_8002E670, D_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 }, + /* OBJECT_2F4_272 */ {(void*) func_8002E6DC, 1, (ObjectFunc) func_8002E6B8, D_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 }, + /* OBJECT_2F4_273 */ {(void*) func_80188FE4, 2, (ObjectFunc) func_80188AD0, D_600FF30, 0.0f, 0, 0, 39, 0, 220.0f, 1 }, + /* OBJECT_2F4_274 */ {(void*) func_8019E3A8, 1, (ObjectFunc) func_8019E234, D_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 }, + /* OBJECT_2F4_275 */ {(void*) func_8019F7AC, 1, (ObjectFunc) func_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_276 */ {(void*) func_8019F7AC, 1, (ObjectFunc) func_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_277 */ {(void*) func_8019F7AC, 1, (ObjectFunc) func_8019F20C, D_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 }, + /* OBJECT_2F4_278 */ {(void*) NULL, 1, (ObjectFunc) func_8019EA7C, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 }, + /* OBJECT_2F4_279 */ {(void*) NULL, 1, (ObjectFunc) func_801A003C, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 }, + /* OBJECT_2F4_280 */ {(void*) D_900DD20, 0, (ObjectFunc) func_80192518, D_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_281 */ {(void*) func_80192E2C, 1, (ObjectFunc) func_80192CD4, D_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_282 */ {(void*) D_901DA50, 0, (ObjectFunc) func_80192CD4, D_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_283 */ {(void*) D_9023AD0, 0, (ObjectFunc) func_80192EB0, D_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_284 */ {(void*) func_801934D0, 1, (ObjectFunc) func_801933DC, D_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_2F4_285 */ {(void*) func_80193244, 1, (ObjectFunc) func_80192E94, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 }, + /* OBJECT_2F4_286 */ {(void*) func_80188660, 1, (ObjectFunc) func_80188528, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJECT_2F4_287 */ {(void*) NULL, 1, (ObjectFunc) func_80189724, D_800CBF34, 1000.0f, 0, 0, 40, 1, 0.0f, 0 }, + /* OBJECT_2F4_288 */ {(void*) NULL, 1, (ObjectFunc) func_801893B8, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 }, + /* OBJECT_2F4_289 */ {(void*) func_800596B0, 1, (ObjectFunc) func_80189470, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 }, + /* OBJECT_2F4_290 */ {(void*) NULL, 1, (ObjectFunc) func_8018933C, D_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJECT_2F4_291 */ {(void*) func_80067874, 1, (ObjectFunc) func_8006753C, D_800CBEA8, 1000.0f, 0, 0, 0, 0, 1.0f, 0 }, + /* OBJECT_408_292 */ {(void*) func_8018AA74, 2, (ObjectFunc) func_80189058, D_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJECT_408_293 */ {(void*) func_8018ECAC, 1, (ObjectFunc) func_8018C19C, D_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_294 */ {(void*) func_8018ED78, 1, (ObjectFunc) func_8018DDAC, D_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_295 */ {(void*) func_8018EE84, 1, (ObjectFunc) func_8018E290, D_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_296 */ {(void*) func_8018EF90, 1, (ObjectFunc) func_8018E76C, D_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_297 */ {(void*) func_8018BACC, 1, (ObjectFunc) func_8018978C, D_602F75C, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_298 */ {(void*) func_801887D0, 1, (ObjectFunc) func_80188344, D_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_299 */ {(void*) func_80042FC4, 2, (ObjectFunc) func_80042FB8, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_300 */ {(void*) func_80042FE8, 1, (ObjectFunc) func_80042FDC, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_301 */ {(void*) func_801BEC5C, 1, (ObjectFunc) func_801BEC50, D_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_302 */ {(void*) func_8018C54C, 1, (ObjectFunc) func_80187944, D_6028454, 2000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_303 */ {(void*) func_80193434, 2, (ObjectFunc) func_80190078, D_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 }, + /* OBJECT_408_304 */ {(void*) func_8018FF84, 2, (ObjectFunc) func_8018FE38, D_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, + /* OBJECT_408_305 */ {(void*) func_80190020, 2, (ObjectFunc) func_8018FF20, D_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 }, + /* OBJECT_408_306 */ {(void*) func_801982A8, 1, (ObjectFunc) func_80197A94,D_E6A810_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJECT_408_307 */ {(void*) func_801949DC, 2, (ObjectFunc) func_80194A84, D_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 }, + /* OBJECT_408_308 */ {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJECT_408_309 */ {(void*) func_8002E604, 1, (ObjectFunc) func_8002E5E0, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJECT_408_310 */ {(void*) func_8002E64C, 1, (ObjectFunc) func_8002E628, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJECT_408_311 */ {(void*) func_80191AFC, 2, (ObjectFunc) func_801912FC, D_6011C80, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJECT_408_312 */ {(void*) func_80196288, 2, (ObjectFunc) func_80196210, D_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJECT_408_313 */ {(void*) func_8019E98C, 1, (ObjectFunc) func_8019E454, D_6009388, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_314 */ {(void*) func_8019E2C4, 2, (ObjectFunc) func_8019C888, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_315 */ {(void*) func_801A71B8, 2, (ObjectFunc) func_801A5B3C, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_316 */ {(void*) func_801968F4, 1, (ObjectFunc) func_801946C4, D_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_317 */ {(void*) func_80193B1C, 1, (ObjectFunc) func_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJECT_408_318 */ {(void*) func_801B4D84, 2, (ObjectFunc) func_801B134C, D_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_319 */ {(void*) func_801985E4, 1, (ObjectFunc) func_80194398,D_DF4260_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 }, + /* OBJECT_408_320 */ {(void*) func_801928C8, 2, (ObjectFunc) func_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_408_321 */ {(void*) func_8018B8C0, 1, (ObjectFunc) func_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 }, + /* OBJECT_6C_LASERS */ {(void*) func_8005CC9C, 1, (ObjectFunc) func_80067F6C, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_323 */ {(void*) func_8005C5F0, 1, (ObjectFunc) func_80068914, D_800CBF38, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_SILVER_RING */ {(void*) func_8005C900, 1, (ObjectFunc) func_80068020, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_325 */ {(void*) func_8005C9C0, 1, (ObjectFunc) func_800685D8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_326 */ {(void*) func_8005CDA8, 1, (ObjectFunc) func_80068688, D_800CBF70, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_BOMB */ {(void*) func_8005CB44, 1, (ObjectFunc) func_80067BEC, D_800CBFC8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_328 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_329 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_330 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_331 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_332 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_333 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_334 */ {(void*) NULL, 1, (ObjectFunc) func_80068C48, D_800CBF18, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_1UP */ {(void*) D_1022120, 0, (ObjectFunc) func_80067B1C, D_800CBE8C, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_GOLD_RING */ {(void*) func_8005CA80, 1, (ObjectFunc) func_800685F8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_WING_REPAIR */ {(void*) D_3007650, 0, (ObjectFunc) func_80068618, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_6C_338 */ {(void*) D_6006140, 0, (ObjectFunc) func_80198968, D_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_339 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D2F4, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_340 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D748, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_341 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D8A8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_342 */ {(void*) func_8007E330, 1, (ObjectFunc) func_8007E298, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_343 */ {(void*) func_8007CAF0, 1, (ObjectFunc) func_8007C9E0, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_344 */ {(void*) func_8007868C, 1, (ObjectFunc) func_8007E014, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_345 */ {(void*) func_8007879C, 1, (ObjectFunc) func_8007E258, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_346 */ {(void*) func_800788B0, 1, (ObjectFunc) func_8007F438, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_347 */ {(void*) func_800783C0, 1, (ObjectFunc) func_8007B758, NULL, 100.0f, 1, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_8C_348 */ {(void*) func_80078A64, 1, (ObjectFunc) func_8007F6B0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_349 */ {(void*) NULL, 1, (ObjectFunc) func_8007F958, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_350 */ {(void*) NULL, 1, (ObjectFunc) func_8007FBE0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_351 */ {(void*) func_80078438, 1, (ObjectFunc) func_8007E3E4, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_352 */ {(void*) func_800784B4, 1, (ObjectFunc) func_8007B62C, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_353 */ {(void*) func_80078B8C, 1, (ObjectFunc) func_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJECT_8C_354 */ {(void*) func_80197C64, 1, (ObjectFunc) func_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJECT_8C_355 */ {(void*) func_80078AEC, 1, (ObjectFunc) func_800802B8, NULL, 100.0f, 1, 0, 20, 1, 0.0f, 0 }, + /* OBJECT_8C_356 */ {(void*) func_80078C84, 1, (ObjectFunc) func_800802F8, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 }, + /* OBJECT_8C_357 */ {(void*) func_800798F0, 1, (ObjectFunc) func_8007968C, NULL, 100.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_358 */ {(void*) func_80192A68, 1, (ObjectFunc) func_80192984, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_359 */ {(void*) func_8007AA60, 1, (ObjectFunc) func_8007A994, NULL, -100.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_360 */ {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BE54, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_361 */ {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BDE0, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_362 */ {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BCE8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_363 */ {(void*) func_80094BBC, 1, (ObjectFunc) func_80094954, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_364 */ {(void*) func_8007B9DC, 1, (ObjectFunc) func_8007B960, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_365 */ {(void*) func_8007E5CC, 1, (ObjectFunc) func_8007E45C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_366 */ {(void*) func_80078550, 1, (ObjectFunc) func_801AC918, NULL, 100.0f, 1, 2, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_367 */ {(void*) func_80078604, 1, (ObjectFunc) func_8007E648, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_368 */ {(void*) func_80188FA8, 1, (ObjectFunc) func_80188F60, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_369 */ {(void*) func_8018DCE4, 1, (ObjectFunc) func_80188CAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJECT_8C_370 */ {(void*) func_8018DBEC, 1, (ObjectFunc) func_80188FAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJECT_8C_371 */ {(void*) func_8018DE14, 1, (ObjectFunc) func_80189114, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJECT_8C_372 */ {(void*) func_80077A00, 1, (ObjectFunc) func_8007AB50, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_373 */ {(void*) NULL, 1, (ObjectFunc) func_8007A748, NULL, 500.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_374 */ {(void*) func_8007DED4, 1, (ObjectFunc) func_8007DB70, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJECT_8C_375 */ {(void*) func_8007DAE4, 1, (ObjectFunc) func_8007DA58, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_376 */ {(void*) func_80078CE8, 1, (ObjectFunc) func_80080360, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_377 */ {(void*) func_80078BE0, 1, (ObjectFunc) func_800802D8, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 }, + /* OBJECT_8C_378 */ {(void*) func_801A5AF0, 1, (ObjectFunc) func_801A57D0, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJECT_8C_379 */ {(void*) func_801AEAA0, 1, (ObjectFunc) func_801AE87C, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_380 */ {(void*) func_801A5D68, 1, (ObjectFunc) func_801A5B4C, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 }, + /* OBJECT_8C_381 */ {(void*) func_80077A7C, 1, (ObjectFunc) func_8007B0F4, NULL, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_382 */ {(void*) NULL, 1, (ObjectFunc) func_8007B040, NULL, 200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_383 */ {(void*) func_8007A3C0, 1, (ObjectFunc) func_8007A28C, NULL, 10000.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_384 */ {(void*) func_80077B84, 1, (ObjectFunc) func_8007B3B8, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_385 */ {(void*) func_80078038, 1, (ObjectFunc) func_8007B5C0, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_386 */ {(void*) NULL, 1, (ObjectFunc) func_8007C250, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_387 */ {(void*) NULL, 1, (ObjectFunc) func_8007C8C4, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_388 */ {(void*) func_80077B78, 1, (ObjectFunc) func_8007B670, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_389 */ {(void*) func_800780F8, 1, (ObjectFunc) func_8007B67C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_390 */ {(void*) NULL, 1, (ObjectFunc) func_8007C50C, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_391 */ {(void*) func_80083B8C, 1, (ObjectFunc) func_800837EC, NULL, 500.0f, 0, 0, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_392 */ {(void*) func_801A0AF0, 1, (ObjectFunc) func_801A0120, NULL, 300.0f, 1, 2, 10, 0, 0.0f, 0 }, + /* OBJECT_8C_393 */ {(void*) func_80078F78, 1, (ObjectFunc) func_80078EBC, NULL, 300.0f, 1, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_394 */ {(void*) func_80080D04, 1, (ObjectFunc) func_80080ACC, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 }, + /* OBJECT_8C_395 */ {(void*) func_80082F78, 1, (ObjectFunc) func_80081C5C, NULL, 300.0f, 0, 1, 40, 0, 0.0f, 0 }, + /* OBJECT_8C_396 */ {(void*) func_8018CF98, 1, (ObjectFunc) func_8018CAD4, NULL, 2000.0f, 0, 1, 40, 2, 0.0f, 0 }, + /* OBJECT_8C_397 */ {(void*) func_80191180, 1, (ObjectFunc) func_80191054, NULL, 2000.0f, 0, 1, 20, 0, 0.0f, 0 }, + /* OBJECT_8C_398 */ {(void*) func_8008092C, 1, (ObjectFunc) func_8008040C, NULL, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, + /* OBJECT_8C_399 */ {(void*) func_80084194, 1, (ObjectFunc) func_80083FA8, NULL, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, }; // clang-format on diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c index a3e96372..3b29d31e 100644 --- a/src/main/fox_edisplay.c +++ b/src/main/fox_edisplay.c @@ -4,15 +4,14 @@ Vec3f D_801615D0; Vec3f D_801615E0; s32 D_801615EC; Matrix D_801615F0; -UnkStruct_D_80161630 D_80161630; -s32 D_80161670[4]; +WingInfo D_80161630; char D_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $"; void func_800596C0(void) { - Matrix_RotateZ(gGfxMatrix, D_80177DB0 * 13.0f * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, gFrameCount * 13.0f * M_DTOR, 1); Matrix_Scale(gGfxMatrix, 1.02f, 0.98f, 1.0f, 1); - Matrix_RotateZ(gGfxMatrix, -(f32) D_80177DB0 * 13.0f * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, -(f32) gFrameCount * 13.0f * M_DTOR, 1); Matrix_Scale(gGfxMatrix, 1.02f, 0.98f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); } @@ -32,16 +31,16 @@ void func_8005980C(f32 arg0) { void func_80059850(Object_4C* arg0) { RCP_SetupDL(&gMasterDisp, 0x40); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 60); - RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } void func_800598DC(s32 arg0) { } void func_800598E8(Object_2F4* arg0) { - RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPDisplayList(gMasterDisp++, D_6025B50); - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } void func_800599A4(s32 arg0, Vec3f* arg1, void* arg2) { @@ -53,7 +52,7 @@ void func_800599A4(s32 arg0, Vec3f* arg1, void* arg2) { sp24.y = 0.0f; sp24.z = 0.0f; Matrix_MultVec3f(gCalcMatrix, &sp24, &sp18); - D_80163FE0[*((s32*) arg2)].unk_114 = sp18.y; + gObjects2F4[*((s32*) arg2)].unk_114 = sp18.y; } } @@ -82,7 +81,7 @@ void func_80059AEC(Object_80* arg0) { } void func_80059B20(Object_80* arg0) { - if (arg0->obj.id == 29) { + if (arg0->obj.id == OBJECT_29) { gSPDisplayList(gMasterDisp++, D_7007350); } else { func_8005980C(D_800CF9B0[arg0->obj.id + 2]); @@ -110,42 +109,42 @@ void func_80059C34(Object_4C* arg0) { } void func_80059C40(Object_4C* arg0) { - RCP_SetupDL_47(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_47(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 180); switch (arg0->unk_45) { - case 0x0: + case 0: Matrix_Scale(gGfxMatrix, 2.0f, 1.0f, 0.7f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6034B90); break; - case 0x15: + case 21: Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.7f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6034B90); break; - case 0x6: - case 0x7: + case 6: + case 7: Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 10.55f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_Gfx_800DAC20); break; - case 0x38: + case 56: Matrix_Scale(gGfxMatrix, 1.6f, 1.0f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6034B90); break; - case 0x14: + case 20: Matrix_Scale(gGfxMatrix, 1.2f, 1.0f, 1.3f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6034B90); break; - case 0x16: + case 22: Matrix_Scale(gGfxMatrix, 2.2f, 1.0f, 1.4f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6034B90); break; } - RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } void func_80059F68(Object_6C* arg0) { @@ -262,11 +261,11 @@ void func_8005A094(Object_2F4* arg0) { gSPDisplayList(gMasterDisp++, D_1024290); } break; - case 0x27: + case 39: gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); gSPDisplayList(gMasterDisp++, D_800CFAC4[arg0->unk_048]); break; - case 0x28: + case 40: gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); switch (arg0->unk_048) { case 0: @@ -283,60 +282,60 @@ void func_8005A094(Object_2F4* arg0) { RCP_SetupDL(&gMasterDisp, 0x21); break; } - if (D_80178234 != 7) { + if (gCurrentLevel != LEVEL_SOLAR) { gSPDisplayList(gMasterDisp++, D_E6A810_801B769C[arg0->unk_046]); } else { - if (D_8016F110[0].unk_0E4 < 4800.0f) { + if (gObjects408[0].unk_0E4 < 4800.0f) { RCP_SetupDL(&gMasterDisp, 0x1E); - gDPSetFogColor(gMasterDisp++, 0x40, 0x20, 0x20, D_80178338); - gSPFogPosition(gMasterDisp++, D_801783D8, D_801783DC); + gDPSetFogColor(gMasterDisp++, 0x40, 0x20, 0x20, gFogAlpha); + gSPFogPosition(gMasterDisp++, gFogNear, gFogFar); } else { RCP_SetupDL(&gMasterDisp, 0x1E); - gDPSetFogColor(gMasterDisp++, 0x10, 0x10, 0x10, D_80178338); - gSPFogPosition(gMasterDisp++, D_801783D8, D_801783DC); + gDPSetFogColor(gMasterDisp++, 0x10, 0x10, 0x10, gFogAlpha); + gSPFogPosition(gMasterDisp++, gFogNear, gFogFar); } func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFB40[arg0->unk_046]); } break; - case 0x29: + case 41: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFADC[arg0->unk_048]); break; - case 0x2A: + case 42: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFB08[arg0->unk_048]); break; - case 0x2B: + case 43: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFB14[arg0->unk_048]); break; - case 0x2C: + case 44: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFB28[arg0->unk_048]); break; - case 0x2D: + case 45: gSPDisplayList(gMasterDisp++, D_40018A0); break; - case 0x2E: + case 46: if ((arg0->unk_048 == 2) || (arg0->unk_048 == 3) || (arg0->unk_048 == 4)) { RCP_SetupDL(&gMasterDisp, 0x21); } gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); gSPDisplayList(gMasterDisp++, D_E6A810_801B7584[arg0->unk_048]); break; - case 0x2F: + case 47: gSPDisplayList(gMasterDisp++, D_E6A810_801B7608[arg0->unk_048]); break; - case 0x30: + case 48: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFB64[arg0->unk_048]); break; - case 0x31: + case 49: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFB88[arg0->unk_048]); break; - case 0x32: + case 50: func_8005980C(0.7f); if (arg0->unk_054 == 1) { RCP_SetupDL(&gMasterDisp, 0x1E); @@ -365,47 +364,47 @@ void func_8005A094(Object_2F4* arg0) { func_8005980C(0.7f); } break; - case 0x33: + case 51: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFBA8[arg0->unk_048]); break; - case 0x34: + case 52: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFBE4[arg0->unk_048]); break; - case 0x35: + case 53: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFC0C[arg0->unk_048]); break; - case 0x36: + case 54: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFC40[arg0->unk_048]); break; - case 0x37: + case 55: func_8005980C(arg0->unk_110); gSPDisplayList(gMasterDisp++, D_800CFC50[arg0->unk_048]); break; - case 0x38: + case 56: func_8005980C(arg0->unk_110); RCP_SetupDL(&gMasterDisp, 0x29); Matrix_SetGfxMtx(&gMasterDisp); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 191, 255, 223, 255); gSPDisplayList(gMasterDisp++, D_800CFC64[arg0->unk_048]); break; - case 0x3A: + case 58: func_8005980C(arg0->unk_110); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_60148B0); break; - case 0x3B: + case 59: func_8005980C(arg0->unk_110); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_800CFC7C[arg0->unk_048]); break; - case 0x46: + case 70: gSPDisplayList(gMasterDisp++, D_10177C0); break; - case 0x39: + case 57: gSPDisplayList(gMasterDisp++, D_DF4260_8019A008[arg0->unk_048]); break; default: @@ -426,13 +425,13 @@ void func_8005ADAC(Object_2F4* arg0) { s32 pad[5]; // fake? seems like a lot of padding if ((arg0->unk_07C != 0) && (arg0->obj.status == 2)) { - temp1 = 0.65250003f; + temp1 = 652.5f * 0.001f; // 0.65250003f; if (arg0->unk_07C >= 2) { temp1 = 1.3050001f; } Math_SmoothStepToF(&arg0->unk_188, temp1, 0.3f, 5.0f, 0.0f); sp5C = arg0->unk_188; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { sp5C *= 1.111f; } Matrix_Push(&gGfxMatrix); @@ -441,16 +440,16 @@ void func_8005ADAC(Object_2F4* arg0) { Matrix_RotateZ(gGfxMatrix, -arg0->obj.rot.z * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, -arg0->obj.rot.x * M_DTOR, 1); Matrix_RotateY(gGfxMatrix, -arg0->obj.rot.y * M_DTOR, 1); - Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1); - Matrix_RotateX(gGfxMatrix, D_80178280[D_801778A0].unk_05C, 1); + Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1); + Matrix_RotateX(gGfxMatrix, gPlayer[D_801778A0].unk_05C, 1); Matrix_SetGfxMtx(&gMasterDisp); - func_8005465C(D_80177C98); + func_8005465C(gLevelType); Matrix_Pop(&gGfxMatrix); } sp5C = arg0->unk_168; - if ((sp5C != 0.0f) && (D_80177C98 == 0)) { + if ((sp5C != 0.0f) && (gLevelType == 0)) { sp54 = 0.0f; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { sp54 = 180.0f; } RCP_SetupDL_64_2(); @@ -488,7 +487,7 @@ void func_8005B1E8(Object_2F4* arg0, s32 arg1) { if (arg0->unk_07C >= 2) { var_fv0 = D_800CFCA0[arg0->unk_07C - 2] * 0.45f; } - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { var_fv0 *= 1.2f; } Matrix_Push(&gGfxMatrix); @@ -496,7 +495,7 @@ void func_8005B1E8(Object_2F4* arg0, s32 arg1) { Matrix_RotateZ(gGfxMatrix, -arg0->obj.rot.z * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, -arg0->obj.rot.x * M_DTOR, 1); Matrix_RotateY(gGfxMatrix, -arg0->obj.rot.y * M_DTOR, 1); - Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1); + Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1); Matrix_SetGfxMtx(&gMasterDisp); func_8005465C(arg1); Matrix_Pop(&gGfxMatrix); @@ -508,21 +507,21 @@ void func_8005B388(Object_2F4* arg0) { Vec3f sp30; Matrix_MultVec3f(gGfxMatrix, &sp3C, &sp30); - if ((((fabsf(sp30.z) < 3000.0f) && (fabsf(sp30.x) < 3000.0f) && (D_80178284 == 0)) || - (D_80178280[0].unk_1C8 == 0) || (D_80178234 == 9) || (D_80178234 == 0x13) || (D_80178280[0].unk_1C8 == 7)) && - (D_80178234 != 0xB) && (D_80178234 != 0xC)) { - if (arg0->obj.id == 0xC3) { - if (((D_80178234 == 0x13) && (D_80178280[0].unk_1C8 == 7) && (arg0->unk_040 == 0xA)) || - ((D_80178280[0].unk_1C8 == 7) && (D_80178280[0].unk_1D0 >= 0x64) && (D_80178234 == 0x10) && + if ((((fabsf(sp30.z) < 3000.0f) && (fabsf(sp30.x) < 3000.0f) && (D_80178284 == 0)) || (gPlayer[0].unk_1C8 == 0) || + (gCurrentLevel == LEVEL_VENOM_2) || (gCurrentLevel == LEVEL_VENOM_SW) || (gPlayer[0].unk_1C8 == 7)) && + (gCurrentLevel != LEVEL_MACBETH) && (gCurrentLevel != LEVEL_TITANIA)) { + if (arg0->obj.id == OBJECT_195) { + if (((gCurrentLevel == LEVEL_VENOM_SW) && (gPlayer[0].unk_1C8 == 7) && (arg0->unk_040 == 10)) || + ((gPlayer[0].unk_1C8 == 7) && (gPlayer[0].unk_1D0 >= 100) && (gCurrentLevel == LEVEL_KATINA) && (arg0->unk_040 == 1)) || - ((D_80178234 == 5) && (D_80178280[0].unk_1C8 == 0) && (arg0->unk_0B8 == 5))) { - D_80161630.unk_00 = D_80178280[0].unk_49C.unk_00; - D_80161630.unk_01 = D_80178280[0].unk_49C.unk_01; + ((gCurrentLevel == LEVEL_SECTOR_Y) && (gPlayer[0].unk_1C8 == 0) && (arg0->unk_0B8 == 5))) { + D_80161630.rightState = gPlayer[0].wings.rightState; + D_80161630.leftState = gPlayer[0].wings.leftState; } else { - D_80161630.unk_00 = D_80161630.unk_01 = 2; + D_80161630.rightState = D_80161630.leftState = 2; } } else { - D_80161630.unk_00 = D_80161630.unk_01 = 2; + D_80161630.rightState = D_80161630.leftState = 2; } D_80161630.unk_04 = arg0->unk_150; D_80161630.unk_0C = arg0->unk_154; @@ -534,13 +533,13 @@ void func_8005B388(Object_2F4* arg0) { D_80161630.unk_2C = arg0->unk_088; D_80161630.unk_30 = arg0->unk_164; D_80161630.unk_34 = arg0->unk_160; - if (D_80177C98 == 1) { + if (gLevelType == 1) { D_80161630.unk_04 = D_80161630.unk_08 = D_80161630.unk_0C = D_80161630.unk_10 = 0.0f; } func_80053658(&D_80161630); - } else if (D_80177C98 == 0) { + } else if (gLevelType == 0) { gSPDisplayList(gMasterDisp++, D_40018A0); - } else if (D_80178280[0].unk_204 == 2) { + } else if (gPlayer[0].unk_204 == 2) { gSPDisplayList(gMasterDisp++, D_4003BD0); } else { gSPDisplayList(gMasterDisp++, D_4007870); @@ -555,14 +554,14 @@ void func_8005B6A4(Object_2F4* arg0) { } void func_8005B71C(Object_2F4* arg0) { - RCP_SetupDL_29(arg0->unk_046, D_80178328, D_80178330, D_80178338, arg0->unk_048, D_801783DC); + RCP_SetupDL_29(arg0->unk_046, gFogGreen, gFogBlue, gFogAlpha, arg0->unk_048, gFogFar); Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6018C00); } void func_8005B7CC(Object_2F4* arg0) { - RCP_SetupDL_29(arg0->unk_046, D_80178328, D_80178330, D_80178338, arg0->unk_048, D_801783DC); + RCP_SetupDL_29(arg0->unk_046, gFogGreen, gFogBlue, gFogAlpha, arg0->unk_048, gFogFar); gSPDisplayList(gMasterDisp++, D_6022920); } @@ -574,7 +573,7 @@ void func_8005B848(Object_2F4* arg0) { gSPDisplayList(gMasterDisp++, D_1028230); break; case 1: - if (D_80178234 == 3) { + if (gCurrentLevel == LEVEL_AREA_6) { gSPDisplayList(gMasterDisp++, D_400B390); } else { gSPDisplayList(gMasterDisp++, D_4007AF0); @@ -582,7 +581,7 @@ void func_8005B848(Object_2F4* arg0) { break; } var_fv0 = 2.0f; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { var_fv0 = 1.7f; } Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); @@ -593,8 +592,8 @@ void func_8005B848(Object_2F4* arg0) { void func_8005B9A4(Object_2F4* arg0) { Matrix_Translate(gGfxMatrix, 0.0f, -124.0f, 0.0f, 1); - Animation_GetFrameData(&D_6029528, arg0->unk_0B6, &arg0->unk_18C); - Animation_DrawSkeleton(1, D_6029674, &arg0->unk_18C, NULL, NULL, (s32*) arg0, &gIdentityMatrix); + Animation_GetFrameData(&D_6029528, arg0->unk_0B6, arg0->unk_18C); + Animation_DrawSkeleton(1, D_6029674, arg0->unk_18C, NULL, NULL, arg0, &gIdentityMatrix); } void func_8005BA30(Object_2F4* arg0) { @@ -612,14 +611,14 @@ f32 D_800CFCCC[] = { 0.0f, 0.05f, 0.03f, 0.02f, 0.01f, 0.05f, 0.0f, 0.02f, }; -void func_8005BAB4(s32 arg0, s32 arg1) { +void func_8005BAB4(s32 objId, s32 arg1) { f32 temp_fv0; f32 temp1; f32 temp2; - switch (arg0) { - case 0x176: - if (D_80170130[arg1].unk_4E == 0) { + switch (objId) { + case OBJECT_374: + if (gObjects8C[arg1].unk_4E == 0) { Matrix_Scale(gGfxMatrix, 1.2f, 0.0f, 1.2f, 1); Matrix_RotateX(gGfxMatrix, M_PI / 2.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -627,29 +626,29 @@ void func_8005BAB4(s32 arg0, s32 arg1) { } RCP_SetupDL(&gMasterDisp, 0x40); break; - case 0xC3: - case 0xC6: - case 0xC8: - switch (D_80163FE0[arg1].unk_0B4) { - case 0x3: + case OBJECT_195: + case OBJECT_198: + case OBJECT_200: + switch (gObjects2F4[arg1].unk_0B4) { + case 3: Matrix_Scale(gGfxMatrix, 2.3f, 0.0f, 2.3f, 1); Matrix_RotateX(gGfxMatrix, M_PI / 2.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_102A010); break; - case 0x51: + case 81: RCP_SetupDL(&gMasterDisp, 0x30); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255); gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 255); - temp_fv0 = D_80163FE0[arg1].unk_150 * 3.0f; + temp_fv0 = gObjects2F4[arg1].unk_150 * 3.0f; Matrix_Scale(gGfxMatrix, temp_fv0, temp_fv0, temp_fv0, 1); Matrix_RotateX(gGfxMatrix, -M_PI / 2.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1024AC0); break; default: - temp1 = D_800CFCCC[D_80177DB0 % 8U]; - temp2 = D_800CFCCC[(D_80177DB0 + 4) % 8U]; + temp1 = D_800CFCCC[gFrameCount % 8U]; + temp2 = D_800CFCCC[(gFrameCount + 4) % 8U]; Matrix_Scale(gGfxMatrix, 1.4f + temp1, 0.0f, 1.4f + temp2, 1); Matrix_RotateY(gGfxMatrix, M_PI, 1); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, 1); @@ -659,11 +658,11 @@ void func_8005BAB4(s32 arg0, s32 arg1) { break; } break; - case 0x124: + case OBJECT_292: gSPDisplayList(gMasterDisp++, D_6034B90); break; - case 0x13C: - if (D_80178280[0].unk_1C8 == 0) { + case OBJECT_316: + if (gPlayer[0].unk_1C8 == 0) { RCP_SetupDL(&gMasterDisp, 0x40); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 200); } @@ -671,75 +670,75 @@ void func_8005BAB4(s32 arg0, s32 arg1) { func_8005980C(150.0f); gSPDisplayList(gMasterDisp++, D_102A8A0); break; - case 0x125: - case 0x126: - case 0x127: - case 0x128: - __cosf(D_8016F110[arg1].obj.rot.z * M_DTOR); + case OBJECT_293: + case OBJECT_294: + case OBJECT_295: + case OBJECT_296: + __cosf(gObjects408[arg1].obj.rot.z * M_DTOR); if (D_80161A88 == 2) { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 90); } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 150); } - switch (arg0) { - case 0x125: + switch (objId) { + case OBJECT_293: gSPDisplayList(gMasterDisp++, D_6036840); break; - case 0x126: + case OBJECT_294: gSPDisplayList(gMasterDisp++, D_6036CD0); break; - case 0x127: - case 0x128: + case OBJECT_295: + case OBJECT_296: gSPDisplayList(gMasterDisp++, D_60363B0); break; } break; - case 0xC0: + case OBJECT_192: gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 150); - Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, D_80163FE0[arg1].unk_110, 1); + Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, gObjects2F4[arg1].unk_110, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_6034B90); break; - case 0xE6: + case OBJECT_230: RCP_SetupDL_48(); RCP_SetupDL(&gMasterDisp, 0x45); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255); gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0); - Matrix_RotateX(gGfxMatrix, D_80163FE0[arg1].unk_114, 1); - Matrix_RotateZ(gGfxMatrix, D_80163FE0[arg1].unk_11C, 1); - Matrix_Scale(gGfxMatrix, D_80163FE0[arg1].unk_110, 1.0f, D_80163FE0[arg1].unk_110, 1); + Matrix_RotateX(gGfxMatrix, gObjects2F4[arg1].unk_114, 1); + Matrix_RotateZ(gGfxMatrix, gObjects2F4[arg1].unk_11C, 1); + Matrix_Scale(gGfxMatrix, gObjects2F4[arg1].unk_110, 1.0f, gObjects2F4[arg1].unk_110, 1); Matrix_RotateX(gGfxMatrix, -M_PI / 2.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1024AC0); break; - case 0xE5: + case OBJECT_229: RCP_SetupDL(&gMasterDisp, 0x44); gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255); gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 120.0f, 1); - Matrix_RotateX(gGfxMatrix, D_80163FE0[arg1].unk_118 * M_DTOR, 1); - Matrix_RotateZ(gGfxMatrix, D_80163FE0[arg1].unk_11C * M_DTOR, 1); - Matrix_RotateY(gGfxMatrix, D_80163FE0[arg1].obj.rot.y * M_DTOR, 1); + Matrix_RotateX(gGfxMatrix, gObjects2F4[arg1].unk_118 * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, gObjects2F4[arg1].unk_11C * M_DTOR, 1); + Matrix_RotateY(gGfxMatrix, gObjects2F4[arg1].obj.rot.y * M_DTOR, 1); Matrix_Scale(gGfxMatrix, 6.0f, 1.0f, 7.5f, 1); Matrix_RotateX(gGfxMatrix, -M_PI / 2.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1024AC0); break; - case 0xE7: + case OBJECT_231: RCP_SetupDL(&gMasterDisp, 0x45); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255); gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0); - Matrix_RotateX(gGfxMatrix, D_80163FE0[arg1].unk_118, 1); - Matrix_RotateZ(gGfxMatrix, D_80163FE0[arg1].unk_11C, 1); + Matrix_RotateX(gGfxMatrix, gObjects2F4[arg1].unk_118, 1); + Matrix_RotateZ(gGfxMatrix, gObjects2F4[arg1].unk_11C, 1); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 0.0f, 1); Matrix_Scale(gGfxMatrix, 1.2f, 1.0f, 1.2f, 1); Matrix_RotateX(gGfxMatrix, -M_PI / 2.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1024AC0); break; - case 0xD7: + case OBJECT_215: RCP_SetupDL_48(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255); gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 255); @@ -747,8 +746,8 @@ void func_8005BAB4(s32 arg0, s32 arg1) { Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1024AC0); break; - case 0x13F: - func_DF4260_80198310(&D_8016F110[arg1]); + case OBJECT_319: + func_DF4260_80198310(&gObjects408[arg1]); break; } } @@ -756,7 +755,7 @@ void func_8005BAB4(s32 arg0, s32 arg1) { void func_8005C5F0(Object_6C* arg0) { s32 i; - if ((D_80177DB0 & 0x18) && (arg0->unk_46 == 0)) { + if ((gFrameCount & 0x18) && (arg0->unk_46 == 0)) { Matrix_Push(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x40); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255); @@ -776,7 +775,7 @@ void func_8005C5F0(Object_6C* arg0) { Matrix_Push(&gGfxMatrix); Matrix_RotateZ(gGfxMatrix, i * 45.0f * M_DTOR, 1); Matrix_Translate(gGfxMatrix, 2.0f * arg0->unk_68, 0.0f, 0.0f, 1); - Matrix_RotateZ(gGfxMatrix, (D_80177DB0 + (i * 110.0f)) * M_DTOR * 7.2f * arg0->unk_54, 1); + Matrix_RotateZ(gGfxMatrix, (gFrameCount + (i * 110.0f)) * M_DTOR * 7.2f * arg0->unk_54, 1); func_8005980C(2.0f * arg0->unk_50); gSPDisplayList(gMasterDisp++, D_101CAE0); Matrix_Pop(&gGfxMatrix); @@ -812,7 +811,7 @@ void func_8005CA80(Object_6C* arg0) { } void func_8005CB44(Object_6C* arg0) { - if (D_80178234 == 0xD) { + if (gCurrentLevel == LEVEL_AQUAS) { func_8005980C(arg0->unk_68); gSPDisplayList(gMasterDisp++, D_3005980); } else { @@ -843,15 +842,15 @@ void func_8005CC9C(Object_6C* arg0) { void func_8005CDA8(Object_6C* arg0) { s32 i; - arg0->obj.rot.y = (Math_Atan2F(D_80178280[D_801778A0].unk_040.x - arg0->obj.pos.x, - D_80178280[D_801778A0].unk_040.z - (arg0->obj.pos.z + D_80177D20)) * + arg0->obj.rot.y = (Math_Atan2F(gPlayer[D_801778A0].unk_040.x - arg0->obj.pos.x, + gPlayer[D_801778A0].unk_040.z - (arg0->obj.pos.z + D_80177D20)) * 180.0f) / M_PI; if (arg0->unk_46 != 0) { RCP_SetupDL(&gMasterDisp, 0x29); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, arg0->unk_44); } else { - RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK | G_LIGHTING); // wrong order? for (i = 0; i < 7; i++) { @@ -938,28 +937,29 @@ void func_8005D654(Object_80* arg0, s32 arg1) { func_8005D008(&arg0->obj, arg0->unk_1C.drawType); arg0->obj.pos.y -= D_8017847C; if (arg0->unk_1C.drawType == 0) { - if ((arg0->obj.id == 0x13) || (arg0->obj.id == 0x37) || (arg0->obj.id == 9) || (arg0->obj.id == 0x32)) { - RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + if ((arg0->obj.id == OBJECT_19) || (arg0->obj.id == OBJECT_55) || (arg0->obj.id == OBJECT_9) || + (arg0->obj.id == OBJECT_50)) { + RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); if (arg1 < 0) { func_800596C0(); } gSPDisplayList(gMasterDisp++, arg0->unk_1C.dList); - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } else { - if (arg0->obj.id == 8) { + if (arg0->obj.id == OBJECT_8) { if (arg1 < 0) { return; // weird control flow } - RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } func_800597C0(arg1); if (arg1 < 0) { func_800596C0(); } gSPDisplayList(gMasterDisp++, arg0->unk_1C.dList); - if (arg0->obj.id == 8) { - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + if (arg0->obj.id == OBJECT_8) { + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } } } else if (arg0->unk_1C.draw != NULL) { @@ -986,22 +986,22 @@ void func_8005D954(Object_2F4* arg0) { if (arg0->unk_01C.draw != NULL) { switch (arg0->obj.id) { - case 0xC2: + case OBJECT_194: func_8006B74C(arg0); return; - case 0xEC: + case OBJECT_236: func_E16C50_80190F08(arg0); return; } - if ((arg0->obj.id == 0xC8) && (arg0->unk_0B4 == 200)) { + if ((arg0->obj.id == OBJECT_200) && (arg0->unk_0B4 == 200)) { func_8006B74C(arg0); } else { if (arg0->unk_01C.unk_19 != 0) { arg0->obj.pos.y += D_8017847C; func_8005D008(&arg0->obj, arg0->unk_01C.drawType); arg0->obj.pos.y -= D_8017847C; - } else if ((arg0->obj.id == 0xC8) && (arg0->unk_0B4 != 0x1F)) { - func_8005D3CC(&arg0->obj, arg0->unk_2E8.x, arg0->unk_2E8.y, arg0->unk_2E8.z + arg0->unk_0FC, + } else if ((arg0->obj.id == OBJECT_200) && (arg0->unk_0B4 != 31)) { + func_8005D3CC(&arg0->obj, arg0->unk_2E8.x, arg0->unk_2E8.y, arg0->unk_2E8.z + arg0->unk_0F4.z, arg0->unk_01C.drawType); } else { func_8005D008(&arg0->obj, arg0->unk_01C.drawType); @@ -1012,7 +1012,8 @@ void func_8005D954(Object_2F4* arg0) { } else { arg0->unk_01C.draw(&arg0->obj); func_8005F1EC(&arg0->unk_100); - if (((arg0->obj.id == 0xC6) || ((arg0->obj.id == 0xCB) && (arg0->unk_0B6 > 0))) && (D_80161410 > 0)) { + if (((arg0->obj.id == OBJECT_198) || ((arg0->obj.id == OBJECT_203) && (arg0->unk_0B6 > 0))) && + (D_80161410 > 0)) { Matrix_MultVec3f(gGfxMatrix, &sp34, &D_80177E98[arg0->unk_0E4]); } } @@ -1046,7 +1047,7 @@ void func_8005DBC0(Object_2F4* arg0) { Matrix_Pop(&gGfxMatrix); var_fv0 = 0.0f; var_fv1 = -12000.0f; - if ((arg0->obj.id == 197) && (arg0->unk_0E4 >= 100)) { + if ((arg0->obj.id == OBJECT_197) && (arg0->unk_0E4 >= 100)) { var_fv0 = 1000.0f; var_fv1 = -25000.0f; } @@ -1058,16 +1059,16 @@ void func_8005DBC0(Object_2F4* arg0) { Matrix_RotateZ(gCalcMatrix, arg0->obj.rot.z * M_DTOR, 1); arg0->unk_01C.draw(&arg0->obj); D_801615EC = 1; - if ((D_80178280->unk_1C8 == 3) && (arg0->obj.id == 0xC5) && (arg0->unk_0E4 == 0xC8)) { + if ((gPlayer[0].unk_1C8 == 3) && (arg0->obj.id == OBJECT_197) && (arg0->unk_0E4 == 200)) { D_80177E98[0] = D_801615E0; } } } else { Matrix_Translate(gGfxMatrix, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 1); Matrix_MultVec3f(gGfxMatrix, &sp50, &D_801615E0); - if ((D_80178280->unk_1C8 == 2) || (D_80178280->unk_1C8 == 0) || - ((arg0->obj.id == 0xC5) && (arg0->unk_0E4 >= 0x64)) || - ((arg0->obj.id == 0xC3) && (arg0->unk_01C.unk_20 != 0))) { + if ((gPlayer[0].unk_1C8 == 2) || (gPlayer[0].unk_1C8 == 0) || + ((arg0->obj.id == OBJECT_197) && (arg0->unk_0E4 >= 100)) || + ((arg0->obj.id == OBJECT_195) && (arg0->unk_01C.unk_20 != 0))) { var_ft5 = var_fv0 = 3000.0f; var_fv1 = -29000.0f; var_fa1 = 0.7f; @@ -1086,20 +1087,20 @@ void func_8005DBC0(Object_2F4* arg0) { Matrix_SetGfxMtx(&gMasterDisp); arg0->unk_01C.draw(&arg0->obj); D_801615EC = 1; - if ((D_80178280->unk_1C8 == 3) && - (((arg0->obj.id == 0xC5) && ((arg0->unk_0E4 < 4) || (arg0->unk_0E4 == 8) || (arg0->unk_0E4 == 9))) || - (arg0->obj.id == 0xC6))) { + if ((gPlayer[0].unk_1C8 == 3) && (((arg0->obj.id == OBJECT_197) && + ((arg0->unk_0E4 < 4) || (arg0->unk_0E4 == 8) || (arg0->unk_0E4 == 9))) || + (arg0->obj.id == OBJECT_198))) { D_80177E98[arg0->unk_0E4] = D_801615E0; } } } if (D_801615EC == 0) { arg0->unk_0CA[D_801778A0] = 0; - if ((arg0->obj.id == 0xBD) || (arg0->obj.id == 0x11E)) { - func_80060FBC(&arg0->obj, &arg0->unk_100); + if ((arg0->obj.id == OBJECT_189) || (arg0->obj.id == OBJECT_286)) { + Object_Kill(&arg0->obj, &arg0->unk_100); } } - for (var_v1 = 0; var_v1 < D_801778A8; var_v1++) { + for (var_v1 = 0; var_v1 < gCamCount; var_v1++) { if (arg0->unk_0CA[var_v1] != 0) { D_80161578[var_v1] = D_801615E0; D_80161578[var_v1].y += arg0->unk_01C.unk_1C; @@ -1135,12 +1136,12 @@ void func_8005E1B8(Object_408* arg0, s32 arg1) { } Matrix_MultVec3f(&D_801615F0, &sp30, &D_801615D0); func_8005F290(&arg0->unk_3FC, &D_801615D0); - if ((arg0->obj.id == 0x13C) || (arg0->obj.id == 0x13D)) { + if ((arg0->obj.id == OBJECT_316) || (arg0->obj.id == OBJECT_317)) { var_fa1 = 6000.0f; var_fv0 = 6000.0f; var_ft5 = 0.9f; var_fv1 = -20000.0f; - } else if (arg0->obj.id == 0x139) { + } else if (arg0->obj.id == OBJECT_313) { var_fv1 = -25000.0f; var_ft5 = 0.7f; var_fa1 = 3000.0f; @@ -1156,8 +1157,8 @@ void func_8005E1B8(Object_408* arg0, s32 arg1) { ((fabsf(D_801615D0.x) < (fabsf(D_801615D0.z * var_ft5) + var_fa1)) && (fabsf(D_801615D0.y) < (fabsf(D_801615D0.z * var_ft5) + var_fa1)))) { sp3C = 1.0f; - if (arg0->obj.id != 0x135) { - if (arg0->obj.id != 0x13C) { + if (arg0->obj.id == OBJECT_309) { + if (arg0->obj.id == OBJECT_316) { func_8005F670(&arg0->obj.pos); } if (arg0->unk_01C.drawType != 2) { @@ -1170,7 +1171,7 @@ void func_8005E1B8(Object_408* arg0, s32 arg1) { } } D_801615D0.y = sp3C; - if (arg0->obj.id == 0x135) { + if (arg0->obj.id == OBJECT_309) { arg0->unk_308 = D_801615D0; func_8005F670(&arg0->obj.pos); Matrix_SetGfxMtx(&gMasterDisp); @@ -1187,7 +1188,7 @@ void func_8005E454(Object_8C* arg0, s32 arg1) { if ((arg1 < 0) && (arg0->obj.pos.y < 7.0f)) { return; } - if ((arg0->obj.id == 0x161) || (arg0->obj.id == 0x171)) { + if ((arg0->obj.id == OBJECT_353) || (arg0->obj.id == OBJECT_369)) { func_8005D3CC(&arg0->obj, arg0->unk_60.x, arg0->unk_60.y, arg0->unk_60.z, 0); } else if (arg0->unk_1C.unk_14 == -1) { arg0->obj.pos.y += D_8017847C; @@ -1214,7 +1215,7 @@ void func_8005E538(Object_8C* arg0) { Matrix_Translate(gGfxMatrix, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z + D_80177D20, 1); } Matrix_MultVec3f(gGfxMatrix, &sp4C, &sp40); - if ((D_80178234 == 0x12) || (D_80178234 == 0x11)) { + if ((gCurrentLevel == LEVEL_SECTOR_Z) || (gCurrentLevel == LEVEL_BOLSE)) { var_fv0 = -20000.0f; } else { var_fv0 = -10000.0f; @@ -1231,8 +1232,8 @@ void func_8005E538(Object_8C* arg0) { sp3B = 1; } func_8005F290(&arg0->unk_80, &sp40); - if ((sp3B == 0) && (arg0->obj.id != 0x160) && (arg0->obj.id != 0x175) && (D_801778E8 == 0)) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + if ((sp3B == 0) && (arg0->obj.id == OBJECT_352) && (arg0->obj.id == OBJECT_373) && (D_801778E8 == 0)) { + Object_Kill(&arg0->obj, &arg0->unk_80); } } #else @@ -1266,8 +1267,9 @@ void func_8005E7B8(Object_6C* arg0, s32 arg1) { var_v0 = 1; } func_8005F290(&arg0->unk_5C, &sp38); - if ((var_v0 == 0) && (D_80177880 == 1) && (D_801778A8 == 1) && (arg0->obj.id < 0x150) && (D_80178234 != 9)) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); + if ((var_v0 == 0) && (D_80177880 == 1) && (gCamCount == 1) && (arg0->obj.id < 336) && + (gCurrentLevel != LEVEL_VENOM_2)) { + Object_Kill(&arg0->obj, &arg0->unk_5C); } } #else @@ -1278,7 +1280,7 @@ void func_8005E7B8(Object_6C* arg0, s32 arg1); void func_8005EA24(Object_2F4* arg0) { Matrix_Translate(gGfxMatrix, arg0->obj.pos.x, arg0->unk_178 + 3.0f, arg0->obj.pos.z, 1); - if (D_80178234 == 0xE) { + if (gCurrentLevel == LEVEL_FORTUNA) { Matrix_RotateY(gGfxMatrix, arg0->unk_180, 1); Matrix_RotateX(gGfxMatrix, arg0->unk_17C, 1); Matrix_RotateZ(gGfxMatrix, arg0->unk_184, 1); @@ -1292,15 +1294,15 @@ void func_8005EA24(Object_2F4* arg0) { Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_1032780); - } else if (D_80178234 == 0x10) { + } else if (gCurrentLevel == LEVEL_KATINA) { if ((arg0->unk_0B6 == 1) || (arg0->unk_0B6 == 2)) { gSPDisplayList(gMasterDisp++, D_600D730); } else { gSPDisplayList(gMasterDisp++, D_600DBC0); } - } else if ((arg0->unk_0E4 < 8) || (D_80178234 != 0xE)) { + } else if ((arg0->unk_0E4 < 8) || (gCurrentLevel != LEVEL_FORTUNA)) { gSPDisplayList(gMasterDisp++, D_F014310); - } else if (D_80178234 == 0xE) { + } else if (gCurrentLevel == LEVEL_FORTUNA) { gSPDisplayList(gMasterDisp++, D_6009F90); } else { gSPDisplayList(gMasterDisp++, D_F014310); @@ -1310,31 +1312,32 @@ void func_8005EA24(Object_2F4* arg0) { void func_8005ECD8(s32 arg0, Object* arg1) { RCP_SetupDL(&gMasterDisp, 0x42); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 180); - if (arg1->id == 0xC5) { - func_8005EA24(&D_80163FE0[arg0]); + if (arg1->id == OBJECT_197) { + func_8005EA24(&gObjects2F4[arg0]); } else { switch (arg1->id) { - case 0xE6: - Matrix_Translate(gGfxMatrix, arg1->pos.x, D_80177940 + 2.0f + D_80163FE0[arg0].unk_118, + case OBJECT_230: + Matrix_Translate(gGfxMatrix, arg1->pos.x, D_80177940 + 2.0f + gObjects2F4[arg0].unk_118, arg1->pos.z + D_80177D20, 1); break; - case 0xE5: - case 0xE7: - Matrix_Translate(gGfxMatrix, arg1->pos.x, D_80177940 + 2.0f + D_80163FE0[arg0].unk_114, + case OBJECT_229: + case OBJECT_231: + Matrix_Translate(gGfxMatrix, arg1->pos.x, D_80177940 + 2.0f + gObjects2F4[arg0].unk_114, arg1->pos.z + D_80177D20, 1); break; - case 0x13C: + case OBJECT_316: Matrix_Translate(gGfxMatrix, arg1->pos.x, D_80177940 + 2.0f + D_8017847C, arg1->pos.z, 1); break; default: Matrix_Translate(gGfxMatrix, arg1->pos.x, D_80177940 + 2.0f, arg1->pos.z + D_80177D20, 1); break; } - if ((D_801784AC != 4) || (arg1->id == 0xC8) || (arg1->id == 0xC3) || (arg1->id == 0xC6)) { + if ((D_801784AC != 4) || (arg1->id == OBJECT_200) || (arg1->id == OBJECT_195) || (arg1->id == OBJECT_198)) { Matrix_Scale(gGfxMatrix, 1.0f, 0.0f, 1.0f, 1); Matrix_RotateY(gGfxMatrix, arg1->rot.y * M_DTOR, 1); } - if ((arg1->id < 0x124) && (arg1->id != 0xE6) && (arg1->id != 0xE5) && (arg1->id != 0xE7)) { + if ((arg1->id < OBJECT_292) && (arg1->id != OBJECT_230) && (arg1->id != OBJECT_229) && + (arg1->id != OBJECT_231)) { Matrix_RotateX(gGfxMatrix, arg1->rot.x * M_DTOR, 1); Matrix_RotateZ(gGfxMatrix, arg1->rot.z * M_DTOR, 1); } @@ -1368,11 +1371,11 @@ void func_8005F0E8(Vec3f* arg0, Vec3f* arg1) { Vec3f sp2C; Vec3f sp20; - if (D_801778A8 != 1) { + if (gCamCount != 1) { arg0->x = arg0->y = arg0->z = 0.0f; } else { - Matrix_RotateY(gCalcMatrix, D_80178280->unk_058, 0); - Matrix_RotateX(gCalcMatrix, D_80178280->unk_05C, 1); + Matrix_RotateY(gCalcMatrix, gPlayer[0].unk_058, 0); + Matrix_RotateX(gCalcMatrix, gPlayer[0].unk_05C, 1); sp2C.x = arg1->x - D_801779D8.x; sp2C.y = arg1->y - D_801779D8.y; sp2C.z = arg1->z + D_80177D20 - D_801779D8.z; @@ -1389,7 +1392,7 @@ void func_8005F1EC(Vec3f* arg0) { Vec3f sp20; s32 pad; - if (D_801778A8 != 1) { + if (gCamCount != 1) { arg0->z = 0.0f; arg0->y = 0.0f; arg0->x = 0.0f; @@ -1403,7 +1406,7 @@ void func_8005F1EC(Vec3f* arg0) { } void func_8005F290(Vec3f* arg0, Vec3f* arg1) { - if (D_801778A8 != 1) { + if (gCamCount != 1) { arg0->z = 0.0f; arg0->y = 0.0f; arg0->x = 0.0f; @@ -1424,20 +1427,20 @@ void func_8005F2F4(Object_58* arg0) { f32 sp3C = 2000.0f; f32 sp38 = 0.5f; - if (arg0->obj.id == 0x9C) { + if (arg0->obj.id == OBJECT_156) { sp44 = 4000.0f; sp40 = -13000.0f; sp3C = 4500.0f; - } else if (D_80178234 == 9) { + } else if (gCurrentLevel == LEVEL_VENOM_2) { sp40 = -20000.0f; sp38 = 0.4f; - } else if (arg0->obj.id == 0x8F) { + } else if (arg0->obj.id == OBJECT_143) { sp44 = 6000.0f; sp40 = -20000.0f; sp3C = 6000.0f; sp38 = 0.9f; } - if ((D_80177C98 == 0) || (D_80178234 == 0x11)) { + if ((gLevelType == 0) || (gCurrentLevel == LEVEL_BOLSE)) { Matrix_Translate(gGfxMatrix, arg0->obj.pos.x, arg0->obj.pos.y + D_8017847C, arg0->obj.pos.z, 1); } else { Matrix_Translate(gGfxMatrix, arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 1); @@ -1446,7 +1449,7 @@ void func_8005F2F4(Object_58* arg0) { if ((sp48.z < sp44) && (sp40 < sp48.z) && (fabsf(sp48.y) < (fabsf(sp48.z * sp38) + sp3C)) && (fabsf(sp48.x) < (fabsf(sp48.z * sp38) + sp3C))) { func_8005F670(&arg0->obj.pos); - if (arg0->obj.id == 0x83) { + if (arg0->obj.id == OBJECT_131) { Matrix_RotateY(gGfxMatrix, arg0->obj.rot.y * M_DTOR, 1); Matrix_RotateX(gGfxMatrix, arg0->obj.rot.x * M_DTOR, 1); Matrix_RotateZ(gGfxMatrix, arg0->obj.rot.z * M_DTOR, 1); @@ -1485,7 +1488,7 @@ void func_8005F670(Vec3f* arg0) { sp9C.y = arg0->y - D_80178374; sp9C.z = arg0->z - D_80178378; temp_fv0 = sqrtf(VEC3F_SQ(sp9C)); - if (D_80178280->unk_1C8 == 2) { + if (gPlayer[0].unk_1C8 == 2) { var_fs0 = 700.0f / temp_fv0; } else { var_fs0 = 200.0f / temp_fv0; @@ -1499,9 +1502,9 @@ void func_8005F670(Vec3f* arg0) { sp94 = Math_Atan2F(sp9C.x, sp9C.z); sp98 = -Math_Atan2F(sp9C.y, sqrtf(SQ(sp9C.x) + SQ(sp9C.z))); Matrix_Push(&gCalcMatrix); - Matrix_RotateZ(gCalcMatrix, D_80178280[D_801778A0].unk_034 * D_80177950 * M_DTOR, 0); - Matrix_RotateX(gCalcMatrix, -D_80178280[D_801778A0].unk_05C, 1); - Matrix_RotateY(gCalcMatrix, D_80178280[D_801778A0].unk_058 + sp94, 1); + Matrix_RotateZ(gCalcMatrix, gPlayer[D_801778A0].unk_034 * D_80177950 * M_DTOR, 0); + Matrix_RotateX(gCalcMatrix, -gPlayer[D_801778A0].unk_05C, 1); + Matrix_RotateY(gCalcMatrix, gPlayer[D_801778A0].unk_058 + sp94, 1); Matrix_RotateX(gCalcMatrix, sp98, 1); sp6C.x = 0.0f; sp6C.y = 0.0f; @@ -1511,8 +1514,8 @@ void func_8005F670(Vec3f* arg0) { temp1 = D_80178360 * D_8017836C * var_fs0; temp2 = D_80178364 * D_8017836C * var_fs0; temp3 = D_80178368 * D_8017836C * var_fs0; - Lights_SetTwoLights(&gMasterDisp, D_801784DC, D_801784E0, D_801784E4, sp84.x, sp84.y, sp84.z, D_80178548, - D_8017854C, D_80178550, temp1, temp2, temp3, D_80178554, D_80178558, D_8017855C); + Lights_SetTwoLights(&gMasterDisp, gLight1x, gLight1y, gLight1z, sp84.x, sp84.y, sp84.z, gLight1R, gLight1G, + gLight1B, temp1, temp2, temp3, gAmbientR, gAmbientG, gAmbientB); } } @@ -1521,11 +1524,11 @@ bool func_8005F9DC(Vec3f* arg0) { Vec3f sp2C; Vec3f sp20; - Matrix_RotateY(gCalcMatrix, D_80178280[D_801778A0].unk_058, 0); - Matrix_RotateX(gCalcMatrix, D_80178280[D_801778A0].unk_05C, 1); - sp2C.x = arg0->x - D_80178280[D_801778A0].unk_040.x; - sp2C.y = arg0->y - D_80178280[D_801778A0].unk_040.y; - sp2C.z = arg0->z - D_80178280[D_801778A0].unk_040.z; + Matrix_RotateY(gCalcMatrix, gPlayer[D_801778A0].unk_058, 0); + Matrix_RotateX(gCalcMatrix, gPlayer[D_801778A0].unk_05C, 1); + sp2C.x = arg0->x - gPlayer[D_801778A0].unk_040.x; + sp2C.y = arg0->y - gPlayer[D_801778A0].unk_040.y; + sp2C.z = arg0->z - gPlayer[D_801778A0].unk_040.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20); if ((sp20.z < 1000.0f) && (sp20.z > -13000.0f) && (fabsf(sp20.x) < (fabsf(sp20.z * 0.4f) + 2000.0f)) && (fabsf(sp20.y) < (fabsf(sp20.y * 0.4f) + 2000.0f))) { @@ -1549,19 +1552,19 @@ void func_8005FB70(s32 arg0) { Object_6C* var_s0_6; Object_80* var_s0_2; - if ((D_80177880 == 1) && (D_80178234 != 0x10)) { - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + if ((D_80177880 == 1) && (gCurrentLevel != LEVEL_KATINA)) { + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); if (D_80177AB0 == 5) { gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); } for (i = 0, var_s0 = D_801782A8; i < 200; i++, var_s0++) { - if ((var_s0->obj.status == 2) && (var_s0->obj.id != 0x93)) { - if (D_80178234 == 0x11) { + if ((var_s0->obj.status == 2) && (var_s0->obj.id != OBJECT_147)) { + if (gCurrentLevel == LEVEL_BOLSE) { spAC.x = var_s0->unk_48.x; spAC.y = var_s0->unk_48.y; spAC.z = var_s0->unk_48.z; Matrix_MultVec3fNoTranslate(&D_E51970_8019EE80, &spAC, &var_s0->obj.pos); - var_s0->obj.rot.y = var_s0->unk_54 + D_8016F110->obj.rot.y; + var_s0->obj.rot.y = var_s0->unk_54 + gObjects408->obj.rot.y; } Matrix_Push(&gGfxMatrix); func_8005F2F4(var_s0); @@ -1569,8 +1572,8 @@ void func_8005FB70(s32 arg0) { } } } else { - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); - for (i = 0, var_s0_2 = D_80161B00; i < ARRAY_COUNT(D_80161B00); i++, var_s0_2++) { + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); + for (i = 0, var_s0_2 = gObjects80; i < ARRAY_COUNT(gObjects80); i++, var_s0_2++) { if (var_s0_2->obj.status >= 2) { if (arg0 > 0) { func_8005F670(&var_s0_2->obj.pos); @@ -1582,10 +1585,10 @@ void func_8005FB70(s32 arg0) { } } } - for (i = 0, var_s0_3 = D_8016F110; i < ARRAY_COUNT(D_8016F110); i++, var_s0_3++) { - if ((var_s0_3->obj.status >= 2) && (var_s0_3->obj.id != 0x136)) { + for (i = 0, var_s0_3 = gObjects408; i < ARRAY_COUNT(gObjects408); i++, var_s0_3++) { + if ((var_s0_3->obj.status >= 2) && (var_s0_3->obj.id != OBJECT_310)) { if (!(var_s0_3->unk_05C & 1)) { - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } else { RCP_SetupDL_27(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 64, 255, 255); @@ -1601,27 +1604,27 @@ void func_8005FB70(s32 arg0) { } } } - Lights_SetOneLight(&gMasterDisp, D_801784DC, D_801784E0, D_801784E4, D_80178548, D_8017854C, D_80178550, D_80178554, - D_80178558, D_8017855C); - for (i = 0, var_s0_4 = D_80163400; i < ARRAY_COUNT(D_80163400); i++, var_s0_4++) { + Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, + gAmbientB); + for (i = 0, var_s0_4 = gObjects4C; i < ARRAY_COUNT(gObjects4C); i++, var_s0_4++) { if ((var_s0_4->obj.status >= 2) && (func_80060FE4(&var_s0_4->obj.pos, -12000.0f) != 0)) { Matrix_Push(&gGfxMatrix); - if ((var_s0_4->obj.id == 0xA5) || (var_s0_4->obj.id == 0xA6)) { - RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + if ((var_s0_4->obj.id == OBJECT_165) || (var_s0_4->obj.id == OBJECT_166)) { + RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } else { - RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } func_8005D8B8(var_s0_4, arg0); Matrix_Pop(&gGfxMatrix); } } - for (i = 0, var_s0_5 = D_80163FE0; i < ARRAY_COUNT(D_80163FE0); i++, var_s0_5++) { + for (i = 0, var_s0_5 = gObjects2F4; i < ARRAY_COUNT(gObjects2F4); i++, var_s0_5++) { if (var_s0_5->obj.status >= 2) { if (!(var_s0_5->unk_0C6 & 1)) { - if (D_80178234 == 0xF) { + if (gCurrentLevel == LEVEL_UNK_15) { RCP_SetupDL_23(); } else { - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } } else { RCP_SetupDL_27(); @@ -1635,7 +1638,7 @@ void func_8005FB70(s32 arg0) { case 0: case 2: Matrix_Push(&gGfxMatrix); - if ((D_80178280->unk_1C8 == 2) || (D_80178280->unk_1C8 == 7) || (D_80178234 == 0xD)) { + if ((gPlayer[0].unk_1C8 == 2) || (gPlayer[0].unk_1C8 == 7) || (gCurrentLevel == LEVEL_AQUAS)) { func_8005F670(&var_s0_5->obj.pos); } func_800597C0(arg0); @@ -1652,7 +1655,7 @@ void func_8005FB70(s32 arg0) { func_8005DBC0(var_s0_5); Matrix_Pop(&gGfxMatrix); if ((var_s0_5->unk_0C9 != 0) && (D_801615EC != 0) && - ((D_801615E0.z > -4000.0f) || (D_80178234 != 0x10))) { + ((D_801615E0.z > -4000.0f) || (gCurrentLevel != LEVEL_KATINA))) { Matrix_Push(&gGfxMatrix); func_8005ECD8(i, &var_s0_5->obj); Matrix_Pop(&gGfxMatrix); @@ -1661,10 +1664,10 @@ void func_8005FB70(s32 arg0) { } } } - gDPSetFogColor(gMasterDisp++, D_80178320, D_80178328, D_80178330, D_80178338); - gSPFogPosition(gMasterDisp++, D_801783D8, D_801783DC); + gDPSetFogColor(gMasterDisp++, gFogRed, gFogGreen, gFogBlue, gFogAlpha); + gSPFogPosition(gMasterDisp++, gFogNear, gFogFar); Lights_SetOneLight(&gMasterDisp, -0x3C, -0x3C, 0x3C, 0x96, 0x96, 0x96, 0x14, 0x14, 0x14); - for (i = 0, var_s0_6 = D_801737E0; i < ARRAY_COUNT(D_801737E0); i++, var_s0_6++) { + for (i = 0, var_s0_6 = gObjects6C; i < ARRAY_COUNT(gObjects6C); i++, var_s0_6++) { if (var_s0_6->obj.status >= 2) { Matrix_Push(&gGfxMatrix); RCP_SetupDL(&gMasterDisp, 0x1D); @@ -1673,8 +1676,8 @@ void func_8005FB70(s32 arg0) { Matrix_Pop(&gGfxMatrix); } } - Lights_SetOneLight(&gMasterDisp, D_801784DC, D_801784E0, D_801784E4, D_80178548, D_8017854C, D_80178550, D_80178554, - D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, + gAmbientB); } void func_8006046C(s32 arg0) { @@ -1683,11 +1686,11 @@ void func_8006046C(s32 arg0) { Object_8C* var_s0; RCP_SetupDL(&gMasterDisp, 0x40); - for (i = 0, var_s0 = D_80170130; i < ARRAY_COUNT(D_80170130); i++, var_s0++) { + for (i = 0, var_s0 = gObjects8C; i < ARRAY_COUNT(gObjects8C); i++, var_s0++) { if (var_s0->obj.status >= 2) { if (var_s0->unk_1C.unk_14 == 1) { - var_s0->obj.rot.y = (-D_80178280[D_801778A0].unk_058 * 180.0f) / M_PI; - var_s0->obj.rot.x = (D_80178280[D_801778A0].unk_05C * 180.0f) / M_PI; + var_s0->obj.rot.y = (-gPlayer[D_801778A0].unk_058 * 180.0f) / M_PI; + var_s0->obj.rot.x = (gPlayer[D_801778A0].unk_05C * 180.0f) / M_PI; } if (D_80177880 == 1) { Matrix_Push(&gGfxMatrix); @@ -1698,7 +1701,7 @@ void func_8006046C(s32 arg0) { func_8005E454(var_s0, arg0); Matrix_Pop(&gGfxMatrix); func_8005F1EC(&var_s0->unk_80); - if (var_s0->obj.id == 0x176) { + if (var_s0->obj.id == OBJECT_374) { Matrix_Push(&gGfxMatrix); func_8005ECD8(i, &var_s0->obj); Matrix_Pop(&gGfxMatrix); @@ -1706,10 +1709,10 @@ void func_8006046C(s32 arg0) { } } } - for (i = 0, var_s0_2 = D_8016F110; i < ARRAY_COUNT(D_8016F110); i++, var_s0_2++) { - if ((var_s0_2->obj.status >= 2) && (var_s0_2->obj.id == 0x136)) { + for (i = 0, var_s0_2 = gObjects408; i < ARRAY_COUNT(gObjects408); i++, var_s0_2++) { + if ((var_s0_2->obj.status >= 2) && (var_s0_2->obj.id == OBJECT_310)) { if (!(var_s0_2->unk_05C & 1)) { - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); } else { RCP_SetupDL_27(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 64, 255, 255); @@ -1724,16 +1727,16 @@ void func_8006046C(s32 arg0) { void func_80060714(s32 arg0) { D_80161410 = 1; func_8005FB70(1); - if ((D_80161A88 == 2) && (D_80178280[0].unk_1C8 != 2)) { + if ((D_80161A88 == 2) && (gPlayer[0].unk_1C8 != 2)) { D_80161410 = -1; - Lights_SetOneLight(&gMasterDisp, D_801784DC, -1 * D_801784E0, D_801784E4, D_80178548, D_8017854C, D_80178550, - D_80178554, D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, gLight1x, -1 * gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, + gAmbientG, gAmbientB); Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1); func_8005FB70(-1); Matrix_Pop(&gGfxMatrix); - Lights_SetOneLight(&gMasterDisp, D_801784DC, D_801784E0, D_801784E4, D_80178548, D_8017854C, D_80178550, - D_80178554, D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, + gAmbientG, gAmbientB); } } @@ -1741,7 +1744,7 @@ void func_8006089C(u8 arg0) { if (arg0 == 0) { D_80161410 = 1; func_8006046C(1); - } else if ((D_80161A88 == 2) && (D_80178280->unk_1C8 != 2)) { + } else if ((D_80161A88 == 2) && (gPlayer[0].unk_1C8 != 2)) { D_80161410 = -1; Matrix_Push(&gGfxMatrix); Matrix_Scale(gGfxMatrix, 1.0f, -1.0f, 1.0f, 1); @@ -1768,46 +1771,46 @@ void func_80060968(void) { s32 i; s32 var_a1; - if (D_80178234 == 0xB) { + if (gCurrentLevel == LEVEL_MACBETH) { RCP_SetupDL(&gMasterDisp, 0x21); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); - } else if ((D_80178234 == 0xD) || (D_80178234 == 9)) { + } else if ((gCurrentLevel == LEVEL_AQUAS) || (gCurrentLevel == LEVEL_VENOM_2)) { RCP_SetupDL(&gMasterDisp, 0x29); } else { RCP_SetupDL_14(); } - for (i = 0; i < ARRAY_COUNT(D_80174750); i++) { - if (D_80174750[i].unk_00 != 0) { + for (i = 0; i < ARRAY_COUNT(gUnkEntities30); i++) { + if (gUnkEntities30[i].mode != 0) { Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, D_80174750[i].unk_04, D_80174750[i].unk_08, D_80174750[i].unk_0C + D_80177D20, - 1); - Matrix_RotateY(gGfxMatrix, D_80174750[i].unk_20, 1); - Matrix_RotateX(gGfxMatrix, D_80174750[i].unk_1C, 1); - Matrix_RotateZ(gGfxMatrix, D_80174750[i].unk_20, 1); - Matrix_Scale(gGfxMatrix, D_80174750[i].unk_28, D_80174750[i].unk_28, D_80174750[i].unk_24, 1); - if ((D_80178234 == 0xD) || (D_80178234 == 9)) { - var_a1 = (D_80177DB0 & 1) ? 180 : 50; + Matrix_Translate(gGfxMatrix, gUnkEntities30[i].unk_04.x, gUnkEntities30[i].unk_04.y, + gUnkEntities30[i].unk_04.z + D_80177D20, 1); + Matrix_RotateY(gGfxMatrix, gUnkEntities30[i].unk_20, 1); + Matrix_RotateX(gGfxMatrix, gUnkEntities30[i].unk_1C, 1); + Matrix_RotateZ(gGfxMatrix, gUnkEntities30[i].unk_20, 1); + Matrix_Scale(gGfxMatrix, gUnkEntities30[i].unk_28, gUnkEntities30[i].unk_28, gUnkEntities30[i].unk_24, 1); + if ((gCurrentLevel == LEVEL_AQUAS) || (gCurrentLevel == LEVEL_VENOM_2)) { + var_a1 = (gFrameCount & 1) ? 180 : 50; gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, var_a1); - if (D_80178234 == 0xD) { + if (gCurrentLevel == LEVEL_AQUAS) { Matrix_Scale(gGfxMatrix, 0.01f, 0.3f, 0.0025f, 1); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1); - Matrix_RotateZ(gGfxMatrix, D_80177DB0 * 5.0f * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, gFrameCount * 5.0f * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_60119A0); - } else if (D_80178234 == 9) { + } else if (gCurrentLevel == LEVEL_VENOM_2) { Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.0025f, 1); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1); - Matrix_RotateZ(gGfxMatrix, D_80177DB0 * 25.0f * M_DTOR, 1); + Matrix_RotateZ(gGfxMatrix, gFrameCount * 25.0f * M_DTOR, 1); Matrix_SetGfxMtx(&gMasterDisp); gSPDisplayList(gMasterDisp++, D_C017440); } } else { Matrix_SetGfxMtx(&gMasterDisp); - if (D_80178234 == 0xB) { + if (gCurrentLevel == LEVEL_MACBETH) { gSPDisplayList(gMasterDisp++, D_6012C00); } else { - gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_80174750[i].unk_2C, D_80174750[i].unk_2D, - D_80174750[i].unk_2E, D_80174750[i].unk_2F); + gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, gUnkEntities30[i].unk_2C, gUnkEntities30[i].unk_2D, + gUnkEntities30[i].unk_2E, gUnkEntities30[i].unk_2F); gSPDisplayList(gMasterDisp++, D_800CFD80); } } @@ -1821,7 +1824,7 @@ void func_80060968(void); #endif void func_80060D94(s32 arg0) { - UnkStruct_D_80174750* temp_s0 = &D_80174750[arg0]; + UnkEntity30* temp_s0 = &gUnkEntities30[arg0]; if (temp_s0->unk_2F == 0xFF) { RCP_SetupDL(&gMasterDisp, 5); @@ -1830,7 +1833,7 @@ void func_80060D94(s32 arg0) { } gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, temp_s0->unk_2C, temp_s0->unk_2D, temp_s0->unk_2E, temp_s0->unk_2F); Matrix_Push(&gGfxMatrix); - Matrix_Translate(gGfxMatrix, temp_s0->unk_04, temp_s0->unk_08, temp_s0->unk_0C, 1); + Matrix_Translate(gGfxMatrix, temp_s0->unk_04.x, temp_s0->unk_04.y, temp_s0->unk_04.z, 1); Matrix_RotateY(gGfxMatrix, temp_s0->unk_20, 1); Matrix_RotateX(gGfxMatrix, temp_s0->unk_1C, 1); Matrix_RotateZ(gGfxMatrix, temp_s0->unk_1C, 1); diff --git a/src/main/fox_enmy1.c b/src/main/fox_enmy1.c index e8f99818..af7bb5cd 100644 --- a/src/main/fox_enmy1.c +++ b/src/main/fox_enmy1.c @@ -1,5 +1,6 @@ #include "global.h" +s32 D_80161670[4]; s32 D_80161680; u8 D_80161684; @@ -29,6 +30,11 @@ u32 D_800CFF54[9] = { }; void func_80060F30(Vec3f* arg0, u32 arg1, s32 arg2) { + (void) "CHIME SET \n"; + (void) "BOMB SET 1\n"; + (void) "BOMB SET 2\n"; + (void) "center_X %f\n"; + (void) "Enm->obj.pos.x %f\n"; if (D_801778E8 == 0) { func_80019218(arg1, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } else { @@ -36,7 +42,7 @@ void func_80060F30(Vec3f* arg0, u32 arg1, s32 arg2) { } } -void func_80060FBC(Object* arg0, Vec3f* arg1) { +void Object_Kill(Object* arg0, Vec3f* arg1) { arg0->status = 0; func_8001A500(arg1); } @@ -45,13 +51,13 @@ s32 func_80060FE4(Vec3f* arg0, f32 arg1) { Vec3f sp2C; Vec3f sp20; - if ((D_80177880 != 1) && (D_80178280[0].unk_1C8 != 2)) { + if ((D_80177880 != 1) && (gPlayer[0].unk_1C8 != 2)) { return true; } - Matrix_RotateY(gCalcMatrix, D_80178280[D_801778A0].unk_058, 0); - sp2C.x = arg0->x - D_80178280[D_801778A0].unk_040.x; + Matrix_RotateY(gCalcMatrix, gPlayer[D_801778A0].unk_058, 0); + sp2C.x = arg0->x - gPlayer[D_801778A0].unk_040.x; sp2C.y = 0.0f; - sp2C.z = arg0->z - D_80178280[D_801778A0].unk_040.z; + sp2C.z = arg0->z - gPlayer[D_801778A0].unk_040.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20); if ((sp20.z < 1000.0f) && (arg1 < sp20.z) && (fabsf(sp20.x) < (fabsf(sp20.z * 0.5f) + 2000.0f))) { @@ -67,13 +73,13 @@ s32 func_80061148(Vec3f* arg0, f32 arg1) { if (D_80177880 != 1) { return true; } - if (D_80178280[0].unk_1C8 == 7) { + if (gPlayer[0].unk_1C8 == 7) { return func_80060FE4(arg0, arg1); } - Matrix_RotateY(gCalcMatrix, D_80178280[D_801778A0].unk_058, 0); - sp2C.x = arg0->x - D_80178280[D_801778A0].unk_040.x; + Matrix_RotateY(gCalcMatrix, gPlayer[D_801778A0].unk_058, 0); + sp2C.x = arg0->x - gPlayer[D_801778A0].unk_040.x; sp2C.y = 0.0f; - sp2C.z = arg0->z - D_80178280[D_801778A0].unk_040.z; + sp2C.z = arg0->z - gPlayer[D_801778A0].unk_040.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20); if ((sp20.z < 0.0f) && (arg1 < sp20.z) && (fabsf(sp20.x) < (fabsf(sp20.z * 0.5f) + 500.0f))) { @@ -90,7 +96,7 @@ void func_800612B8(ObjectStruct_1C* arg0, u32 arg1) { } } -void func_80061364(Object_80* arg0) { +void Object_80_Initialize(Object_80* arg0) { s32 i; u8* var_v0 = (u8*) arg0; @@ -99,7 +105,7 @@ void func_80061364(Object_80* arg0) { } } -void func_80061394(Object_4C* arg0) { +void Object_4C_Initialize(Object_4C* arg0) { s32 i; u8* var_v0 = (u8*) arg0; @@ -108,7 +114,7 @@ void func_80061394(Object_4C* arg0) { } } -void func_800613C4(Object_2F4* arg0) { +void Object_2F4_Initialize(Object_2F4* arg0) { s32 i; u8* var_v0 = (u8*) arg0; @@ -118,7 +124,7 @@ void func_800613C4(Object_2F4* arg0) { arg0->unk_110 = 1.0f; } -void func_80061404(Object_408* arg0) { +void Object_408_Initialize(Object_408* arg0) { s32 i; u8* var_v0 = (u8*) arg0; @@ -128,7 +134,7 @@ void func_80061404(Object_408* arg0) { arg0->unk_3F8 = 1.0f; } -void func_80061444(Object_6C* arg0) { +void Object_6C_Initialize(Object_6C* arg0) { s32 i; u8* var_v0 = (u8*) arg0; @@ -137,7 +143,7 @@ void func_80061444(Object_6C* arg0) { } } -void func_80061474(Object_8C* arg0) { +void Object_8C_Initialize(Object_8C* arg0) { s32 i; u8* var_v0 = (u8*) arg0; @@ -148,83 +154,83 @@ void func_80061474(Object_8C* arg0) { } void func_800614B4(Object_80* arg0, ObjectInit* arg1) { - func_80061364(arg0); + Object_80_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.pos.z = -arg1->unk_0; - arg0->obj.pos.z += -3000.0f + arg1->unk_4; - arg0->obj.pos.x = arg1->unk_6; - arg0->obj.pos.y = arg1->unk_8; + arg0->obj.pos.z = -arg1->zPos1; + arg0->obj.pos.z += -3000.0f + arg1->zPos2; + arg0->obj.pos.x = arg1->xPos; + arg0->obj.pos.y = arg1->yPos; arg0->obj.rot.x = arg1->unk_A; arg0->obj.rot.y = arg1->unk_C; arg0->obj.rot.z = arg1->unk_E; - arg0->obj.id = arg1->unk_10; + arg0->obj.id = arg1->id; func_800612B8(&arg0->unk_1C, arg0->obj.id); } void func_800615A0(Object_4C* arg0, ObjectInit* arg1) { - func_80061394(arg0); + Object_4C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.pos.z = -arg1->unk_0; - arg0->obj.pos.z += -3000.0f + arg1->unk_4; - arg0->obj.pos.x = arg1->unk_6; - arg0->obj.pos.y = arg1->unk_8; + arg0->obj.pos.z = -arg1->zPos1; + arg0->obj.pos.z += -3000.0f + arg1->zPos2; + arg0->obj.pos.x = arg1->xPos; + arg0->obj.pos.y = arg1->yPos; arg0->obj.rot.y = arg1->unk_C; arg0->obj.rot.x = arg1->unk_A; arg0->obj.rot.z = arg1->unk_E; - arg0->obj.id = arg1->unk_10; + arg0->obj.id = arg1->id; func_800612B8(&arg0->unk_1C, arg0->obj.id); } void func_8006168C(Object_2F4* arg0, ObjectInit* arg1) { - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.pos.z = -arg1->unk_0; - arg0->obj.pos.z += -3000.0f + arg1->unk_4; - arg0->obj.pos.x = arg1->unk_6; - arg0->obj.pos.y = arg1->unk_8; + arg0->obj.pos.z = -arg1->zPos1; + arg0->obj.pos.z += -3000.0f + arg1->zPos2; + arg0->obj.pos.x = arg1->xPos; + arg0->obj.pos.y = arg1->yPos; arg0->obj.rot.y = arg1->unk_C; arg0->obj.rot.x = arg1->unk_A; arg0->obj.rot.z = arg1->unk_E; - arg0->obj.id = arg1->unk_10; + arg0->obj.id = arg1->id; func_800612B8(&arg0->unk_01C, arg0->obj.id); } void func_80061778(Object_408* arg0, ObjectInit* arg1) { - func_80061404(arg0); + Object_408_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.pos.z = -arg1->unk_0; - arg0->obj.pos.z += -3000.0f + arg1->unk_4; - arg0->obj.pos.x = arg1->unk_6; - arg0->obj.pos.y = arg1->unk_8; + arg0->obj.pos.z = -arg1->zPos1; + arg0->obj.pos.z += -3000.0f + arg1->zPos2; + arg0->obj.pos.x = arg1->xPos; + arg0->obj.pos.y = arg1->yPos; arg0->obj.rot.y = arg1->unk_C; arg0->obj.rot.x = arg1->unk_A; arg0->obj.rot.z = arg1->unk_E; - arg0->obj.id = arg1->unk_10; + arg0->obj.id = arg1->id; func_800612B8(&arg0->unk_01C, arg0->obj.id); } void func_80061864(Object_6C* arg0, ObjectInit* arg1) { - func_80061444(arg0); + Object_6C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.pos.z = -arg1->unk_0; - arg0->obj.pos.z += -3000.0f + arg1->unk_4; - arg0->obj.pos.x = arg1->unk_6; - arg0->obj.pos.y = arg1->unk_8; + arg0->obj.pos.z = -arg1->zPos1; + arg0->obj.pos.z += -3000.0f + arg1->zPos2; + arg0->obj.pos.x = arg1->xPos; + arg0->obj.pos.y = arg1->yPos; arg0->obj.rot.y = arg1->unk_C; arg0->obj.rot.x = arg1->unk_A; arg0->obj.rot.z = arg1->unk_E; - arg0->obj.id = arg1->unk_10; + arg0->obj.id = arg1->id; arg0->unk_68 = 1.0f; func_800612B8(&arg0->unk_1C, arg0->obj.id); } void func_80061958(Object_8C* arg0, f32 arg1, f32 arg2, f32 arg3) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 346; + arg0->obj.id = OBJECT_346; arg0->unk_50 = 50; arg0->unk_70 = 0.2f; - if (D_80178234 == 13) { + if (gCurrentLevel == LEVEL_AQUAS) { arg0->unk_50 = 200; arg0->unk_70 = 0.3f; arg0->unk_6C = Rand_ZeroOne() * 255.0f; @@ -234,7 +240,7 @@ void func_80061958(Object_8C* arg0, f32 arg1, f32 arg2, f32 arg3) { arg0->obj.pos.z = arg3; arg0->obj.rot.z = Rand_ZeroOne() * 360.0f; func_800612B8(&arg0->unk_1C, arg0->obj.id); - if (D_80177C98 == 0) { + if (gLevelType == 0) { arg0->unk_1C.unk_10 = 100.0f; } } @@ -246,17 +252,17 @@ void func_80061A4C(void) { f32 sp20; f32 sp1C; - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { sp1C = (Rand_ZeroOne() - 0.5f); - sp28 = D_80178280[0].unk_074 + (sp1C * 400.0f) + (5.0f * D_80178280[0].unk_0C0.x); + sp28 = gPlayer[0].unk_074 + (sp1C * 400.0f) + (5.0f * gPlayer[0].unk_0C0.x); sp1C = (Rand_ZeroOne() - 0.5f); - sp24 = D_80178280[0].unk_078 + (sp1C * 400.0f) + (5.0f * D_80178280[0].unk_0C0.y); + sp24 = gPlayer[0].unk_078 + (sp1C * 400.0f) + (5.0f * gPlayer[0].unk_0C0.y); sp20 = -D_80177D20 - 500.0f; if (D_80177D08 < 0.0f) { sp20 = -D_80177D20 + 500.0f; } - func_80061958(&D_80170130[i], sp28, sp24, sp20); + func_80061958(&gObjects8C[i], sp28, sp24, sp20); break; } } @@ -269,21 +275,21 @@ void func_80061B68(void) { f32 sp20; f32 sp1C; - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { sp1C = (Rand_ZeroOne() - 0.5f); - sp28 = D_80178280[0].unk_074 + (sp1C * 2000.0f) + (5.0f * D_80178280[0].unk_0C0.x); + sp28 = gPlayer[0].unk_074 + (sp1C * 2000.0f) + (5.0f * gPlayer[0].unk_0C0.x); sp24 = 0; while (sp24 <= D_80177940) { sp1C = (Rand_ZeroOne() - 0.5f); - sp24 = D_80178280[0].unk_078 + (sp1C * 2000.0f) + (5.0f * D_80178280[0].unk_0C0.y); + sp24 = gPlayer[0].unk_078 + (sp1C * 2000.0f) + (5.0f * gPlayer[0].unk_0C0.y); } sp20 = -D_80177D20 - 3000.0f; if (D_80177D08 < 0.0f) { sp20 = -D_80177D20 + 1000.0f; } - func_80061958(&D_80170130[i], sp28, sp24, sp20); + func_80061958(&gObjects8C[i], sp28, sp24, sp20); break; } } @@ -296,63 +302,62 @@ void func_80061CD0(void) { f32 sp20; f32 sp1C; - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { sp1C = (Rand_ZeroOne() - 0.5f); - sp28 = D_80178280[D_801778A0].unk_074 + (sp1C * 3000.0f) + (5.0f * D_80178280[D_801778A0].unk_0C0.x); + sp28 = gPlayer[D_801778A0].unk_074 + (sp1C * 3000.0f) + (5.0f * gPlayer[D_801778A0].unk_0C0.x); sp1C = (Rand_ZeroOne() - 0.5f); - sp24 = - D_80178280[D_801778A0].unk_078 + 1000.0f + (sp1C * 500.0f) + (5.0f * D_80178280[D_801778A0].unk_0C0.y); + sp24 = gPlayer[D_801778A0].unk_078 + 1000.0f + (sp1C * 500.0f) + (5.0f * gPlayer[D_801778A0].unk_0C0.y); sp20 = -D_80177D20 - 2000.0f * Rand_ZeroOne(); if (D_80177D08 < 0.0f) { sp20 = -D_80177D20 + 1000.0f; } - func_80061958(&D_80170130[i], sp28, sp24, sp20); + func_80061958(&gObjects8C[i], sp28, sp24, sp20); break; } } } void func_80061E48(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3) { - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 181; + arg0->obj.id = OBJECT_181; if (Rand_ZeroOne() < 0.5f) { - arg0->obj.id = 186; + arg0->obj.id = OBJECT_186; } if (Rand_ZeroOne() < 0.5f) { - arg0->obj.id = 182; + arg0->obj.id = OBJECT_182; } arg0->obj.pos.x = arg1; arg0->obj.pos.y = arg2; arg0->obj.pos.z = arg3; - arg0->unk_0F0 = 10.0f; + arg0->unk_0E8.z = 10.0f; func_800612B8(&arg0->unk_01C, arg0->obj.id); } void func_80061F0C(Object_2F4* arg0, ObjectInit* arg1, s32 arg2) { Vec3f sp24; - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 2; arg0->unk_040 = arg2; - arg0->obj.pos.z = -arg1->unk_0; - arg0->obj.pos.z += -3000.0f + arg1->unk_4; - arg0->obj.pos.x = arg1->unk_6; - arg0->obj.pos.y = arg1->unk_8; - arg0->obj.rot.y = arg0->unk_0F8 = arg1->unk_C; - arg0->obj.rot.x = arg0->unk_0F4 = arg1->unk_A; - arg0->unk_0FC = arg1->unk_E; - arg0->obj.id = 200; + arg0->obj.pos.z = -arg1->zPos1; + arg0->obj.pos.z += -3000.0f + arg1->zPos2; + arg0->obj.pos.x = arg1->xPos; + arg0->obj.pos.y = arg1->yPos; + arg0->obj.rot.y = arg0->unk_0F4.y = arg1->unk_C; + arg0->obj.rot.x = arg0->unk_0F4.x = arg1->unk_A; + arg0->unk_0F4.z = arg1->unk_E; + arg0->obj.id = OBJECT_200; arg0->unk_0C2 = 10; - arg0->unk_0B4 = 0xFFF; - arg0->unk_0E4 = arg1->unk_10 - 1000; + arg0->unk_0B4 = 4095; + arg0->unk_0E4 = arg1->id - OBJECT_UNK_1000; func_800612B8(&arg0->unk_01C, arg0->obj.id); arg0->unk_01C.unk_10 = 3000.0f; arg0->unk_178 = 20000.0f; arg0->unk_054 = D_80177E70; - arg0->unk_078 = D_80163FE0[D_80177E70].unk_0E4; + arg0->unk_078 = gObjects2F4[D_80177E70].unk_0E4; arg0->unk_16C = D_80161A54; Matrix_RotateZ(gCalcMatrix, -D_80177E88.z * M_DTOR, 0); Matrix_RotateX(gCalcMatrix, -D_80177E88.x * M_DTOR, 1); @@ -370,83 +375,83 @@ void func_80062180(ObjectInit* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { f32 temp_fv0; s32 i; - if ((arg1 > arg0->unk_6 - D_80178280[0].unk_0AC) && (arg0->unk_6 - D_80178280[0].unk_0AC > arg2) && - (arg3 > arg0->unk_8 - D_80178280[0].unk_0B0) && (arg0->unk_8 - D_80178280[0].unk_0B0 > arg4)) { - if (arg0->unk_10 < 161) { - for (i = 0; i < ARRAY_COUNT(D_80161B00); i++) { - if (D_80161B00[i].obj.status == 0) { - func_800614B4(&D_80161B00[i], arg0); + if ((arg1 > arg0->xPos - gPlayer[0].unk_0AC) && (arg0->xPos - gPlayer[0].unk_0AC > arg2) && + (arg3 > arg0->yPos - gPlayer[0].unk_0B0) && (arg0->yPos - gPlayer[0].unk_0B0 > arg4)) { + if (arg0->id < OBJECT_161) { + for (i = 0; i < ARRAY_COUNT(gObjects80); i++) { + if (gObjects80[i].obj.status == 0) { + func_800614B4(&gObjects80[i], arg0); break; } } } - if ((arg0->unk_10 >= 161) && (arg0->unk_10 < 176)) { - for (i = 0; i < ARRAY_COUNT(D_80163400); i++) { - if (D_80163400[i].obj.status == 0) { - func_800615A0(&D_80163400[i], arg0); + if ((arg0->id >= OBJECT_161) && (arg0->id < OBJECT_176)) { + for (i = 0; i < ARRAY_COUNT(gObjects4C); i++) { + if (gObjects4C[i].obj.status == 0) { + func_800615A0(&gObjects4C[i], arg0); break; } } } - if ((arg0->unk_10 >= 176) && (arg0->unk_10 < 292)) { - if ((arg0->unk_10 == 267) || (arg0->unk_10 == 254)) { - for (i = ARRAY_COUNT(D_80163FE0) - 1; i >= 0; i--) { - if (D_80163FE0[i].obj.status == 0) { - func_8006168C(&D_80163FE0[i], arg0); + if ((arg0->id >= OBJECT_176) && (arg0->id < OBJECT_292)) { + if ((arg0->id == OBJECT_267) || (arg0->id == OBJECT_254)) { + for (i = ARRAY_COUNT(gObjects2F4) - 1; i >= 0; i--) { + if (gObjects2F4[i].obj.status == 0) { + func_8006168C(&gObjects2F4[i], arg0); break; } } - } else if (arg0->unk_10 == 198) { + } else if (arg0->id == OBJECT_198) { for (i = 0; i < 3; i++) { - if (D_80163FE0[i].obj.status == 0) { - func_8006168C(&D_80163FE0[i], arg0); + if (gObjects2F4[i].obj.status == 0) { + func_8006168C(&gObjects2F4[i], arg0); break; } } } else { - for (i = 4; i < ARRAY_COUNT(D_80163FE0); i++) { - if (D_80163FE0[i].obj.status == 0) { - func_8006168C(&D_80163FE0[i], arg0); + for (i = 4; i < ARRAY_COUNT(gObjects2F4); i++) { + if (gObjects2F4[i].obj.status == 0) { + func_8006168C(&gObjects2F4[i], arg0); break; } } } } - if ((arg0->unk_10 >= 292) && (arg0->unk_10 < 322)) { - for (i = 0; i < ARRAY_COUNT(D_8016F110); i++) { - if (D_8016F110[i].obj.status == 0) { - func_80061778(&D_8016F110[i], arg0); + if ((arg0->id >= OBJECT_292) && (arg0->id < OBJECT_6C_LASERS)) { + for (i = 0; i < ARRAY_COUNT(gObjects408); i++) { + if (gObjects408[i].obj.status == 0) { + func_80061778(&gObjects408[i], arg0); break; } } } - if ((arg0->unk_10 >= 322) && (arg0->unk_10 < 339)) { - for (i = 0; i < ARRAY_COUNT(D_801737E0); i++) { - if (D_801737E0[i].obj.status == 0) { - func_80061864(&D_801737E0[i], arg0); + if ((arg0->id >= OBJECT_6C_LASERS) && (arg0->id < OBJECT_339)) { + for (i = 0; i < ARRAY_COUNT(gObjects6C); i++) { + if (gObjects6C[i].obj.status == 0) { + func_80061864(&gObjects6C[i], arg0); break; } } } - if (arg0->unk_10 >= 339 && arg0->unk_10 < 407) { - switch (arg0->unk_10) { - case 403: + if (arg0->id >= OBJECT_339 && arg0->id <= OBJECT_UNK_406) { + switch (arg0->id) { + case OBJECT_UNK_403: D_E6A810_801BA1E8 = 99; break; - case 404: + case OBJECT_UNK_404: D_E6A810_801BA1E8 = 0; break; - case 405: + case OBJECT_UNK_405: D_E6A810_801BA1E8 = 98; break; - case 402: + case OBJECT_UNK_402: D_E9F1D0_801A7F78 = arg0->unk_E * 0.1f; D_E9F1D0_801A7F60 = -(f32) arg0->unk_A; break; - case 400: + case OBJECT_UNK_400: D_801782B8++; break; - case 401: + case OBJECT_UNK_401: if (D_801782B8 > 0) { D_801782B8--; break; @@ -454,10 +459,10 @@ void func_80062180(ObjectInit* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { break; } } - if (arg0->unk_10 >= 407) { - for (i = 0; i < ARRAY_COUNT(D_80163FE0); i++) { - if (D_80163FE0[i].obj.status == 0) { - func_80061F0C(&D_80163FE0[i], arg0, i); + if (arg0->id > OBJECT_UNK_406) { + for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) { + if (gObjects2F4[i].obj.status == 0) { + func_80061F0C(&gObjects2F4[i], arg0, i); break; } } @@ -468,7 +473,7 @@ void func_80062180(ObjectInit* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { void func_80062568(void) { ObjectInit* var_s1; s32 var_s0; - s32 temp = D_80178234; // seems fake + s32 temp = gCurrentLevel; // seems fake if (1) {} D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[temp]); var_s0 = D_80177CA0 - 40; @@ -488,33 +493,33 @@ void func_80062664(void) { s32 i; s32 j; - if ((D_80178234 == 1) && (D_8017827C == 1)) { + if ((gCurrentLevel == LEVEL_METEO) && (D_8017827C == 1)) { D_80178310 = SEGMENTED_TO_VIRTUAL(D_602B148); - } else if ((D_80178234 == 2) && (D_8017827C == 1)) { + } else if ((gCurrentLevel == LEVEL_SECTOR_X) && (D_8017827C == 1)) { D_80178310 = SEGMENTED_TO_VIRTUAL(D_602F18C); - } else if ((D_80178234 == 9) && (D_8017827C == 1)) { + } else if ((gCurrentLevel == LEVEL_VENOM_2) && (D_8017827C == 1)) { D_80178310 = SEGMENTED_TO_VIRTUAL(D_C0356A4); - } else if ((D_80178234 == 6) && (D_8017827C == 1)) { + } else if ((gCurrentLevel == LEVEL_VENOM_1) && (D_8017827C == 1)) { D_80178310 = SEGMENTED_TO_VIRTUAL(D_6010088); } else { - D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[D_80178234]); + D_80178310 = SEGMENTED_TO_VIRTUAL(D_800CFDA0[gCurrentLevel]); } if (D_8017812C == 0) { for (j = 0; j < D_801782B8; j++) { - if (D_80178234 == 13) { + if (gCurrentLevel == LEVEL_AQUAS) { func_80061B68(); } else { func_80061A4C(); } } } - if (D_80178234 == 1) { + if (gCurrentLevel == LEVEL_METEO) { var_fs3 = var_fs1 = 10000.0f; var_fs4 = var_fs2 = -10000.0f; - } else if (D_80178234 == 5) { + } else if (gCurrentLevel == LEVEL_SECTOR_Y) { var_fs3 = var_fs1 = 6000.0f; var_fs4 = var_fs2 = -6000.0f; - } else if (D_80178234 == 6) { + } else if (gCurrentLevel == LEVEL_VENOM_1) { var_fs3 = var_fs1 = 3500.0f; var_fs4 = var_fs2 = -3500.0f; } else { @@ -522,19 +527,20 @@ void func_80062664(void) { var_fs4 = var_fs2 = -4000.0f; } - if ((D_80178280[0].unk_210 != 0) && (D_80178280[0].unk_118 < 0.0f)) { + if ((gPlayer[0].unk_210 != 0) && (gPlayer[0].unk_118 < 0.0f)) { var_fs1 = 10000.0f; } - if ((D_80178280[0].unk_210 != 0) && (D_80178280[0].unk_118 > 0.0f)) { + if ((gPlayer[0].unk_210 != 0) && (gPlayer[0].unk_118 > 0.0f)) { var_fs2 = -10000.0f; } D_80161680 = 0; for (i = 0, var_s0_2 = &D_80178310[D_80177DC8]; i < 10000; i++, D_80177DC8++, var_s0_2++) { - if ((var_s0_2->unk_10 >= 0) && D_80177D20 <= var_s0_2->unk_0 && var_s0_2->unk_0 <= D_80177D20 + 200.0f) { - if ((D_80178234 == 6) && (var_s0_2->unk_10 >= 1000)) { - if (((var_s0_2->unk_C < 180.0f) && (var_s0_2->unk_6 < D_80178280[0].unk_0AC)) || - ((var_s0_2->unk_C > 180.0f) && (D_80178280[0].unk_0AC < var_s0_2->unk_6))) { + if ((var_s0_2->id > OBJECT_INVALID) && D_80177D20 <= var_s0_2->zPos1 && + var_s0_2->zPos1 <= D_80177D20 + 200.0f) { + if ((gCurrentLevel == LEVEL_VENOM_1) && (var_s0_2->id >= OBJECT_UNK_1000)) { + if (((var_s0_2->unk_C < 180.0f) && (var_s0_2->xPos < gPlayer[0].unk_0AC)) || + ((var_s0_2->unk_C > 180.0f) && (gPlayer[0].unk_0AC < var_s0_2->xPos))) { func_80062180(var_s0_2, var_fs1, var_fs2, var_fs3, var_fs4); } } else { @@ -549,20 +555,20 @@ void func_80062664(void) { void func_80062B60(f32 arg0, f32 arg1, s32 arg2, f32 arg3) { s32 i; - if (D_80177C98 == 0) { - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { - func_80061474(&D_80170130[i]); - D_80170130[i].obj.status = 1; - D_80170130[i].obj.id = 348; - D_80170130[i].obj.pos.x = arg0; - D_80170130[i].obj.pos.y = D_80177940 + 3.0f; - D_80170130[i].obj.pos.z = arg1; - D_80170130[i].unk_70 = 10.0f; - D_80170130[i].unk_6C = arg3; - D_80170130[i].unk_44 = 80; - D_80170130[i].unk_4E = arg2; - func_800612B8(&D_80170130[i].unk_1C, D_80170130[i].obj.id); + if (gLevelType == 0) { + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + Object_8C_Initialize(&gObjects8C[i]); + gObjects8C[i].obj.status = 1; + gObjects8C[i].obj.id = OBJECT_348; + gObjects8C[i].obj.pos.x = arg0; + gObjects8C[i].obj.pos.y = D_80177940 + 3.0f; + gObjects8C[i].obj.pos.z = arg1; + gObjects8C[i].unk_70 = 10.0f; + gObjects8C[i].unk_6C = arg3; + gObjects8C[i].unk_44 = 80; + gObjects8C[i].unk_4E = arg2; + func_800612B8(&gObjects8C[i].unk_1C, gObjects8C[i].obj.id); break; } } @@ -572,19 +578,19 @@ void func_80062B60(f32 arg0, f32 arg1, s32 arg2, f32 arg3) { void func_80062C38(f32 arg0, f32 arg1) { s32 i; - if (D_80177C98 == 0) { - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { - func_80061474(&D_80170130[i]); - D_80170130[i].obj.status = 1; - D_80170130[i].obj.id = 349; - D_80170130[i].obj.pos.x = arg0; - D_80170130[i].obj.pos.y = D_80177940 + 3.0f; - D_80170130[i].obj.pos.z = arg1; - D_80170130[i].unk_70 = 1.0f; - D_80170130[i].unk_6C = 1.3f; - D_80170130[i].unk_44 = 120; - func_800612B8(&D_80170130[i].unk_1C, D_80170130[i].obj.id); + if (gLevelType == 0) { + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + Object_8C_Initialize(&gObjects8C[i]); + gObjects8C[i].obj.status = 1; + gObjects8C[i].obj.id = OBJECT_349; + gObjects8C[i].obj.pos.x = arg0; + gObjects8C[i].obj.pos.y = D_80177940 + 3.0f; + gObjects8C[i].obj.pos.z = arg1; + gObjects8C[i].unk_70 = 1.0f; + gObjects8C[i].unk_6C = 1.3f; + gObjects8C[i].unk_44 = 120; + func_800612B8(&gObjects8C[i].unk_1C, gObjects8C[i].obj.id); break; } } @@ -594,18 +600,18 @@ void func_80062C38(f32 arg0, f32 arg1) { void func_80062D04(f32 arg0, f32 arg1) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { - func_80061474(&D_80170130[i]); - D_80170130[i].obj.status = 1; - D_80170130[i].obj.id = 350; - D_80170130[i].obj.pos.x = arg0; - D_80170130[i].obj.pos.y = D_80177940 + 3.0f; - D_80170130[i].obj.pos.z = arg1; - D_80170130[i].unk_70 = 3.0f; - D_80170130[i].unk_6C = 2.0f; - D_80170130[i].unk_44 = 120; - func_800612B8(&D_80170130[i].unk_1C, D_80170130[i].obj.id); + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + Object_8C_Initialize(&gObjects8C[i]); + gObjects8C[i].obj.status = 1; + gObjects8C[i].obj.id = OBJECT_350; + gObjects8C[i].obj.pos.x = arg0; + gObjects8C[i].obj.pos.y = D_80177940 + 3.0f; + gObjects8C[i].obj.pos.z = arg1; + gObjects8C[i].unk_70 = 3.0f; + gObjects8C[i].unk_6C = 2.0f; + gObjects8C[i].unk_44 = 120; + func_800612B8(&gObjects8C[i].unk_1C, gObjects8C[i].obj.id); break; } } @@ -768,13 +774,14 @@ s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { Vec3f temp; s32 i; - if ((D_80177880 == 1) && (D_80178234 != 0x10)) { + if ((D_80177880 == 1) && (gCurrentLevel != LEVEL_KATINA)) { var_s0 = D_801782A8; for (i = 0; i < 200; i++, var_s0++) { if (var_s0->obj.status == 2) { - if ((var_s0->obj.id == 1) || (var_s0->obj.id == 3) || (var_s0->obj.id == 117) || - (var_s0->obj.id == 141) || (var_s0->obj.id == 150) || (var_s0->obj.id == 149) || - (var_s0->obj.id == 148) || (var_s0->obj.id == 140)) { + if ((var_s0->obj.id == OBJECT_1) || (var_s0->obj.id == OBJECT_3) || (var_s0->obj.id == OBJECT_117) || + (var_s0->obj.id == OBJECT_141) || (var_s0->obj.id == OBJECT_150) || + (var_s0->obj.id == OBJECT_149) || (var_s0->obj.id == OBJECT_148) || + (var_s0->obj.id == OBJECT_140)) { if (func_8006326C(arg1, arg2, var_s0->obj.id, &var_s0->obj)) { return 999; } @@ -787,11 +794,11 @@ s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { } } } - var_s0_2 = D_80161B00; - for (i = 0; i < ARRAY_COUNT(D_80161B00) && D_80177880 == 0; i++, var_s0_2++) { + var_s0_2 = gObjects80; + for (i = 0; i < ARRAY_COUNT(gObjects80) && D_80177880 == 0; i++, var_s0_2++) { if (var_s0_2->obj.status == 2) { - if ((var_s0_2->obj.id == 1) || (var_s0_2->obj.id == 4) || (var_s0_2->obj.id == 5) || - (var_s0_2->obj.id == 2) || (var_s0_2->obj.id == 39) || (var_s0_2->obj.id == 3)) { + if ((var_s0_2->obj.id == OBJECT_1) || (var_s0_2->obj.id == OBJECT_4) || (var_s0_2->obj.id == OBJECT_5) || + (var_s0_2->obj.id == OBJECT_2) || (var_s0_2->obj.id == OBJECT_39) || (var_s0_2->obj.id == OBJECT_3)) { if (func_8006326C(arg1, arg2, var_s0_2->obj.id, &var_s0_2->obj)) { return 2; } @@ -803,12 +810,13 @@ s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { } } } - var_s0_3 = D_80163400; - for (i = 0; i < ARRAY_COUNT(D_80163400); i++, var_s0_3++) { + var_s0_3 = gObjects4C; + for (i = 0; i < ARRAY_COUNT(gObjects4C); i++, var_s0_3++) { if ((var_s0_3->obj.status == 2) && (fabsf(arg1->x - var_s0_3->obj.pos.x) < 500.0f) && (fabsf(arg1->z - var_s0_3->obj.pos.z) < 500.0f) && func_800631A8(arg1, var_s0_3->unk_1C.unk_0C, &var_s0_3->obj.pos)) { - if ((var_s0_3->obj.id == 163) || (var_s0_3->obj.id == 162) || (var_s0_3->obj.id == 162)) { + if ((var_s0_3->obj.id == OBJECT_163) || (var_s0_3->obj.id == OBJECT_162) || + (var_s0_3->obj.id == OBJECT_162)) { var_s0_3->unk_46 = 1; } return 0; @@ -816,24 +824,24 @@ s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { } if ((arg3 == 0) || (arg3 == 2) || (arg3 == 3)) { if (arg3 != 2) { - var_s0_4 = D_8016F110; - for (i = 0; i < ARRAY_COUNT(D_8016F110); i++, var_s0_4++) { + var_s0_4 = gObjects408; + for (i = 0; i < ARRAY_COUNT(gObjects408); i++, var_s0_4++) { if (var_s0_4->obj.status == 2) { - if ((var_s0_4->obj.id == 308) || (var_s0_4->obj.id == 312) || (var_s0_4->obj.id == 313) || - (var_s0_4->obj.id == 309)) { + if ((var_s0_4->obj.id == OBJECT_308) || (var_s0_4->obj.id == OBJECT_312) || + (var_s0_4->obj.id == OBJECT_313) || (var_s0_4->obj.id == OBJECT_309)) { if (func_8006326C(arg1, arg2, var_s0_4->obj.id, &var_s0_4->obj)) { return 2; } - } else if (var_s0_4->obj.id == 310) { - temp.x = fabsf(var_s0_4->obj.pos.x - arg1->x) * 0.8333333f; + } else if (var_s0_4->obj.id == OBJECT_310) { + temp.x = fabsf(var_s0_4->obj.pos.x - arg1->x) * (5.0f / 6.0f); temp.y = fabsf(var_s0_4->obj.pos.y - arg1->y) * 2; - temp.z = fabsf(var_s0_4->obj.pos.z - arg1->z) * 0.8333333f; + temp.z = fabsf(var_s0_4->obj.pos.z - arg1->z) * (5.0f / 6.0f); if (sqrtf(VEC3F_SQ(temp)) < 1500.0f) { var_s0_4->unk_062 = 1; return 2; } } else { - if (var_s0_4->obj.id == 316) { + if (var_s0_4->obj.id == OBJECT_316) { temp.x = fabsf(var_s0_4->obj.pos.x - arg1->x); temp.y = fabsf(var_s0_4->obj.pos.y - 300.0f - arg1->y) * 7.42f; temp.z = fabsf(var_s0_4->obj.pos.z - arg1->z); @@ -851,18 +859,18 @@ s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { } } } - var_s0_5 = D_80163FE0; - for (i = 0; i < ARRAY_COUNT(D_80163FE0); i++, var_s0_5++) { + var_s0_5 = gObjects2F4; + for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++, var_s0_5++) { if ((var_s0_5->obj.status >= 2) && (fabsf(arg1->x - var_s0_5->obj.pos.x) < 1000.0f) && (fabsf(arg1->z - var_s0_5->obj.pos.z) < 1500.0f) && (arg0 != i) && (var_s0_5->unk_01C.unk_16 != 2) && - ((var_s0_5->obj.id != 197) || (var_s0_5->unk_0E4 >= 4)) && (var_s0_5->unk_0C2 == 0)) { - if (var_s0_5->obj.id == 180) { + ((var_s0_5->obj.id != OBJECT_197) || (var_s0_5->unk_0E4 >= 4)) && (var_s0_5->unk_0C2 == 0)) { + if (var_s0_5->obj.id == OBJECT_180) { if (func_8006326C(arg1, arg2, var_s0_5->obj.id, &var_s0_5->obj) != 0) { return 2; } } else if (var_s0_5->unk_110 < 0.0f) { if (func_80062DBC(arg1, var_s0_5->unk_01C.unk_0C, &var_s0_5->obj, var_s0_5->unk_2E8.x, - var_s0_5->unk_2E8.y, var_s0_5->unk_2E8.z + var_s0_5->unk_0FC)) { + var_s0_5->unk_2E8.y, var_s0_5->unk_2E8.z + var_s0_5->unk_0F4.z)) { var_s0_5->unk_0D0 = 1; var_s0_5->unk_0D6 = 10; var_s0_5->unk_0D2 = -1; @@ -876,8 +884,9 @@ s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { var_s0_5->unk_0D0 = 1; var_s0_5->unk_0D6 = 10; var_s0_5->unk_0D2 = -1; - if (((var_s0_5->obj.id != 200) || (var_s0_5->unk_080 == 0)) && - ((var_s0_5->obj.id != 197) || ((var_s0_5->unk_0E4 >= 10) && (var_s0_5->unk_0E4 < 100)))) { + if (((var_s0_5->obj.id != OBJECT_200) || (var_s0_5->unk_080 == 0)) && + ((var_s0_5->obj.id != OBJECT_197) || + ((var_s0_5->unk_0E4 >= 10) && (var_s0_5->unk_0E4 < 100)))) { var_s0_5->unk_0CE = 0; } var_s0_5->unk_0D8.x = arg1->x; @@ -895,59 +904,60 @@ s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) { void func_80063CAC(Object_80* arg0) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80163FE0); i++) { - if (D_80163FE0[i].obj.status == 0) { - func_800613C4(&D_80163FE0[i]); - D_80163FE0[i].obj.status = 1; - D_80163FE0[i].obj.id = 193; - D_80163FE0[i].obj.pos.x = arg0->obj.pos.x; - D_80163FE0[i].obj.pos.y = arg0->obj.pos.y; - D_80163FE0[i].obj.pos.z = arg0->obj.pos.z; - D_80163FE0[i].obj.rot.y = Rand_ZeroOne() * 360.0f; - func_800612B8(&D_80163FE0[i].unk_01C, D_80163FE0[i].obj.id); + for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) { + if (gObjects2F4[i].obj.status == 0) { + Object_2F4_Initialize(&gObjects2F4[i]); + gObjects2F4[i].obj.status = 1; + gObjects2F4[i].obj.id = OBJECT_193; + gObjects2F4[i].obj.pos.x = arg0->obj.pos.x; + gObjects2F4[i].obj.pos.y = arg0->obj.pos.y; + gObjects2F4[i].obj.pos.z = arg0->obj.pos.z; + gObjects2F4[i].obj.rot.y = Rand_ZeroOne() * 360.0f; + func_800612B8(&gObjects2F4[i].unk_01C, gObjects2F4[i].obj.id); break; } } } -void func_80063D58(Object* arg0) { +void func_80063D58(Object_80* arg0) { s32 i; - arg0->pos.y = D_80177940; - for (i = 0; i < ARRAY_COUNT(D_80163400); i++) { - if (D_80163400[i].obj.status == 0) { - func_80061394(&D_80163400[i]); - D_80163400[i].obj.status = 1; - D_80163400[i].obj.id = 164; - D_80163400[i].unk_45 = arg0->id; - D_80163400[i].obj.pos.x = arg0->pos.x; - D_80163400[i].obj.pos.y = 5.0f; - D_80163400[i].obj.pos.z = arg0->pos.z; - if ((arg0->id == 0) || (arg0->id == 6) || (arg0->id == 7) || (arg0->id == 0x38) || (arg0->id == 0x14) || - (arg0->id == 0x15) || (arg0->id == 0x16)) { - D_80163400[i].obj.rot.y = arg0->rot.y; + arg0->obj.pos.y = D_80177940; + for (i = 0; i < ARRAY_COUNT(gObjects4C); i++) { + if (gObjects4C[i].obj.status == 0) { + Object_4C_Initialize(&gObjects4C[i]); + gObjects4C[i].obj.status = 1; + gObjects4C[i].obj.id = OBJECT_164; + gObjects4C[i].unk_45 = arg0->obj.id; + gObjects4C[i].obj.pos.x = arg0->obj.pos.x; + gObjects4C[i].obj.pos.y = 5.0f; + gObjects4C[i].obj.pos.z = arg0->obj.pos.z; + if ((arg0->obj.id == OBJECT_0) || (arg0->obj.id == OBJECT_6) || (arg0->obj.id == OBJECT_7) || + (arg0->obj.id == OBJECT_56) || (arg0->obj.id == OBJECT_20) || (arg0->obj.id == OBJECT_21) || + (arg0->obj.id == OBJECT_22)) { + gObjects4C[i].obj.rot.y = arg0->obj.rot.y; } else { - D_80163400[i].obj.rot.y = 44.9f; + gObjects4C[i].obj.rot.y = 44.9f; } - func_800612B8(&D_80163400[i].unk_1C, D_80163400[i].obj.id); + func_800612B8(&gObjects4C[i].unk_1C, gObjects4C[i].obj.id); break; } } } -void func_80063E5C(Object* arg0, f32* arg1) { +void func_80063E5C(Object_80* arg0, f32* arg1) { s32 i; Object_6C* var_v1; - for (i = 0, var_v1 = D_801737E0; i < ARRAY_COUNT(D_801737E0); i++, var_v1++) { + for (i = 0, var_v1 = gObjects6C; i < ARRAY_COUNT(gObjects6C); i++, var_v1++) { if (var_v1->obj.status == 0) { - func_80061444(&D_801737E0[i]); + Object_6C_Initialize(&gObjects6C[i]); var_v1->obj.status = 1; - var_v1->obj.id = 334; - var_v1->obj.pos.x = arg0->pos.x; - var_v1->obj.pos.y = arg0->pos.y; - var_v1->obj.pos.z = arg0->pos.z; - var_v1->obj.rot.y = arg0->rot.y; + var_v1->obj.id = OBJECT_334; + var_v1->obj.pos.x = arg0->obj.pos.x; + var_v1->obj.pos.y = arg0->obj.pos.y; + var_v1->obj.pos.z = arg0->obj.pos.z; + var_v1->obj.rot.y = arg0->obj.rot.y; func_800612B8(&var_v1->unk_1C, var_v1->obj.id); var_v1->unk_1C.unk_0C = SEGMENTED_TO_VIRTUAL(arg1); break; @@ -966,7 +976,7 @@ void func_80063F74(Object_6C* arg0) { arg0->unk_68 = arg0->obj.rot.z * 100.0f; } -void func_80063F90(s32 arg0, s32 arg1) { +void func_80063F90(s32 arg0, s32 objId) { s32 var_a0; s32 var_a2; f32 sp54; @@ -974,94 +984,95 @@ void func_80063F90(s32 arg0, s32 arg1) { f32 sp4C; f32* var_v0; - switch (arg1) { - case 0xAA: - func_8007A6F0(&D_80163400[arg0].obj.pos, 0x11000055); + switch (objId) { + case 170: + func_8007A6F0(&gObjects4C[arg0].obj.pos, 0x11000055); break; - case 0xEA: - func_80019218(0x11030010, &D_80163FE0[arg0].unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + case 234: + func_80019218(0x11030010, &gObjects2F4[arg0].unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); break; - case 0x36: - func_80019218(0x11000000, &D_80161B00[arg0].unk_70, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + case 54: + func_80019218(0x11000000, &gObjects80[arg0].unk_70, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); break; - case 0xC6: - func_80092D48(&D_80163FE0[arg0]); + case 198: + func_80092D48(&gObjects2F4[arg0]); break; - case 0xEB: - D_80163FE0[arg0].unk_13C = fabsf(Math_ModF(D_80163FE0[arg0].obj.pos.x, 100.0f)); + case 235: + gObjects2F4[arg0].unk_13C = fabsf(Math_ModF(gObjects2F4[arg0].obj.pos.x, 100.0f)); break; case 0xF7: - func_E16C50_8019D060(&D_80163FE0[arg0]); + func_E16C50_8019D060(&gObjects2F4[arg0]); break; case 0x170: - if (D_80178234 == 0xC) { - func_E6A810_801B6E20(D_80170130[arg0].obj.pos.x, D_80170130[arg0].obj.pos.z + D_80177D20, &sp54, &sp4C, + if (gCurrentLevel == LEVEL_TITANIA) { + func_E6A810_801B6E20(gObjects8C[arg0].obj.pos.x, gObjects8C[arg0].obj.pos.z + D_80177D20, &sp54, &sp4C, &sp50); - D_80170130[arg0].obj.pos.y = sp4C + 3.0f; - D_80170130[arg0].obj.rot.x = (sp54 * 180.0f) / M_PI; - D_80170130[arg0].obj.rot.z = (sp50 * 180.0f) / M_PI; - } else if (D_80178234 == 0xB) { - D_80170130[arg0].obj.status = 0; + gObjects8C[arg0].obj.pos.y = sp4C + 3.0f; + gObjects8C[arg0].obj.rot.x = (sp54 * 180.0f) / M_PI; + gObjects8C[arg0].obj.rot.z = (sp50 * 180.0f) / M_PI; + } else if (gCurrentLevel == LEVEL_MACBETH) { + gObjects8C[arg0].obj.status = 0; } break; case 0x1E: - func_80063E5C(&D_80161B00[arg0].obj, D_6006940); + func_80063E5C(&gObjects80[arg0], D_6006940); break; case 0x1F: - func_80063E5C(&D_80161B00[arg0].obj, D_600695C); + func_80063E5C(&gObjects80[arg0], D_600695C); break; case 0x20: - func_80063E5C(&D_80161B00[arg0].obj, D_6006978); + func_80063E5C(&gObjects80[arg0], D_6006978); break; case 0x21: - func_80063E5C(&D_80161B00[arg0].obj, D_6006994); + func_80063E5C(&gObjects80[arg0], D_6006994); break; case 0x22: - func_80063E5C(&D_80161B00[arg0].obj, D_60069B0); + func_80063E5C(&gObjects80[arg0], D_60069B0); break; case 0x23: - func_80063E5C(&D_80161B00[arg0].obj, D_60069CC); + func_80063E5C(&gObjects80[arg0], D_60069CC); break; case 0x24: - func_80063E5C(&D_80161B00[arg0].obj, D_60069E8); + func_80063E5C(&gObjects80[arg0], D_60069E8); break; case 0x25: - func_80063E5C(&D_80161B00[arg0].obj, D_6006A04); + func_80063E5C(&gObjects80[arg0], D_6006A04); break; case 0x26: - func_80063E5C(&D_80161B00[arg0].obj, D_6006A20); + func_80063E5C(&gObjects80[arg0], D_6006A20); break; case 0x17: - func_80063CAC(&D_80161B00[arg0]); + func_80063CAC(&gObjects80[arg0]); break; case 0x143: if (D_80177CA0 != 0) { - D_801737E0[arg0].obj.status = 0; + gObjects6C[arg0].obj.status = 0; } break; case 0x146: if (D_80177E80 < 0) { - D_801737E0[arg0].obj.status = 0; + gObjects6C[arg0].obj.status = 0; } break; case 0x14B: case 0x14C: case 0x14D: - func_80063F74(&D_801737E0[arg0]); + func_80063F74(&gObjects6C[arg0]); break; case 0x148: case 0x149: - func_80063F58(&D_801737E0[arg0]); + func_80063F58(&gObjects6C[arg0]); break; case 0x14A: - if (((D_80177E80 >= 7) && (D_80178234 == 0) && (D_801778B0[1] > 0)) || (D_80178234 != 0)) { - func_80063F58(&D_801737E0[arg0]); + if (((D_80177E80 >= 7) && (gCurrentLevel == LEVEL_CORNERIA) && (D_801778B0[1] > 0)) || + (gCurrentLevel != LEVEL_CORNERIA)) { + func_80063F58(&gObjects6C[arg0]); } else { - D_801737E0[arg0].obj.status = 0; + gObjects6C[arg0].obj.status = 0; } break; case 0x0: - func_80063E5C(&D_80161B00[arg0].obj, D_800CBF18); + func_80063E5C(&gObjects80[arg0], D_800CBF18); /* fallthrough */ case 0x6: case 0x7: @@ -1069,86 +1080,86 @@ void func_80063F90(s32 arg0, s32 arg1) { case 0x15: case 0x16: case 0x38: - func_80063D58(&D_80161B00[arg0].obj); + func_80063D58(&gObjects80[arg0]); break; case 0xBB: - D_80163FE0[arg0].unk_114 = D_80163FE0[arg0].obj.pos.x; - D_80163FE0[arg0].unk_118 = D_80163FE0[arg0].obj.pos.y; - D_80163FE0[arg0].obj.rot.z = D_80163FE0[arg0].obj.rot.x; - D_80163FE0[arg0].obj.rot.x = 0.0f; + gObjects2F4[arg0].unk_114 = gObjects2F4[arg0].obj.pos.x; + gObjects2F4[arg0].unk_118 = gObjects2F4[arg0].obj.pos.y; + gObjects2F4[arg0].obj.rot.z = gObjects2F4[arg0].obj.rot.x; + gObjects2F4[arg0].obj.rot.x = 0.0f; break; case 0xB6: case 0xBA: - D_80163FE0[arg0].unk_046 = D_80178320; - D_80163FE0[arg0].unk_048 = D_801783D8; - D_80163FE0[arg0].obj.rot.x = Rand_ZeroOne() * 360.0f; - D_80163FE0[arg0].obj.rot.y = Rand_ZeroOne() * 360.0f; + gObjects2F4[arg0].unk_046 = gFogRed; + gObjects2F4[arg0].unk_048 = gFogNear; + gObjects2F4[arg0].obj.rot.x = Rand_ZeroOne() * 360.0f; + gObjects2F4[arg0].obj.rot.y = Rand_ZeroOne() * 360.0f; break; case 0xB5: - D_80163FE0[arg0].obj.rot.x = Rand_ZeroOne() * 360.0f; - D_80163FE0[arg0].obj.rot.y = Rand_ZeroOne() * 360.0f; - D_80163FE0[arg0].unk_0CE = 200; + gObjects2F4[arg0].obj.rot.x = Rand_ZeroOne() * 360.0f; + gObjects2F4[arg0].obj.rot.y = Rand_ZeroOne() * 360.0f; + gObjects2F4[arg0].unk_0CE = 200; break; case 0xCA: - D_80163FE0[arg0].unk_0CE = 30; + gObjects2F4[arg0].unk_0CE = 30; break; case 0xFC: - if (D_80178280[0].unk_07C < D_80163FE0[arg0].obj.pos.z) { - func_80060FBC(&D_80163FE0[arg0].obj, &D_80163FE0[arg0].unk_100); + if (gPlayer[0].unk_07C < gObjects2F4[arg0].obj.pos.z) { + Object_Kill(&gObjects2F4[arg0].obj, &gObjects2F4[arg0].unk_100); } break; case 0xEF: - D_80163FE0[arg0].unk_050 = D_801784A4; + gObjects2F4[arg0].unk_050 = D_801784A4; D_801784A4++; break; case 0xEC: D_801784A4 = 0; - D_80163FE0[arg0].unk_0F4 = D_80163FE0[arg0].obj.rot.x; - D_80163FE0[arg0].unk_0F8 = D_80163FE0[arg0].obj.rot.y; - D_80163FE0[arg0].obj.rot.x = D_80163FE0[arg0].obj.rot.y = 0.0f; - D_80163FE0[arg0].unk_11C = D_80163FE0[arg0].obj.pos.y; + gObjects2F4[arg0].unk_0F4.x = gObjects2F4[arg0].obj.rot.x; + gObjects2F4[arg0].unk_0F4.y = gObjects2F4[arg0].obj.rot.y; + gObjects2F4[arg0].obj.rot.x = gObjects2F4[arg0].obj.rot.y = 0.0f; + gObjects2F4[arg0].unk_11C = gObjects2F4[arg0].obj.pos.y; var_v0 = D_801782C4; for (var_a0 = 0; var_a0 < 200; var_a0++, var_v0 += 6) { - var_v0[0] = D_80163FE0[arg0].obj.pos.x; - var_v0[1] = D_80163FE0[arg0].obj.pos.y; - var_v0[2] = D_80163FE0[arg0].obj.pos.z; - var_v0[3] = D_80163FE0[arg0].obj.rot.x; - var_v0[4] = D_80163FE0[arg0].obj.rot.y; - var_v0[5] = D_80163FE0[arg0].obj.rot.z; + var_v0[0] = gObjects2F4[arg0].obj.pos.x; + var_v0[1] = gObjects2F4[arg0].obj.pos.y; + var_v0[2] = gObjects2F4[arg0].obj.pos.z; + var_v0[3] = gObjects2F4[arg0].obj.rot.x; + var_v0[4] = gObjects2F4[arg0].obj.rot.y; + var_v0[5] = gObjects2F4[arg0].obj.rot.z; } break; case 0xC2: - D_80163FE0[arg0].unk_046 = 100; + gObjects2F4[arg0].unk_046 = 100; for (var_a0 = 0; var_a0 < 2; var_a0++) { if (D_80176550[var_a0] == 0) { D_80176550[var_a0] = 1; - D_80163FE0[arg0].unk_046 = var_a0; + gObjects2F4[arg0].unk_046 = var_a0; for (var_a2 = 0; var_a2 < 100; var_a2++) { - D_80176878[var_a0][var_a2] = D_80163FE0[arg0].obj.pos.y; - D_80176B98[var_a0][var_a2] = D_80163FE0[arg0].obj.pos.z; + D_80176878[var_a0][var_a2] = gObjects2F4[arg0].obj.pos.y; + D_80176B98[var_a0][var_a2] = gObjects2F4[arg0].obj.pos.z; } break; } } - if (D_80163FE0[arg0].unk_046 == 100) { - D_80163FE0[arg0].obj.status = 0; + if (gObjects2F4[arg0].unk_046 == 100) { + gObjects2F4[arg0].obj.status = 0; } break; case 0xBE: case 0xBF: - func_80019218(0x31000012, &D_80163FE0[arg0].unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_80019218(0x31000012, &gObjects2F4[arg0].unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); break; case 0xC0: - D_80163FE0[arg0].unk_0C9 = 1; + gObjects2F4[arg0].unk_0C9 = 1; break; case 0x140: - func_E9F1D0_8018D16C(&D_8016F110[arg0]); + func_E9F1D0_8018D16C(&gObjects408[arg0]); break; case 0x13C: - func_E51970_80193CA4(&D_8016F110[arg0]); + func_E51970_80193CA4(&gObjects408[arg0]); break; case 0x13A: - func_E9F1D0_80197CC4(&D_8016F110[arg0]); + func_E9F1D0_80197CC4(&gObjects408[arg0]); break; case 0xCD: case 0xCE: @@ -1158,143 +1169,143 @@ void func_80063F90(s32 arg0, s32 arg1) { case 0xD3: case 0xD4: case 0xD5: - func_E6A810_80199F8C(&D_80163FE0[arg0]); + func_E6A810_80199F8C(&gObjects2F4[arg0]); break; case 0xCF: - func_E6A810_801A7D98(&D_80163FE0[arg0]); + func_E6A810_801A7D98(&gObjects2F4[arg0]); break; case 0xD6: - func_E6A810_801A3E70(&D_80163FE0[arg0]); + func_E6A810_801A3E70(&gObjects2F4[arg0]); break; case 0xD7: - func_E6A810_801A4660(&D_80163FE0[arg0]); + func_E6A810_801A4660(&gObjects2F4[arg0]); break; case 0xDF: - func_E6A810_801A4AF8(&D_80163FE0[arg0]); + func_E6A810_801A4AF8(&gObjects2F4[arg0]); break; case 0xD8: case 0xD9: - func_E6A810_801A5E2C(&D_80163FE0[arg0]); + func_E6A810_801A5E2C(&gObjects2F4[arg0]); break; case 0xDA: - func_E6A810_801A6134(&D_80163FE0[arg0]); + func_E6A810_801A6134(&gObjects2F4[arg0]); break; case 0x41: - func_E6A810_801A65E0(&D_80161B00[arg0]); + func_E6A810_801A65E0(&gObjects80[arg0]); break; case 0xB1: case 0xB2: - func_DF4260_8018B0B4(&D_80163FE0[arg0]); + func_DF4260_8018B0B4(&gObjects2F4[arg0]); /* fallthrough */ case 0xB0: - D_80163FE0[arg0].unk_0CE = 24; - func_80019218(0x31000016, &D_80163FE0[arg0].unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + gObjects2F4[arg0].unk_0CE = 24; + func_80019218(0x31000016, &gObjects2F4[arg0].unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); break; case 0x129: - func_E08400_80188A40(&D_8016F110[arg0]); + func_E08400_80188A40(&gObjects408[arg0]); break; case 0x12B: - func_80042FAC(&D_8016F110[arg0]); + func_80042FAC(&gObjects408[arg0]); break; case 0x12C: - func_80042FD0(&D_8016F110[arg0]); + func_80042FD0(&gObjects408[arg0]); break; case 0x124: - func_DF4260_801878D8(&D_8016F110[arg0]); + func_DF4260_801878D8(&gObjects408[arg0]); break; case 0x125: - func_DF4260_8018BE7C(&D_8016F110[arg0]); + func_DF4260_8018BE7C(&gObjects408[arg0]); break; case 0x12E: - func_E16C50_80187754(&D_8016F110[arg0]); + func_E16C50_80187754(&gObjects408[arg0]); break; case 0xE7: - func_E6A810_8018B96C(&D_80163FE0[arg0]); + func_E6A810_8018B96C(&gObjects2F4[arg0]); break; case 0xE8: - func_E6A810_8018ADC4(&D_80163FE0[arg0]); + func_E6A810_8018ADC4(&gObjects2F4[arg0]); break; case 0xE9: - func_E6A810_80189B80(&D_80163FE0[arg0]); + func_E6A810_80189B80(&gObjects2F4[arg0]); break; case 0xE5: - func_E6A810_8018BFB0(&D_80163FE0[arg0]); + func_E6A810_8018BFB0(&gObjects2F4[arg0]); break; case 0xE3: - func_E6A810_8018E3CC(&D_80163FE0[arg0]); + func_E6A810_8018E3CC(&gObjects2F4[arg0]); break; case 0xE4: - func_E6A810_8018E5E8(&D_80163FE0[arg0]); + func_E6A810_8018E5E8(&gObjects2F4[arg0]); break; case 0xA9: - func_E6A810_8018EFF0(&D_80163400[arg0]); + func_E6A810_8018EFF0(&gObjects4C[arg0]); break; case 0x132: - func_E6A810_8018FA48(&D_8016F110[arg0]); + func_E6A810_8018FA48(&gObjects408[arg0]); break; case 0xF0: - func_E16C50_801915A4(&D_80163FE0[arg0]); + func_E16C50_801915A4(&gObjects2F4[arg0]); break; case 0xF1: - func_E16C50_80191BB8(&D_80163FE0[arg0]); + func_E16C50_80191BB8(&gObjects2F4[arg0]); break; case 0x133: - func_E16C50_801932AC(&D_8016F110[arg0]); + func_E16C50_801932AC(&gObjects408[arg0]); break; case 0xFA: - func_E16C50_8019B1F0(&D_80163FE0[arg0]); + func_E16C50_8019B1F0(&gObjects2F4[arg0]); break; case 0xFB: - func_E16C50_8019B810(&D_80163FE0[arg0]); + func_E16C50_8019B810(&gObjects2F4[arg0]); break; case 0xFD: - func_E16C50_8019C200(&D_80163FE0[arg0]); + func_E16C50_8019C200(&gObjects2F4[arg0]); break; case 0xFF: - func_E16C50_801AD688(&D_80163FE0[arg0]); + func_E16C50_801AD688(&gObjects2F4[arg0]); break; case 0x100: - func_E16C50_801AE3AC(&D_80163FE0[arg0]); + func_E16C50_801AE3AC(&gObjects2F4[arg0]); break; case 0x101: - func_E16C50_801AF9FC(&D_80163FE0[arg0]); + func_E16C50_801AF9FC(&gObjects2F4[arg0]); break; case 0x13E: - func_E16C50_801B10F8(&D_8016F110[arg0]); + func_E16C50_801B10F8(&gObjects408[arg0]); break; case 0x103: - func_E16C50_801B6344(&D_80163FE0[arg0]); + func_E16C50_801B6344(&gObjects2F4[arg0]); break; case 0x106: - func_E16C50_801B6E54(&D_80163FE0[arg0]); + func_E16C50_801B6E54(&gObjects2F4[arg0]); break; case 0x104: - func_E16C50_801B7AF0(&D_80163FE0[arg0]); + func_E16C50_801B7AF0(&gObjects2F4[arg0]); break; case 0x39: - func_E6A810_8018F0D8(&D_80161B00[arg0]); + func_E6A810_8018F0D8(&gObjects80[arg0]); break; case 0x13F: - func_DF4260_801935CC(&D_8016F110[arg0]); + func_DF4260_801935CC(&gObjects408[arg0]); break; case 0x118: - func_DF4260_8019250C(&D_80163FE0[arg0]); + func_DF4260_8019250C(&gObjects2F4[arg0]); break; case 0x119: case 0x11A: - func_DF4260_80192CB0(&D_80163FE0[arg0]); + func_DF4260_80192CB0(&gObjects2F4[arg0]); break; case 0x11B: - func_DF4260_80192EA4(&D_80163FE0[arg0]); + func_DF4260_80192EA4(&gObjects2F4[arg0]); break; case 0x11C: - func_DF4260_801933B4(&D_80163FE0[arg0]); + func_DF4260_801933B4(&gObjects2F4[arg0]); break; case 0x109: - func_E16C50_801BA57C(&D_80163FE0[arg0]); + func_E16C50_801BA57C(&gObjects2F4[arg0]); break; case 0x10B: - func_E16C50_801BB26C(&D_80163FE0[arg0]); + func_E16C50_801BB26C(&gObjects2F4[arg0]); break; } } @@ -1314,14 +1325,14 @@ void func_800652CC(Object_80* arg0) { } void func_80065380(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 2; - arg0->obj.id = 182; + arg0->obj.id = OBJECT_182; arg0->unk_0BC = (s32) (Rand_ZeroOne() * 10.0f) + 10; arg0->unk_0C2 = 30; - arg0->unk_0E8 = arg4; - arg0->unk_0EC = arg5; - arg0->unk_0F0 = arg6; + arg0->unk_0E8.x = arg4; + arg0->unk_0E8.y = arg5; + arg0->unk_0E8.z = arg6; arg0->obj.pos.x = arg1; arg0->obj.pos.y = arg2; arg0->obj.pos.z = arg3; @@ -1335,9 +1346,9 @@ void func_80065380(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 void func_8006546C(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80163FE0); i++) { - if (D_80163FE0[i].obj.status == 0) { - func_80065380(&D_80163FE0[i], arg0, arg1, arg2, arg3, arg4, arg5); + for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) { + if (gObjects2F4[i].obj.status == 0) { + func_80065380(&gObjects2F4[i], arg0, arg1, arg2, arg3, arg4, arg5); break; } } @@ -1356,9 +1367,9 @@ void func_800654E4(Object* arg0) { } void func_800655C8(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 190; + arg0->obj.id = OBJECT_190; arg0->obj.pos.x = arg1; arg0->obj.pos.y = arg2; arg0->obj.pos.z = arg3; @@ -1374,9 +1385,9 @@ void func_800655C8(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { void func_8006566C(f32 arg0, f32 arg1, f32 arg2, s32 arg3) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80163FE0); i++) { - if (D_80163FE0[i].obj.status == 0) { - func_800655C8(&D_80163FE0[i], arg0, arg1, arg2, arg3); + for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) { + if (gObjects2F4[i].obj.status == 0) { + func_800655C8(&gObjects2F4[i], arg0, arg1, arg2, arg3); break; } } @@ -1412,7 +1423,7 @@ void func_800656D4(Object_2F4* arg0) { var_ra = 0; } if (arg0->unk_058 == 0) { - if (arg0->obj.id == 0xBE) { + if (arg0->obj.id == OBJECT_190) { for (i = 0, j = 1; j < 4; i++, j++) { spA8[i] = var_ra + j; spB4[i] = D_801778B0[j]; @@ -1428,7 +1439,7 @@ void func_800656D4(Object_2F4* arg0) { spA8[i] = temp_v0; } } - switch (D_80177DB0 % 6U) { + switch (gFrameCount % 6U) { case 0: case 1: case 2: @@ -1446,29 +1457,29 @@ void func_800656D4(Object_2F4* arg0) { if (((D_80177880 == 1) && (D_801778B0[spC4 - 1] > 0)) || D_801778B0[spC4 + 1] > 0) { arg0->unk_054 = spC4; } else { - arg0->unk_054 = 0x2710; + arg0->unk_054 = 10000; } } else { - arg0->unk_054 = 0x2710; + arg0->unk_054 = 10000; } arg0->unk_058 = 1; } spC4 = arg0->unk_054; if ((spC4 == var_ra) || ((var_ra + 1) == spC4) || ((var_ra + 2) == spC4)) { - arg0->unk_188 = D_80163FE0[spC4].obj.pos.z; - arg0->unk_184 = D_80163FE0[spC4].obj.pos.y; - arg0->unk_180 = D_80163FE0[spC4].obj.pos.x; - if ((fabsf(arg0->obj.pos.x - D_80163FE0[spC4].obj.pos.x) < 400.0f) && - (fabsf(arg0->obj.pos.z - D_80163FE0[spC4].obj.pos.z) < 400.0f)) { + arg0->unk_188 = gObjects2F4[spC4].obj.pos.z; + arg0->unk_184 = gObjects2F4[spC4].obj.pos.y; + arg0->unk_180 = gObjects2F4[spC4].obj.pos.x; + if ((fabsf(arg0->obj.pos.x - gObjects2F4[spC4].obj.pos.x) < 400.0f) && + (fabsf(arg0->obj.pos.z - gObjects2F4[spC4].obj.pos.z) < 400.0f)) { if ((Rand_ZeroOne() * (spC4 - 1)) < 0.6f) { - D_80163FE0[spC4].unk_078 = 1; + gObjects2F4[spC4].unk_078 = 1; } } } else { - arg0->unk_188 = D_80178280[0].unk_138; - arg0->unk_184 = D_80178280[0].unk_078; - arg0->unk_180 = D_80178280[0].unk_074; + arg0->unk_188 = gPlayer[0].unk_138; + arg0->unk_184 = gPlayer[0].unk_078; + arg0->unk_180 = gPlayer[0].unk_074; } if (arg0->unk_0BC != 0) { Math_SmoothStepToAngle(&arg0->obj.rot.x, 0.0f, 0.3f, 4.0f, 0.001f); @@ -1495,18 +1506,18 @@ void func_800656D4(Object_2F4* arg0) { } if ((fabsf(arg0->unk_180 - arg0->obj.pos.x) < 60.0f) && (fabsf(arg0->unk_184 - arg0->obj.pos.y) < 60.0f) && (fabsf(arg0->unk_188 - arg0->obj.pos.z) < 60.0f) && ((spC4 == 2) || (spC4 == 3) || (spC4 == 4))) { - D_80163FE0[spC4].unk_0D0 = 1; - D_80163FE0[spC4].unk_0D6 = 20; - D_80163FE0[spC4].unk_0D4 = 2; + gObjects2F4[spC4].unk_0D0 = 1; + gObjects2F4[spC4].unk_0D6 = 20; + gObjects2F4[spC4].unk_0D4 = 2; func_8007A6F0(&arg0->obj.pos, 0x2903A008); func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 5.0f); - func_80060FBC(&arg0->obj, &arg0->unk_100); + Object_Kill(&arg0->obj, &arg0->unk_100); } } Math_Vec3fFromAngles(&sp98, arg0->obj.rot.x, arg0->obj.rot.y, arg0->unk_124.y); - arg0->unk_0E8 = sp98.x; - arg0->unk_0EC = sp98.y; - arg0->unk_0F0 = sp98.z - D_80177D08; + arg0->unk_0E8.x = sp98.x; + arg0->unk_0E8.y = sp98.y; + arg0->unk_0E8.z = sp98.z - D_80177D08; if (arg0->unk_0B4 == 0) { arg0->obj.rot.z += 5.0f; } @@ -1527,25 +1538,25 @@ void func_800656D4(Object_2F4* arg0) { if ((D_801784AC == 4) && (func_E6A810_801B6AEC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z + D_80177D20) != 0)) { func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 5.0f); - func_80060FBC(&arg0->obj, &arg0->unk_100); + Object_Kill(&arg0->obj, &arg0->unk_100); } - sp8C.x = arg0->unk_0E8; - sp8C.y = arg0->unk_0EC; - sp8C.z = arg0->unk_0F0; + sp8C.x = arg0->unk_0E8.x; + sp8C.y = arg0->unk_0E8.y; + sp8C.z = arg0->unk_0E8.z; if ((func_8006351C(arg0->unk_040, &arg0->obj.pos, &sp8C, 1) != 0) || (arg0->unk_0D0 != 0) || - (arg0->obj.pos.y < (D_80177940 + 10.0f)) || (D_80178280[0].unk_1C8 == 7)) { + (arg0->obj.pos.y < (D_80177940 + 10.0f)) || (gPlayer[0].unk_1C8 == 7)) { func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 3.0f); - func_80060FBC(&arg0->obj, &arg0->unk_100); + Object_Kill(&arg0->obj, &arg0->unk_100); if (arg0->unk_0D0 != 0) { arg0->unk_044 = 2; - if ((D_80178234 == 0)) { + if ((gCurrentLevel == LEVEL_CORNERIA)) { if (D_80177880 == 1) { arg0->unk_044 = 2; } else { arg0->unk_044 = 4; } } - if (D_80178234 == 3) { + if (gCurrentLevel == LEVEL_AREA_6) { arg0->unk_044 = 22; } func_80066254(arg0); @@ -1553,11 +1564,11 @@ void func_800656D4(Object_2F4* arg0) { func_8007A6F0(&arg0->obj.pos, 0x2903A008); } if (D_80177880 == 0) { - if (fabsf(arg0->obj.pos.z - D_80178280[0].unk_138) < 100.0f) { + if (fabsf(arg0->obj.pos.z - gPlayer[0].unk_138) < 100.0f) { arg0->unk_078 = 1; } - if (D_80178280[0].unk_040.z < (arg0->obj.pos.z + D_80177D20)) { - func_80060FBC(&arg0->obj, &arg0->unk_100); + if (gPlayer[0].unk_040.z < (arg0->obj.pos.z + D_80177D20)) { + Object_Kill(&arg0->obj, &arg0->unk_100); } } } @@ -1566,12 +1577,12 @@ void func_800656D4(Object_2F4* arg0) { #endif void func_800660F0(Object_2F4* arg0) { - Object_6C* var_s0 = D_801737E0; + Object_6C* var_s0 = gObjects6C; s32 i; - for (i = 0; i < ARRAY_COUNT(D_801737E0); i++, var_s0++) { + for (i = 0; i < ARRAY_COUNT(gObjects6C); i++, var_s0++) { if (var_s0->obj.status == 0) { - func_80061444(var_s0); + Object_6C_Initialize(var_s0); var_s0->obj.status = 1; var_s0->obj.id = D_800CFDF4[arg0->unk_044]; var_s0->obj.pos.x = arg0->obj.pos.x; @@ -1579,14 +1590,15 @@ void func_800660F0(Object_2F4* arg0) { var_s0->obj.pos.z = arg0->obj.pos.z; var_s0->unk_4A = 8; func_800612B8(&var_s0->unk_1C, var_s0->obj.id); - if ((var_s0->obj.id == 0x144) || (var_s0->obj.id == 0x147) || (var_s0->obj.id == 0x142)) { + if ((var_s0->obj.id == OBJECT_6C_SILVER_RING) || (var_s0->obj.id == OBJECT_6C_BOMB) || + (var_s0->obj.id == OBJECT_6C_LASERS)) { var_s0->unk_50 = 90.0f; } - if ((var_s0->obj.id >= 0x150) || (var_s0->obj.id == 0x14F)) { + if ((var_s0->obj.id >= OBJECT_6C_GOLD_RING) || (var_s0->obj.id == OBJECT_6C_1UP)) { var_s0->unk_50 = 90.0f; func_80019218(0x4900000C, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); var_s0->unk_48 = 1000; - if (var_s0->obj.id == 0x151) { + if (var_s0->obj.id == OBJECT_6C_WING_REPAIR) { func_80019218(0x1900302B, &var_s0->unk_5C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } } @@ -1604,21 +1616,21 @@ void func_80066254(Object_2F4* arg0) { !((D_80178768[0] == 0) && (D_80178768[1] == 0) && (D_80178768[2] == 0))) { D_80177C30[arg0->unk_0D4 - 1] += arg0->unk_01C.unk_20; } - } else if ((arg0->obj.id != 0xC5) || (arg0->unk_0B6 != 1)) { + } else if ((arg0->obj.id != OBJECT_197) || (arg0->unk_0B6 != 1)) { if ((arg0->unk_0D4 == 1) && (arg0->unk_01C.unk_20 != 0)) { - D_80161A98 += arg0->unk_01C.unk_20; + gHitCount += arg0->unk_01C.unk_20; D_80177850 = 0xF; if ((D_80177880 == 1) && (D_80161A62 != 0)) { switch (D_80161A62) { case 9: - if (D_80178234 == 0x10) { - func_800BA808(gMsg_ID_18031, 0xAA); + if (gCurrentLevel == LEVEL_KATINA) { + func_800BA808(gMsg_ID_18031, RCID_BILL); } /* fallthrough */ case 4: case 19: case 29: - arg0->unk_044 = 0xE; + arg0->unk_044 = 14; break; case 14: arg0->unk_044 = 9; @@ -1626,7 +1638,7 @@ void func_80066254(Object_2F4* arg0) { } D_80161A62 = 0; } - if (arg0->obj.id == 0xC5) { + if (arg0->obj.id == OBJECT_197) { if ((arg0->unk_0E4 >= 4) && (arg0->unk_0E4 < 8)) { func_8002E3E0(arg0); } @@ -1634,8 +1646,8 @@ void func_80066254(Object_2F4* arg0) { } if (arg0->unk_044) { if (D_800CFE5C[arg0->unk_044] < 0.0f) { - var_v0 = D_80163FE0; - for (i = 0, var_v0 = D_80163FE0; i < ARRAY_COUNT(D_80163FE0); i++, var_v0++) { + var_v0 = gObjects2F4; + for (i = 0, var_v0 = gObjects2F4; i < ARRAY_COUNT(gObjects2F4); i++, var_v0++) { if ((var_v0->obj.status != 0) && (var_v0->unk_040 != arg0->unk_040) && (arg0->unk_08C == var_v0->unk_08C)) { return; @@ -1643,13 +1655,13 @@ void func_80066254(Object_2F4* arg0) { } func_800660F0(arg0); func_80019218(0x4900000C, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - } else if (arg0->unk_044 == 0x18) { + } else if (arg0->unk_044 == 24) { if (D_801778B0[3] > 0) { - func_800BA808(gMsg_ID_20261, 0x1E); + func_800BA808(gMsg_ID_20261, RCID_PEPPY); } else if (D_801778B0[2] > 0) { - func_800BA808(gMsg_ID_20263, 0x14); + func_800BA808(gMsg_ID_20263, RCID_SLIPPY); } else if (D_801778B0[1] > 0) { - func_800BA808(gMsg_ID_20262, 0xA); + func_800BA808(gMsg_ID_20262, RCID_FALCO); } } else if (Rand_ZeroOne() <= D_800CFE5C[arg0->unk_044]) { func_800660F0(arg0); @@ -1662,21 +1674,21 @@ void func_8006654C(Object_2F4* arg0) { arg0->unk_10C = 0.4f; if (arg0->obj.pos.y <= D_80177940 + 130.0f) { arg0->obj.pos.y = D_80177940 + 130.0f; - arg0->unk_0EC = 0.0f; + arg0->unk_0E8.y = 0.0f; } - arg0->unk_0E8 = __sinf(arg0->obj.rot.y * M_DTOR) * (*arg0).unk_114; - arg0->unk_0F0 = __cosf(arg0->obj.rot.y * M_DTOR) * (*arg0).unk_114; + arg0->unk_0E8.x = __sinf(arg0->obj.rot.y * M_DTOR) * (*arg0).unk_114; + arg0->unk_0E8.z = __cosf(arg0->obj.rot.y * M_DTOR) * (*arg0).unk_114; switch (arg0->unk_0B8) { case 0: if (arg0->unk_114 < 20.0f) { - arg0->unk_114 = arg0->unk_114 + 0.5f; + arg0->unk_114 += 0.5f; } arg0->unk_0B6++; if (Animation_GetFrameCount(&D_6029528) < arg0->unk_0B6) { arg0->unk_0B6 = 0; } if ((arg0->obj.rot.z < 15.0f) && (arg0->unk_0B6 < 0x14)) { - arg0->obj.rot.z = arg0->obj.rot.z + 1.0f; + arg0->obj.rot.z += 1.0f; } if ((arg0->obj.rot.z > -15.0f) && (arg0->unk_0B6 >= 0x15)) { arg0->obj.rot.z -= 1.0f; @@ -1688,13 +1700,13 @@ void func_8006654C(Object_2F4* arg0) { break; case 1: if (arg0->obj.rot.z > 0.0f) { - arg0->obj.rot.z = arg0->obj.rot.z - 0.5f; + arg0->obj.rot.z -= 0.5f; } if (arg0->obj.rot.z < 0.0f) { arg0->obj.rot.z += 0.5f; } if (arg0->unk_114 > 0.0f) { - arg0->unk_114 = arg0->unk_114 - 0.3f; + arg0->unk_114 -= 0.3f; } if (arg0->unk_0BC == 0) { arg0->unk_0B8 = 0; @@ -1704,11 +1716,11 @@ void func_8006654C(Object_2F4* arg0) { arg0->unk_110 = 0.8f; if (arg0->unk_0D0 != 0) { arg0->obj.status = 3; - arg0->unk_0EC = (Rand_ZeroOne() * 5.0f) + 6.0f; + arg0->unk_0E8.y = (Rand_ZeroOne() * 5.0f) + 6.0f; if (arg0->unk_0D0 == 2) { - arg0->unk_0EC = -2.0f; + arg0->unk_0E8.y = -2.0f; } - arg0->unk_0F0 = -15.0f; + arg0->unk_0E8.z = -15.0f; arg0->unk_10C = 0.5f; func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y + 30.0f, arg0->obj.pos.z, 13.0f); func_80019218(0x2903A008, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); @@ -1719,22 +1731,22 @@ void func_8006684C(Object_2F4* arg0) { s32 pad; if (arg0->unk_0BE != 0) { - arg0->unk_0F0 = 0.0f; - arg0->unk_0E8 = 0.0f; - arg0->unk_0EC = 0.0f; + arg0->unk_0E8.z = 0.0f; + arg0->unk_0E8.x = 0.0f; + arg0->unk_0E8.y = 0.0f; if (arg0->unk_0BE == 1) { - func_80060FBC(&arg0->obj, &arg0->unk_100); + Object_Kill(&arg0->obj, &arg0->unk_100); arg0->unk_044 = 1; func_80066254(arg0); func_80019218(0x2903B009, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); func_80077240(arg0->obj.pos.x, arg0->obj.pos.y + 250.0f, arg0->obj.pos.z, 3); - D_80161A98 += 3; + gHitCount += 3; D_80177850 = 0xF; } } else { arg0->obj.rot.x += 11.0f; arg0->obj.rot.y += 7.0f; - if (arg0->unk_0EC < -3.0f) { + if (arg0->unk_0E8.y < -3.0f) { func_8007BFFC(arg0->obj.pos.x, arg0->obj.pos.y + 30.0f, arg0->obj.pos.z, 0.0f, 0.0f, 0.0f, 7.0f, 5); arg0->unk_0BE = 3; } @@ -1744,7 +1756,7 @@ void func_8006684C(Object_2F4* arg0) { void func_800669A0(Object_2F4* arg0) { if (arg0->unk_0BC != 0) { if (arg0->unk_0BC == 1) { - func_80060FBC(&arg0->obj, &arg0->unk_100); + Object_Kill(&arg0->obj, &arg0->unk_100); } } else { arg0->obj.rot.y += 5.0f; @@ -1807,8 +1819,8 @@ void func_80066D5C(Object_80* arg0) { func_80019218(0x2900300F, &arg0->unk_70, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); break; case 2: - arg0->unk_64 += 0.05f; - arg0->obj.rot.x += arg0->unk_64; + arg0->unk_64.x += 0.05f; + arg0->obj.rot.x += arg0->unk_64.x; if (arg0->obj.rot.x >= 90.0f) { arg0->obj.rot.x = 90.0f; arg0->unk_44 = 40; @@ -1832,7 +1844,7 @@ void func_80066E8C(Object_4C* arg0) { void func_80066EA8(Object_80* arg0) { arg0->obj.rot.y = 0.0f; - if (D_80178280[0].unk_040.x < arg0->obj.pos.x) { + if (gPlayer[0].unk_040.x < arg0->obj.pos.x) { arg0->obj.rot.y = 271.0f; } } @@ -1843,41 +1855,41 @@ void func_80066EE4(Object_4C* arg0) { void func_80066EF0(Object_6C* arg0) { f32 var_fa1; - if ((D_80178280[0].unk_1C8 == 7) || (D_80178280[0].unk_1C8 == 0)) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); + if ((gPlayer[0].unk_1C8 == 7) || (gPlayer[0].unk_1C8 == 0)) { + Object_Kill(&arg0->obj, &arg0->unk_5C); } if ((D_80177880 == 0) && (D_80161680 == 0)) { var_fa1 = 900.0f; - if (D_80178280[0].unk_1CC != 0) { + if (gPlayer[0].unk_1CC != 0) { var_fa1 = 600.0f; } - if (D_80178280[0].unk_0AC + var_fa1 < arg0->obj.pos.x) { - Math_SmoothStepToF(&arg0->obj.pos.x, D_80178280[0].unk_0AC + var_fa1, 0.1f, 10.0f, 0.01f); + if (gPlayer[0].unk_0AC + var_fa1 < arg0->obj.pos.x) { + Math_SmoothStepToF(&arg0->obj.pos.x, gPlayer[0].unk_0AC + var_fa1, 0.1f, 10.0f, 0.01f); } - if (arg0->obj.pos.x < D_80178280[0].unk_0AC - var_fa1) { - Math_SmoothStepToF(&arg0->obj.pos.x, D_80178280[0].unk_0AC - var_fa1, 0.1f, 10.0f, 0.01f); + if (arg0->obj.pos.x < gPlayer[0].unk_0AC - var_fa1) { + Math_SmoothStepToF(&arg0->obj.pos.x, gPlayer[0].unk_0AC - var_fa1, 0.1f, 10.0f, 0.01f); } } if (arg0->obj.pos.y > 650.0f) { Math_SmoothStepToF(&arg0->obj.pos.y, 650.0f, 0.1f, 10.0f, 0.01f); } - if (D_80177C98 == 0) { + if (gLevelType == 0) { if (arg0->obj.pos.y < D_80177940 + 70.0f) { Math_SmoothStepToF(&arg0->obj.pos.y, D_80177940 + 70.0f, 0.1f, 5.0f, 0.01f); } - if ((D_80178234 == 0xD) && (D_80178284 != 0)) { + if ((gCurrentLevel == LEVEL_AQUAS) && (D_80178284 != 0)) { arg0->obj.pos.z += 20.0f; } } else if (arg0->obj.pos.y < -500.0f) { Math_SmoothStepToF(&arg0->obj.pos.y, -500.0f, 0.1f, 5.0f, 0.01f); } - if ((D_801778E8 != 0) && (arg0->unk_40 == 0) && (D_801737E0[1].obj.status == 2)) { - if (fabsf(arg0->obj.pos.x - D_801737E0[1].obj.pos.x) < 200.0f) { - if (fabsf(arg0->obj.pos.z - D_801737E0[1].obj.pos.z) < 200.0f) { + if ((D_801778E8 != 0) && (arg0->unk_40 == 0) && (gObjects6C[1].obj.status == 2)) { + if (fabsf(arg0->obj.pos.x - gObjects6C[1].obj.pos.x) < 200.0f) { + if (fabsf(arg0->obj.pos.z - gObjects6C[1].obj.pos.z) < 200.0f) { arg0->obj.pos.x = arg0->obj.pos.x - 5.0f; arg0->obj.pos.z = arg0->obj.pos.z - 5.0f; - D_801737E0[1].obj.pos.x += 5.0f; - D_801737E0[1].obj.pos.z += 5.0f; + gObjects6C[1].obj.pos.x += 5.0f; + gObjects6C[1].obj.pos.z += 5.0f; } } } @@ -1896,8 +1908,8 @@ void func_800671D0(Object_6C* arg0) { } else { var_v0 = 7; } - if (!(var_v0 & D_80177DB0)) { - Matrix_RotateY(gCalcMatrix, D_80177DB0 * 23.0f * M_DTOR, 0); + if (!(var_v0 & gFrameCount)) { + Matrix_RotateY(gCalcMatrix, gFrameCount * 23.0f * M_DTOR, 0); sp40.x = 50.0f; sp40.y = (Rand_ZeroOne() - 0.5f) * 120.0f; sp40.z = 0.0f; @@ -1909,18 +1921,18 @@ void func_800671D0(Object_6C* arg0) { } void func_80067348(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8) { - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 2; - arg0->obj.id = 189; + arg0->obj.id = OBJECT_189; arg0->unk_0B8 = 70; arg0->obj.pos.x = arg1; arg0->obj.pos.y = arg2; arg0->obj.pos.z = arg3; arg0->obj.rot.x = arg4; arg0->obj.rot.y = arg5; - arg0->unk_0E8 = arg6; - arg0->unk_0EC = arg7; - arg0->unk_0F0 = arg8; + arg0->unk_0E8.x = arg6; + arg0->unk_0E8.y = arg7; + arg0->unk_0E8.z = arg8; arg0->unk_0BC = (s32) (Rand_ZeroOne() * 15.0f) + 25.0f; arg0->unk_10C = 0.5f; func_800612B8(&arg0->unk_01C, arg0->obj.id); @@ -1930,20 +1942,20 @@ void func_800674B4(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f s32 i; for (i = 59; i >= 50; i--) { - if (D_80163FE0[i].obj.status == 0) { - func_80067348(&D_80163FE0[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); + if (gObjects2F4[i].obj.status == 0) { + func_80067348(&gObjects2F4[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); break; } } } void func_8006753C(Object_2F4* arg0) { - UnkStruct_D_80178280* new_var = D_80178280; // fake + Player* new_var = gPlayer; // fake? s32 i; arg0->obj.rot.y += 1.0f; if (D_80177880 == 1) { - if (D_80178234 == 0x12) { + if (gCurrentLevel == LEVEL_SECTOR_Z) { Math_SmoothStepToF(&arg0->obj.pos.x, -2000.0f, 0.05f, 60.0f, 0.01f); Math_SmoothStepToF(&arg0->obj.pos.y, -200.0f, 0.05f, 3.0f, 0.01f); Math_SmoothStepToF(&arg0->obj.pos.z, 0.0f, 0.05f, 0.f, 0.01f); @@ -1957,11 +1969,12 @@ void func_8006753C(Object_2F4* arg0) { if (arg0->unk_0CE <= 0) { func_8007A6F0(&arg0->obj.pos, 0x2903A008); func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 5.0f); - if (((new_var[0].unk_49C.unk_00 < 2) || (new_var[0].unk_49C.unk_01 < 2)) && (new_var[0].unk_1CC != 1)) { - arg0->unk_044 = 0x17; - } else if (D_80178280[0].unk_264 < 0x80) { - arg0->unk_044 = 0x19; - } else if ((D_80161AA8[0] == 0) && (new_var[0].unk_1CC != 1)) { + if (((new_var[0].wings.rightState <= 1) || (new_var[0].wings.leftState <= 1)) && + (new_var[0].unk_1CC != 1)) { + arg0->unk_044 = 23; + } else if (gPlayer[0].health < 0x80) { + arg0->unk_044 = 25; + } else if ((gLaserStrength[0] == 0) && (new_var[0].unk_1CC != 1)) { arg0->unk_044 = 9; } else { arg0->unk_044 = 5; @@ -1974,15 +1987,15 @@ void func_8006753C(Object_2F4* arg0) { (Rand_ZeroOne() * 10.0f) + 10.0f, (Rand_ZeroOne() - 0.5f) * 40.0f); func_800794CC(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 0.6f); } - func_80060FBC(&arg0->obj, &arg0->unk_100); + Object_Kill(&arg0->obj, &arg0->unk_100); } } - D_80175A10[63].unk_00 = 1; - D_80175A10[63].unk_02 = 0x67; - D_80175A10[63].pos.x = arg0->obj.pos.x; - D_80175A10[63].pos.y = arg0->obj.pos.y; - D_80175A10[63].pos.z = arg0->obj.pos.z; - D_80175A10[63].unk_10 = 0.0f; + gUnkEntities28[63].unk_00 = 1; + gUnkEntities28[63].unk_02 = 103; + gUnkEntities28[63].pos.x = arg0->obj.pos.x; + gUnkEntities28[63].pos.y = arg0->obj.pos.y; + gUnkEntities28[63].pos.z = arg0->obj.pos.z; + gUnkEntities28[63].unk_10 = 0.0f; } void func_80067874(Object_2F4* arg0) { @@ -1998,24 +2011,24 @@ void func_80067874(Object_2F4* arg0) { gSPDisplayList(gMasterDisp++, D_10177C0); Matrix_Pop(&gGfxMatrix); } - Lights_SetOneLight(&gMasterDisp, D_801784DC, D_801784E0, D_801784E4, D_80178548, D_8017854C, D_80178550, D_80178554, - D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG, + gAmbientB); } void func_80067A40(void) { - func_80019218(0x09008023, D_80178280[0].unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - if (D_80178280[0].unk_49C.unk_00 < 2) { + func_80019218(0x09008023, &gPlayer[0].unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + if (gPlayer[0].wings.rightState <= 1) { D_80177D40[0] = 1050; - D_80178280[0].unk_49C.unk_00 = 2; + gPlayer[0].wings.rightState = 2; } - if (D_80178280[0].unk_49C.unk_01 < 2) { + if (gPlayer[0].wings.leftState <= 1) { D_80177D58[0] = 1050; - D_80178280[0].unk_49C.unk_01 = 2; + gPlayer[0].wings.leftState = 2; } if (gExpertMode) { - D_80177D10[0] = D_80177D28[0] = 10; + gRightWingHealth[0] = gLeftWingHealth[0] = 10; } else { - D_80177D10[0] = D_80177D28[0] = 60; + gRightWingHealth[0] = gLeftWingHealth[0] = 60; } } @@ -2023,14 +2036,17 @@ void func_80067B1C(Object_6C* arg0) { func_80066EF0(arg0); func_800671D0(arg0); if (arg0->unk_4C != 0) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); - func_80060F30(D_80178280[arg0->unk_4E].unk_460, 0x4900C024, arg0->unk_4E); - if (D_80178234 != 0xA) { - D_80161AA0[arg0->unk_4E]++; + Player** players; + + Object_Kill(&arg0->obj, &arg0->unk_5C); + players = &gPlayer; // seems fake + func_80060F30(&(*players)[arg0->unk_4E].unk_460, 0x4900C024, arg0->unk_4E); + if (gCurrentLevel != LEVEL_TRAINING) { + gLifeCount[arg0->unk_4E]++; } } if (arg0->unk_48 == 1) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); + Object_Kill(&arg0->obj, &arg0->unk_5C); } } @@ -2039,34 +2055,34 @@ void func_80067BEC(Object_6C* arg0) { func_800671D0(arg0); if (arg0->unk_46 == 0) { switch (arg0->obj.id) { - case 0x147: - arg0->unk_68 = 18.0f; - if (arg0->unk_4C != 0) { - arg0->unk_4A = 0x32; - arg0->unk_46 = 1; - arg0->unk_48 = 0x14; - arg0->unk_50 = 60.0f; - D_80177DA0[arg0->unk_4E]++; - func_80060F30(D_80178280[arg0->unk_4E].unk_460, 0x49002005, arg0->unk_4E); - func_80060F30(D_80178280[arg0->unk_4E].unk_460, 0x49002006, arg0->unk_4E); - } - break; - case 0x142: + case OBJECT_6C_BOMB: arg0->unk_68 = 18.0f; if (arg0->unk_4C != 0) { arg0->unk_4A = 50; arg0->unk_46 = 1; arg0->unk_48 = 20; arg0->unk_50 = 60.0f; - D_80161AA8[arg0->unk_4E]++; - if (D_80161AA8[arg0->unk_4E] >= 3) { - D_80161AA8[arg0->unk_4E] = 2; + gBombCount[arg0->unk_4E]++; + func_80060F30(gPlayer[arg0->unk_4E].unk_460_arr, 0x49002005, arg0->unk_4E); + func_80060F30(gPlayer[arg0->unk_4E].unk_460_arr, 0x49002006, arg0->unk_4E); + } + break; + case OBJECT_6C_LASERS: + arg0->unk_68 = 18.0f; + if (arg0->unk_4C != 0) { + arg0->unk_4A = 50; + arg0->unk_46 = 1; + arg0->unk_48 = 20; + arg0->unk_50 = 60.0f; + gLaserStrength[arg0->unk_4E]++; + if (gLaserStrength[arg0->unk_4E] > 2) { + gLaserStrength[arg0->unk_4E] = 2; } - func_80060F30(D_80178280[arg0->unk_4E].unk_460, 0x49002004, arg0->unk_4E); + func_80060F30(gPlayer[arg0->unk_4E].unk_460_arr, 0x49002004, arg0->unk_4E); if (gExpertMode) { - D_80177D10[arg0->unk_4E] = D_80177D28[arg0->unk_4E] = 10; + gRightWingHealth[arg0->unk_4E] = gLeftWingHealth[arg0->unk_4E] = 10; } else { - D_80177D10[arg0->unk_4E] = D_80177D28[arg0->unk_4E] = 60; + gRightWingHealth[arg0->unk_4E] = gLeftWingHealth[arg0->unk_4E] = 60; } D_80177D40[arg0->unk_4E] = 1030; D_80177D58[arg0->unk_4E] = 1030; @@ -2075,22 +2091,22 @@ void func_80067BEC(Object_6C* arg0) { } } else { Math_SmoothStepToF(&arg0->unk_68, 2.5f, 1.0f, 0.5f, 0.0f); - arg0->obj.pos.x += (D_80178280[arg0->unk_4E].unk_074 - arg0->obj.pos.x) * 0.5f; - if (D_80178280[arg0->unk_4E].unk_1CC == 1) { - arg0->obj.pos.y += ((D_80178280[arg0->unk_4E].unk_078 + 50.0f) - arg0->obj.pos.y) * 0.5f; + arg0->obj.pos.x += (gPlayer[arg0->unk_4E].unk_074 - arg0->obj.pos.x) * 0.5f; + if (gPlayer[arg0->unk_4E].unk_1CC == 1) { + arg0->obj.pos.y += ((gPlayer[arg0->unk_4E].unk_078 + 50.0f) - arg0->obj.pos.y) * 0.5f; } else { - arg0->obj.pos.y += (D_80178280[arg0->unk_4E].unk_078 - arg0->obj.pos.y) * 0.5f; + arg0->obj.pos.y += (gPlayer[arg0->unk_4E].unk_078 - arg0->obj.pos.y) * 0.5f; } - arg0->obj.pos.z += (D_80178280[arg0->unk_4E].unk_138 - arg0->obj.pos.z) * 0.5f; + arg0->obj.pos.z += (gPlayer[arg0->unk_4E].unk_138 - arg0->obj.pos.z) * 0.5f; if (arg0->unk_48 == 0) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); + Object_Kill(&arg0->obj, &arg0->unk_5C); } } } void func_80067F6C(Object_6C* arg0) { - if ((D_801778E8 == 0) && ((D_80178280[0].unk_49C.unk_01 < 2) || (D_80178280[0].unk_49C.unk_00 < 2))) { - arg0->obj.id = 337; + if ((D_801778E8 == 0) && ((gPlayer[0].wings.leftState <= 1) || (gPlayer[0].wings.rightState <= 1))) { + arg0->obj.id = OBJECT_6C_WING_REPAIR; func_800612B8(&arg0->unk_1C, arg0->obj.id); arg0->unk_48 = 2000; func_80019218(0x1900302B, &arg0->unk_5C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); @@ -2111,60 +2127,59 @@ void func_80068020(Object_6C* arg0) { if (arg0->unk_4C != 0) { arg0->unk_46 = 1; arg0->unk_48 = 0x32; - if (arg0->obj.id == 0x144) { - D_80178280[arg0->unk_4E].unk_26C += 0x20; - func_80060F30(D_80178280[arg0->unk_4E].unk_460, 0x4900200E, arg0->unk_4E); - } else if (arg0->obj.id == 0x150) { - D_80161A90[0]++; - if (D_80161A90[0] == 3) { - func_80060F30(D_80178280[arg0->unk_4E].unk_460, 0x49008015, arg0->unk_4E); - } else if (D_80161A90[0] == 6) { - func_80060F30(D_80178280[arg0->unk_4E].unk_460, 0x4900C024, arg0->unk_4E); - if (D_80178234 != 0xA) { - D_80161AA0[arg0->unk_4E]++; + if (arg0->obj.id == OBJECT_6C_SILVER_RING) { + gPlayer[arg0->unk_4E].heal += 0x20; + func_80060F30(gPlayer[arg0->unk_4E].unk_460_arr, 0x4900200E, arg0->unk_4E); + } else if (arg0->obj.id == OBJECT_6C_GOLD_RING) { + gGoldRingCount[0]++; + if (gGoldRingCount[0] == 3) { + func_80060F30(gPlayer[arg0->unk_4E].unk_460_arr, 0x49008015, arg0->unk_4E); + } else if (gGoldRingCount[0] == 6) { + func_80060F30(gPlayer[arg0->unk_4E].unk_460_arr, 0x4900C024, arg0->unk_4E); + if (gCurrentLevel != LEVEL_TRAINING) { + gLifeCount[arg0->unk_4E]++; } - D_80178280[arg0->unk_4E].unk_26C += 0x20; - func_80077240(D_80178280[arg0->unk_4E].unk_074, D_80178280[arg0->unk_4E].unk_078, - D_80178280[arg0->unk_4E].unk_138, 0x65); + gPlayer[arg0->unk_4E].heal += 0x20; + func_80077240(gPlayer[arg0->unk_4E].unk_074, gPlayer[arg0->unk_4E].unk_078, + gPlayer[arg0->unk_4E].unk_138, 101); } else { - D_80178280[arg0->unk_4E].unk_26C += 0x20; - func_80060F30(D_80178280[arg0->unk_4E].unk_460, 0x49003013, arg0->unk_4E); + gPlayer[arg0->unk_4E].heal += 0x20; + func_80060F30(gPlayer[arg0->unk_4E].unk_460_arr, 0x49003013, arg0->unk_4E); } } else { - D_80178280[arg0->unk_4E].unk_26C += 0x80; - func_80060F30(D_80178280[arg0->unk_4E].unk_460, 0x4900200D, arg0->unk_4E); + gPlayer[arg0->unk_4E].heal += 0x80; + func_80060F30(gPlayer[arg0->unk_4E].unk_460_arr, 0x4900200D, arg0->unk_4E); } } - if ((arg0->obj.id == 0x150) && (arg0->unk_48 == 1)) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); + if ((arg0->obj.id == OBJECT_6C_GOLD_RING) && (arg0->unk_48 == 1)) { + Object_Kill(&arg0->obj, &arg0->unk_5C); } break; case 1: - if (arg0->unk_48 >= 0x1F) { + if (arg0->unk_48 > 30) { Math_SmoothStepToF(&arg0->unk_68, 1.0f, 1.0f, 0.06f, 0.0f); } else { Math_SmoothStepToF(&arg0->unk_68, 0.0f, 1.0f, 0.06f, 0.0f); } - arg0->obj.pos.x += (D_80178280[arg0->unk_4E].unk_074 - arg0->obj.pos.x) * 0.5f; - if (D_80178280[arg0->unk_4E].unk_1CC == 1) { - arg0->obj.pos.y += (D_80178280[arg0->unk_4E].unk_078 + 50.0f - arg0->obj.pos.y) * 0.5f; + arg0->obj.pos.x += (gPlayer[arg0->unk_4E].unk_074 - arg0->obj.pos.x) * 0.5f; + if (gPlayer[arg0->unk_4E].unk_1CC == 1) { + arg0->obj.pos.y += (gPlayer[arg0->unk_4E].unk_078 + 50.0f - arg0->obj.pos.y) * 0.5f; } else { - arg0->obj.pos.y += (D_80178280[arg0->unk_4E].unk_078 - arg0->obj.pos.y) * 0.5f; + arg0->obj.pos.y += (gPlayer[arg0->unk_4E].unk_078 - arg0->obj.pos.y) * 0.5f; } - if ((D_80178280[0].unk_238 != 0) && (D_80177880 == 0)) { - arg0->obj.pos.z += (D_80178280[arg0->unk_4E].unk_138 - 300.0f - arg0->obj.pos.z) * 0.3f; + if ((gPlayer[0].unk_238 != 0) && (D_80177880 == 0)) { + arg0->obj.pos.z += (gPlayer[arg0->unk_4E].unk_138 - 300.0f - arg0->obj.pos.z) * 0.3f; } else { - arg0->obj.pos.z += (D_80178280[arg0->unk_4E].unk_138 - arg0->obj.pos.z) * 0.5f; + arg0->obj.pos.z += (gPlayer[arg0->unk_4E].unk_138 - arg0->obj.pos.z) * 0.5f; } arg0->obj.rot.z += 22.0f; - Math_SmoothStepToAngle(&arg0->obj.rot.y, Math_RadToDeg(-D_80178280[arg0->unk_4E].unk_058), 0.2f, 10.0f, - 0.0f); + Math_SmoothStepToAngle(&arg0->obj.rot.y, Math_RadToDeg(-gPlayer[arg0->unk_4E].unk_058), 0.2f, 10.0f, 0.0f); if (arg0->unk_48 == 0) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); + Object_Kill(&arg0->obj, &arg0->unk_5C); } if (arg0->unk_68 > 0.3f) { Matrix_RotateY(gCalcMatrix, arg0->obj.rot.y * M_DTOR, 0); - Matrix_RotateZ(gCalcMatrix, D_80177DB0 * 37.0f * M_DTOR, 1); + Matrix_RotateZ(gCalcMatrix, gFrameCount * 37.0f * M_DTOR, 1); sp4C.x = 0.0f; sp4C.y = arg0->unk_68 * 100.0f; sp4C.z = 0.0f; @@ -2188,10 +2203,10 @@ void func_80068618(Object_6C* arg0) { func_800671D0(arg0); if (arg0->unk_4C != 0) { func_80067A40(); - func_80060FBC(&arg0->obj, &arg0->unk_5C); + Object_Kill(&arg0->obj, &arg0->unk_5C); } if (arg0->unk_48 == 1) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); + Object_Kill(&arg0->obj, &arg0->unk_5C); } } @@ -2200,9 +2215,9 @@ void func_80068688(Object_6C* arg0) { if (arg0->unk_46 > 0) { if (arg0->unk_46 == 1) { arg0->obj.rot.z -= 10.0f; - arg0->obj.pos.x += (D_80178280[arg0->unk_4E].unk_074 - arg0->obj.pos.x) * 0.3f; - arg0->obj.pos.y += (D_80178280[arg0->unk_4E].unk_078 - arg0->obj.pos.y) * 0.3f; - arg0->obj.pos.z += (D_80178280[arg0->unk_4E].unk_138 - arg0->obj.pos.z) * 0.3f; + arg0->obj.pos.x += (gPlayer[arg0->unk_4E].unk_074 - arg0->obj.pos.x) * 0.3f; + arg0->obj.pos.y += (gPlayer[arg0->unk_4E].unk_078 - arg0->obj.pos.y) * 0.3f; + arg0->obj.pos.z += (gPlayer[arg0->unk_4E].unk_138 - arg0->obj.pos.z) * 0.3f; arg0->unk_68 -= 5.0f; if (arg0->unk_68 < 0.0f) { arg0->unk_68 = 0.0f; @@ -2210,7 +2225,7 @@ void func_80068688(Object_6C* arg0) { } arg0->unk_44 -= 10; if (arg0->unk_44 < 0) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); + Object_Kill(&arg0->obj, &arg0->unk_5C); } } else { arg0->unk_68 = 100.0f; @@ -2220,18 +2235,18 @@ void func_80068688(Object_6C* arg0) { } else if (arg0->unk_4C != 0) { arg0->unk_46 = 1; arg0->unk_44 = 0xFF; - D_80178280[arg0->unk_4E].unk_27C = 100; - func_80019218(D_800CFF54[D_80177E80], D_80178280[0].unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + gPlayer[arg0->unk_4E].unk_27C = 100; + func_80019218(D_800CFF54[D_80177E80], &gPlayer[0].unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); if (D_80177E80 == 0) { - D_80178280[0].unk_110 = 0.0f; + gPlayer[0].unk_110 = 0.0f; } D_80177E80++; if (D_80177E80 >= 7) { - D_80178280[0].unk_1C8 = 8; - D_80178280[0].unk_1D0 = 0; + gPlayer[0].unk_1C8 = 8; + gPlayer[0].unk_1D0 = 0; func_80019218(0x1900602A, &D_800C5D28, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); D_80177930 = 2; - D_800D3180[D_80178234] = 1; + D_800D3180[gCurrentLevel] = 1; } } } @@ -2244,16 +2259,16 @@ void func_80068914(Object_6C* arg0) { arg0->unk_58 -= arg0->unk_44; if (arg0->unk_46 > 0) { arg0->unk_44++; - arg0->obj.pos.x += (D_80178280[arg0->unk_4E].unk_074 - arg0->obj.pos.x) * 0.3f; - if (D_80178280[arg0->unk_4E].unk_1CC == 1) { - arg0->obj.pos.y += (D_80178280[arg0->unk_4E].unk_078 + 50.0f - arg0->obj.pos.y) * 0.3f; + arg0->obj.pos.x += (gPlayer[arg0->unk_4E].unk_074 - arg0->obj.pos.x) * 0.3f; + if (gPlayer[arg0->unk_4E].unk_1CC == 1) { + arg0->obj.pos.y += (gPlayer[arg0->unk_4E].unk_078 + 50.0f - arg0->obj.pos.y) * 0.3f; } else { - arg0->obj.pos.y += (D_80178280[arg0->unk_4E].unk_078 - arg0->obj.pos.y) * 0.3f; + arg0->obj.pos.y += (gPlayer[arg0->unk_4E].unk_078 - arg0->obj.pos.y) * 0.3f; } - if (D_80178280[0].unk_238 != 0) { - arg0->obj.pos.z += (D_80178280[arg0->unk_4E].unk_138 - 200.0f - arg0->obj.pos.z) * 0.3f; + if (gPlayer[0].unk_238 != 0) { + arg0->obj.pos.z += (gPlayer[arg0->unk_4E].unk_138 - 200.0f - arg0->obj.pos.z) * 0.3f; } else { - arg0->obj.pos.z += (D_80178280[arg0->unk_4E].unk_138 - 100.0f - arg0->obj.pos.z) * 0.3f; + arg0->obj.pos.z += (gPlayer[arg0->unk_4E].unk_138 - 100.0f - arg0->obj.pos.z) * 0.3f; } if (arg0->unk_48 == 0) { Math_SmoothStepToF(&arg0->unk_68, 5.0f, 0.2f, 15.0f, 0.01f); @@ -2261,7 +2276,7 @@ void func_80068914(Object_6C* arg0) { Math_SmoothStepToF(&arg0->unk_54, 4.0f, 0.1f, 0.2f, 0.01f); } if (arg0->unk_68 <= 6.5f) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); + Object_Kill(&arg0->obj, &arg0->unk_5C); } } else { arg0->unk_44 = 2; @@ -2269,7 +2284,7 @@ void func_80068914(Object_6C* arg0) { arg0->unk_54 = 1.0f; arg0->unk_68 = 100.0f; if (arg0->unk_4C != 0) { - D_80178280[arg0->unk_4E].unk_26C = 0x80; + gPlayer[arg0->unk_4E].heal = 0x80; arg0->unk_46++; arg0->unk_48 = 15; D_80161A8C = D_80161A88; @@ -2277,7 +2292,7 @@ void func_80068914(Object_6C* arg0) { D_80177CB0 -= 250.0f; D_80177CA0 = D_80177DC8; D_80161A50 = D_80161684; - D_80161A9C = D_80161A98; + D_80161A9C = gHitCount; for (i = 1; i < 4; i++) { D_801778D0[i] = D_801778B0[i]; } @@ -2288,79 +2303,79 @@ void func_80068914(Object_6C* arg0) { void func_80068C48(Object_6C* arg0) { if (arg0->unk_4C != 0) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); + Object_Kill(&arg0->obj, &arg0->unk_5C); D_80177E80++; } } void func_80068C88(Object_6C* arg0) { D_80161680 = arg0->obj.id; - if (D_80178280[0].unk_1C8 != 3) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); - } else if (((D_80178234 == 1) || (D_80178234 == 2)) && (D_8017827C == 1)) { - D_80178280[0].unk_1C8 = 7; - D_80178280[0].unk_1D0 = 0; - func_80060FBC(&arg0->obj, &arg0->unk_5C); - } else if (D_80178234 == 0xA) { - D_80178280[0].unk_1C8 = 9; - D_80178280[0].unk_1D0 = 0; - func_80060FBC(&arg0->obj, &arg0->unk_5C); + if (gPlayer[0].unk_1C8 != 3) { + Object_Kill(&arg0->obj, &arg0->unk_5C); + } else if (((gCurrentLevel == LEVEL_METEO) || (gCurrentLevel == LEVEL_SECTOR_X)) && (D_8017827C == 1)) { + gPlayer[0].unk_1C8 = 7; + gPlayer[0].unk_1D0 = 0; + Object_Kill(&arg0->obj, &arg0->unk_5C); + } else if (gCurrentLevel == LEVEL_TRAINING) { + gPlayer[0].unk_1C8 = 9; + gPlayer[0].unk_1D0 = 0; + Object_Kill(&arg0->obj, &arg0->unk_5C); } else if (arg0->unk_46 == 0) { - if (((arg0->obj.pos.z + D_80177D20) > -2700.0f) && (fabsf(arg0->obj.pos.x - D_80178280[0].unk_074) < 1000.0f)) { + if (((arg0->obj.pos.z + D_80177D20) > -2700.0f) && (fabsf(arg0->obj.pos.x - gPlayer[0].unk_074) < 1000.0f)) { switch (arg0->obj.id) { - case 0x14B: - case 0x14C: - case 0x14D: + case OBJECT_331: + case OBJECT_332: + case OBJECT_333: break; - case 0x148: - D_80178280[0].unk_228 = 0x30; + case OBJECT_328: + gPlayer[0].unk_228 = 0x30; break; - case 0x149: - D_80178280[0].unk_228 = 0x20; + case OBJECT_329: + gPlayer[0].unk_228 = 0x20; break; - case 0x14A: - D_80178280[0].unk_228 = 0x10; + case OBJECT_330: + gPlayer[0].unk_228 = 0x10; break; } } if (arg0->unk_4C != 0) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); - D_80178280[0].unk_0B4 = 0.0f; - D_80178280[0].unk_210 = arg0->unk_68 * 0.05f; + Object_Kill(&arg0->obj, &arg0->unk_5C); + gPlayer[0].unk_0B4 = 0.0f; + gPlayer[0].unk_210 = arg0->unk_68 * 0.05f; switch (arg0->obj.id) { - case 0x148: - if (arg0->obj.pos.x < D_80178280[0].unk_074) { - D_80178280[0].unk_118 = -30.0f; - D_80178280[0].unk_0B8 = D_80178280[0].unk_0AC + arg0->unk_68; + case OBJECT_328: + if (arg0->obj.pos.x < gPlayer[0].unk_074) { + gPlayer[0].unk_118 = -30.0f; + gPlayer[0].unk_0B8 = gPlayer[0].unk_0AC + arg0->unk_68; } else { - D_80178280[0].unk_118 = 30.0f; - D_80178280[0].unk_0B8 = D_80178280[0].unk_0AC - arg0->unk_68; + gPlayer[0].unk_118 = 30.0f; + gPlayer[0].unk_0B8 = gPlayer[0].unk_0AC - arg0->unk_68; } break; - case 0x149: - D_80178280[0].unk_118 = 30.0f; - D_80178280[0].unk_0B8 = D_80178280[0].unk_0AC - arg0->unk_68; + case OBJECT_329: + gPlayer[0].unk_118 = 30.0f; + gPlayer[0].unk_0B8 = gPlayer[0].unk_0AC - arg0->unk_68; break; - case 0x14A: - D_80178280[0].unk_118 = -30.0f; - D_80178280[0].unk_0B8 = D_80178280[0].unk_0AC + arg0->unk_68; + case OBJECT_330: + gPlayer[0].unk_118 = -30.0f; + gPlayer[0].unk_0B8 = gPlayer[0].unk_0AC + arg0->unk_68; break; - case 0x14B: - if (arg0->obj.pos.y < D_80178280[0].unk_078) { - D_80178280[0].unk_124 = 30.0f; - D_80178280[0].unk_0BC = D_80178280[0].unk_0B0 + arg0->unk_68; + case OBJECT_331: + if (arg0->obj.pos.y < gPlayer[0].unk_078) { + gPlayer[0].unk_124 = 30.0f; + gPlayer[0].unk_0BC = gPlayer[0].unk_0B0 + arg0->unk_68; } else { - D_80178280[0].unk_124 = -30.0f; - D_80178280[0].unk_0BC = D_80178280[0].unk_0B0 - arg0->unk_68; + gPlayer[0].unk_124 = -30.0f; + gPlayer[0].unk_0BC = gPlayer[0].unk_0B0 - arg0->unk_68; } break; - case 0x14C: - D_80178280[0].unk_124 = 30.0f; - D_80178280[0].unk_0BC = D_80178280[0].unk_0B0 + arg0->unk_68; + case OBJECT_332: + gPlayer[0].unk_124 = 30.0f; + gPlayer[0].unk_0BC = gPlayer[0].unk_0B0 + arg0->unk_68; break; - case 0x14D: - D_80178280[0].unk_124 = -30.0f; - D_80178280[0].unk_0BC = D_80178280[0].unk_0B0 - arg0->unk_68; + case OBJECT_333: + gPlayer[0].unk_124 = -30.0f; + gPlayer[0].unk_0BC = gPlayer[0].unk_0B0 - arg0->unk_68; break; } } @@ -2368,107 +2383,109 @@ void func_80068C88(Object_6C* arg0) { } void func_80068FE0(Object_4C* arg0) { - arg0->obj.rot.y = (Math_Atan2F(D_80178280[0].unk_040.x - arg0->obj.pos.x, - D_80178280[0].unk_040.z - (arg0->obj.pos.z + D_80177D20)) * - 180.0f) / - M_PI; + arg0->obj.rot.y = + (Math_Atan2F(gPlayer[0].unk_040.x - arg0->obj.pos.x, gPlayer[0].unk_040.z - (arg0->obj.pos.z + D_80177D20)) * + 180.0f) / + M_PI; if (arg0->unk_46 != 0) { arg0->obj.status = 0; func_8007A6F0(&arg0->obj.pos, 0x1903400F); switch (arg0->obj.id) { - case 0xA1: + case OBJECT_161: func_8007D074(arg0->obj.pos.x, arg0->obj.pos.y + 160.0f, arg0->obj.pos.z, 4.0f); break; default: - case 0xA9: + case OBJECT_169: func_8007D074(arg0->obj.pos.x, arg0->obj.pos.y + 96.0f, arg0->obj.pos.z, 5.0f); break; } } } -void func_800690D0(s32 arg0, s32 arg1) { - switch (arg1) { - case 0xC8: - func_8007717C(&D_80163FE0[arg0], arg1); +void func_800690D0(s32 arg0, s32 objId) { + switch (objId) { + case OBJECT_200: + func_8007717C(&gObjects2F4[arg0]); break; - case 0xC5: - if (D_80178234 == 9) { - func_E9F1D0_801888F4(&D_80163FE0[arg0], arg1); + case OBJECT_197: + if (gCurrentLevel == LEVEL_VENOM_2) { + func_E9F1D0_801888F4(&gObjects2F4[arg0]); } else { - func_800763A4(&D_80163FE0[arg0], arg1); + func_800763A4(&gObjects2F4[arg0]); } break; - case 0xCA: - func_800763A4(&D_80163FE0[arg0], arg1); + case OBJECT_202: + func_800763A4(&gObjects2F4[arg0]); break; - case 0xC2: - func_8006B0A0(&D_80163FE0[arg0], arg1); + case OBJECT_194: + func_8006B0A0(&gObjects2F4[arg0]); break; - case 0xBA: - func_E08400_80187B08(&D_80163FE0[arg0], arg1); + case OBJECT_186: + func_E08400_80187B08(&gObjects2F4[arg0]); break; - case 0xB5: - func_80060FBC(&D_80163FE0[arg0].obj, &D_80163FE0[arg0].unk_100); - func_8007D2C8(D_80163FE0[arg0].obj.pos.x, D_80163FE0[arg0].obj.pos.y, D_80163FE0[arg0].obj.pos.z, 20.0f); + case OBJECT_181: + Object_Kill(&gObjects2F4[arg0].obj, &gObjects2F4[arg0].unk_100); + func_8007D2C8(gObjects2F4[arg0].obj.pos.x, gObjects2F4[arg0].obj.pos.y, gObjects2F4[arg0].obj.pos.z, 20.0f); break; - case 0xB6: - func_80060FBC(&D_80163FE0[arg0].obj, &D_80163FE0[arg0].unk_100); - func_8007D2C8(D_80163FE0[arg0].obj.pos.x, D_80163FE0[arg0].obj.pos.y, D_80163FE0[arg0].obj.pos.z, 10.0f); - func_80066254(&D_80163FE0[arg0]); + case OBJECT_182: + Object_Kill(&gObjects2F4[arg0].obj, &gObjects2F4[arg0].unk_100); + func_8007D2C8(gObjects2F4[arg0].obj.pos.x, gObjects2F4[arg0].obj.pos.y, gObjects2F4[arg0].obj.pos.z, 10.0f); + func_80066254(&gObjects2F4[arg0]); break; - case 0xC0: - func_8006684C(&D_80163FE0[arg0]); + case OBJECT_192: + func_8006684C(&gObjects2F4[arg0]); break; - case 0x132: - func_E6A810_801990DC(&D_8016F110[arg0], arg1); + case OBJECT_306: + func_E6A810_801990DC(&gObjects408[arg0]); break; - case 0xE8: - func_E6A810_8018B720(&D_80163FE0[arg0], arg1); + case OBJECT_232: + func_E6A810_8018B720(&gObjects2F4[arg0]); break; - case 0x13F: - func_E51970_80198594(&D_8016F110[arg0], arg1); + case OBJECT_319: + func_E51970_80198594(&gObjects408[arg0]); break; } } void func_800693E8(Object_2F4* arg0) { - arg0->obj.pos.x += arg0->unk_0E8; - arg0->obj.pos.z += arg0->unk_0F0; - arg0->obj.pos.y += arg0->unk_0EC; - arg0->unk_0EC -= arg0->unk_10C; - if ((D_80161AB8 != 0) && (arg0->obj.id != 0xC6) && ((D_80178234 != 0xB) || (arg0->obj.id == 0xC8))) { + arg0->obj.pos.x += arg0->unk_0E8.x; + arg0->obj.pos.z += arg0->unk_0E8.z; + arg0->obj.pos.y += arg0->unk_0E8.y; + arg0->unk_0E8.y -= arg0->unk_10C; + + if ((D_80161AB8 != 0) && (arg0->obj.id != OBJECT_198) && + ((gCurrentLevel != LEVEL_MACBETH) || (arg0->obj.id == OBJECT_200))) { f32 var_fv0 = 4000.0f; - if ((arg0->obj.id == 0xEC) || (D_80178234 == 0xB) || ((arg0->obj.id == 0xC8) && (arg0->unk_0B4 == 0x38))) { + if ((arg0->obj.id == OBJECT_236) || (gCurrentLevel == LEVEL_MACBETH) || + ((arg0->obj.id == OBJECT_200) && (arg0->unk_0B4 == 56))) { var_fv0 = 8000.0f; - } else if (D_80178280[0].unk_1C8 == 8) { + } else if (gPlayer[0].unk_1C8 == 8) { var_fv0 = 100000.0f; } - if (((D_80178280[0].unk_040.z + arg0->unk_01C.unk_10) < (arg0->obj.pos.z + D_80177D20)) || - ((arg0->obj.pos.z + D_80177D20) < -15000.0f) || (arg0->obj.pos.y < (D_80178280[0].unk_0B0 - var_fv0)) || - ((D_80178280[0].unk_0B0 + var_fv0) < arg0->obj.pos.y) || - ((D_80178280[0].unk_0AC + var_fv0) < arg0->obj.pos.x) || - (arg0->obj.pos.x < (D_80178280[0].unk_0AC - var_fv0))) { - func_80060FBC(&arg0->obj, &arg0->unk_100); + if (((gPlayer[0].unk_040.z + arg0->unk_01C.unk_10) < (arg0->obj.pos.z + D_80177D20)) || + ((arg0->obj.pos.z + D_80177D20) < -15000.0f) || (arg0->obj.pos.y < (gPlayer[0].unk_0B0 - var_fv0)) || + ((gPlayer[0].unk_0B0 + var_fv0) < arg0->obj.pos.y) || ((gPlayer[0].unk_0AC + var_fv0) < arg0->obj.pos.x) || + (arg0->obj.pos.x < (gPlayer[0].unk_0AC - var_fv0))) { + Object_Kill(&arg0->obj, &arg0->unk_100); switch (arg0->obj.id) { - case 0xEC: + case OBJECT_236: D_801784A4 = 0; break; - case 0xE5: + case OBJECT_229: func_E6A810_8018E3B0(arg0); break; - case 0xC2: + case OBJECT_194: D_80176550[arg0->unk_046] = 0; break; - case 0xC8: - if ((arg0->unk_0B4 >= 0xC8) && (arg0->unk_0B4 < 0x12C)) { + case OBJECT_200: + if ((arg0->unk_0B4 >= 200) && (arg0->unk_0B4 < 300)) { D_80176550[arg0->unk_046] = 0; - } else if ((arg0->unk_0B4 == 0x26) && (arg0->unk_046 != 2)) { + } else if ((arg0->unk_0B4 == 38) && (arg0->unk_046 != 2)) { D_80177E80 = -1; } break; - case 0xFC: + case OBJECT_252: D_80161684 = 1; break; } @@ -2481,46 +2498,47 @@ void func_80069658(Object_408* arg0) { arg0->obj.pos.y += arg0->unk_070; arg0->obj.pos.z += arg0->unk_074; arg0->unk_070 -= arg0->unk_084; - if ((D_80161AB8 != 0) && ((arg0->obj.pos.z + D_80177D20) > (arg0->unk_01C.unk_10 - D_80178280[0].unk_040.z))) { - if (D_80178280[0].unk_040.z) {} // fake - func_80060FBC(&arg0->obj, &arg0->unk_3FC); + if ((D_80161AB8 != 0) && ((arg0->obj.pos.z + D_80177D20) > (arg0->unk_01C.unk_10 - gPlayer[0].unk_040.z))) { + if (gPlayer[0].unk_040.z) {} // fake + Object_Kill(&arg0->obj, &arg0->unk_3FC); } } void func_800696F8(Object_80* arg0) { - if (D_80178280[0].unk_1C8 == 2) { + if (gPlayer[0].unk_1C8 == 2) { arg0->obj.pos.z += arg0->unk_60; if (arg0->unk_1C.unk_10 < arg0->obj.pos.z) { - func_80060FBC(&arg0->obj, &arg0->unk_70); + Object_Kill(&arg0->obj, &arg0->unk_70); } } else if ((D_80177880 == 0) && (D_80178284 != 2)) { - f32 temp_fv0 = fabsf(arg0->obj.pos.x - D_80178280[0].unk_040.x); + f32 temp_fv0 = fabsf(arg0->obj.pos.x - gPlayer[0].unk_040.x); f32 var_fa0 = 500.0f; - if ((arg0->obj.id == 6) || (arg0->obj.id == 7)) { + if ((arg0->obj.id == OBJECT_6) || (arg0->obj.id == OBJECT_7)) { var_fa0 = 1000.0f; } temp_fv0 = ((var_fa0 > temp_fv0) ? 0.0f : (temp_fv0 - var_fa0) * 1.7f); - if ((fabsf(D_80178280[0].unk_114) > 1.0f) || (D_80178234 == 0xB)) { + if ((fabsf(gPlayer[0].unk_114) > 1.0f) || (gCurrentLevel == LEVEL_MACBETH)) { temp_fv0 = 0.0f; } - temp_fv0 -= D_80178280[0].unk_040.z; + temp_fv0 -= gPlayer[0].unk_040.z; if ((arg0->unk_1C.unk_10 - temp_fv0) < (arg0->obj.pos.z + D_80177D20)) { - func_80060FBC(&arg0->obj, &arg0->unk_70); + Object_Kill(&arg0->obj, &arg0->unk_70); } } } void func_80069858(Object_4C* arg0) { if (D_80161AB8 != 0) { - f32 temp_fv0 = fabsf(arg0->obj.pos.x - D_80178280[0].unk_040.x); + f32 temp_fv0 = fabsf(arg0->obj.pos.x - gPlayer[0].unk_040.x); f32 var_fa0 = 500.0f; - if (((arg0->obj.id == 0xA4) && ((arg0->unk_45 == 6) || (arg0->unk_45 == 7))) || (arg0->obj.id == 8)) { + if (((arg0->obj.id == OBJECT_164) && ((arg0->unk_45 == 6) || (arg0->unk_45 == 7))) || + (arg0->obj.id == OBJECT_8)) { var_fa0 = 1000.0f; } temp_fv0 = ((var_fa0 > temp_fv0) ? 0.0f : (temp_fv0 - var_fa0) * 1.7f); - temp_fv0 -= D_80178280[0].unk_040.z; + temp_fv0 -= gPlayer[0].unk_040.z; if ((arg0->unk_1C.unk_10 - temp_fv0) < (arg0->obj.pos.z + D_80177D20)) { arg0->obj.status = 0; } @@ -2528,26 +2546,26 @@ void func_80069858(Object_4C* arg0) { } void func_80069924(Object_8C* arg0) { - arg0->obj.pos.x += arg0->unk_54; - arg0->obj.pos.y += arg0->unk_58; - arg0->obj.pos.z += arg0->unk_5C; + arg0->obj.pos.x += arg0->unk_54.x; + arg0->obj.pos.y += arg0->unk_54.y; + arg0->obj.pos.z += arg0->unk_54.z; if (D_80161AB8 != 0) { - if ((D_80178280[0].unk_040.z + arg0->unk_1C.unk_10) < (arg0->obj.pos.z + D_80177D20)) { - func_80060FBC(&arg0->obj, &arg0->unk_80); - } else if ((fabsf(arg0->obj.pos.y - D_80178280[0].unk_040.y) > 25000.0f) || - (fabsf(arg0->obj.pos.x - D_80178280[0].unk_040.x) > 25000.0f)) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + if ((gPlayer[0].unk_040.z + arg0->unk_1C.unk_10) < (arg0->obj.pos.z + D_80177D20)) { + Object_Kill(&arg0->obj, &arg0->unk_80); + } else if ((fabsf(arg0->obj.pos.y - gPlayer[0].unk_040.y) > 25000.0f) || + (fabsf(arg0->obj.pos.x - gPlayer[0].unk_040.x) > 25000.0f)) { + Object_Kill(&arg0->obj, &arg0->unk_80); } } } void func_80069A10(Object_6C* arg0) { if (D_80161AB8 != 0) { - f32 temp = (0.0f - D_80178280[0].unk_040.z); + f32 temp = (0.0f - gPlayer[0].unk_040.z); if ((arg0->unk_1C.unk_10 - temp) < (arg0->obj.pos.z + D_80177D20)) { - func_80060FBC(&arg0->obj, &arg0->unk_5C); - if ((arg0->obj.id == 326) && (arg0->unk_46 == 0)) { + Object_Kill(&arg0->obj, &arg0->unk_5C); + if ((arg0->obj.id == OBJECT_326) && (arg0->unk_46 == 0)) { D_80177E80 = -1; } } @@ -2573,16 +2591,16 @@ void func_80069AAC(Object_2F4* arg0) { arg0->unk_0C6--; } if (D_801778E8 != 0) { - for (i = 0; i < D_801778A8; i++) { + for (i = 0; i < gCamCount; i++) { if (arg0->unk_0CA[i] != 0) { - if (!(gCurrentInput[i].button & 0x8000)) { + if (!(gCurrentInput[i].button & A_BUTTON)) { arg0->unk_0CA[i]--; } D_801779C8[i] = 0; } } } else if (arg0->unk_0CA[0] != 0) { - if (!(gCurrentInput[D_80177AF8].button & 0x8000)) { + if (!(gCurrentInput[D_80177AF8].button & A_BUTTON)) { arg0->unk_0CA[0]--; } D_801779C8[0] = 0; @@ -2594,7 +2612,7 @@ void func_80069AAC(Object_2F4* arg0) { case 1: arg0->obj.status = 2; func_80063F90(arg0->unk_040, arg0->obj.id); - if (arg0->obj.id != 0xFC) { + if (arg0->obj.id != OBJECT_252) { func_800693E8(arg0); } break; @@ -2679,7 +2697,7 @@ void func_80069E88(Object_4C* arg0) { switch (arg0->obj.status) { case 1: arg0->obj.status = 2; - func_80063F90(arg0->unk_40, (s32) arg0->obj.id); + func_80063F90(arg0->unk_40, arg0->obj.id); func_80069858(arg0); break; case 2: @@ -2705,7 +2723,7 @@ void func_80069F30(Object_6C* arg0) { switch (arg0->obj.status) { case 1: arg0->obj.status = 2; - func_80063F90(arg0->unk_40, (s32) arg0->obj.id); + func_80063F90(arg0->unk_40, arg0->obj.id); func_80069A10(arg0); break; case 2: @@ -2735,63 +2753,63 @@ void func_80069FD4(Object_8C* arg0) { } } -void func_8006A06C(UnkStruct_D_80174750* arg0) { +void func_8006A06C(UnkEntity30* arg0) { Vec3f sp44; Vec3f sp38; f32 sp34; f32 sp30; f32 sp2C; - if (arg0->unk_02 != 0) { - arg0->unk_02--; + if (arg0->timer != 0) { + arg0->timer--; } - sp34 = arg0->unk_04 - arg0->unk_10; - sp30 = arg0->unk_08 - arg0->unk_14; - sp2C = arg0->unk_0C - arg0->unk_18; + sp34 = arg0->unk_04.x - arg0->unk_10.x; + sp30 = arg0->unk_04.y - arg0->unk_10.y; + sp2C = arg0->unk_04.z - arg0->unk_10.z; arg0->unk_20 = Math_Atan2F(sp34, sp2C); arg0->unk_1C = -Math_Atan2F(sp30, sqrtf(SQ(sp34) + SQ(sp2C))); - if (arg0->unk_00 != 4) { + if (arg0->mode != 4) { arg0->unk_24 = sqrtf(SQ(sp34) + SQ(sp30) + SQ(sp2C)); } - if (D_80177834 == 7) { - if (((arg0->unk_00 == 1) || (arg0->unk_00 == 0x65) || (arg0->unk_00 == 0x32)) && (D_80178280[0].unk_1C8 == 3) && - (D_80178280[0].unk_1F4 == 0)) { + if (gGameState == GSTATE_PLAY) { + if (((arg0->mode == 1) || (arg0->mode == 0x65) || (arg0->mode == 0x32)) && (gPlayer[0].unk_1C8 == 3) && + (gPlayer[0].unk_1F4 == 0)) { Matrix_RotateX(gCalcMatrix, -arg0->unk_1C, 0); Matrix_RotateY(gCalcMatrix, -arg0->unk_20, 1); - sp44.x = D_80178280[D_801778A0].unk_074 - arg0->unk_04; - sp44.y = D_80178280[D_801778A0].unk_078 - arg0->unk_08; - sp44.z = D_80178280[D_801778A0].unk_138 - arg0->unk_0C; + sp44.x = gPlayer[D_801778A0].unk_074 - arg0->unk_04.x; + sp44.y = gPlayer[D_801778A0].unk_078 - arg0->unk_04.y; + sp44.z = gPlayer[D_801778A0].unk_138 - arg0->unk_04.z; Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38); - sp38.x += arg0->unk_04; - sp38.y += arg0->unk_08; - sp38.z += arg0->unk_0C; - if ((fabsf(sp38.x - arg0->unk_04) < 30.0f) && (fabsf(sp38.y - arg0->unk_08) < 30.0f) && - (sp38.z < arg0->unk_0C) && ((arg0->unk_0C - arg0->unk_24) < sp38.z)) { - if (D_80178234 == 0xD) { - func_800A6CD0(D_80178280, 0, 30); + sp38.x += arg0->unk_04.x; + sp38.y += arg0->unk_04.y; + sp38.z += arg0->unk_04.z; + if ((fabsf(sp38.x - arg0->unk_04.x) < 30.0f) && (fabsf(sp38.y - arg0->unk_04.y) < 30.0f) && + (sp38.z < arg0->unk_04.z) && ((arg0->unk_04.z - arg0->unk_24) < sp38.z)) { + if (gCurrentLevel == LEVEL_AQUAS) { + func_800A6CD0(&gPlayer[0], 0, 30); } else { - func_800A6CD0(D_80178280, 0, 20); + func_800A6CD0(&gPlayer[0], 0, 20); } - if (arg0->unk_00 < 100) { - arg0->unk_00 = 0; + if (arg0->mode < 100) { + arg0->mode = 0; } } } - if (((arg0->unk_0C + D_80177D20) > 1000.0f) && (D_80177880 != 1)) { - arg0->unk_00 = 0; + if (((arg0->unk_04.z + D_80177D20) > 1000.0f) && (D_80177880 != 1)) { + arg0->mode = 0; } - if (((arg0->unk_00 == 3) || (arg0->unk_00 == 0x32)) && (arg0->unk_02 == 0)) { - arg0->unk_00 = 0; + if (((arg0->mode == 3) || (arg0->mode == 50)) && (arg0->timer == 0)) { + arg0->mode = 0; } } } void func_8006A38C(void) { - UnkStruct_D_80174750* var_s0; + UnkEntity30* var_s0; s32 var_s1; - for (var_s1 = 0, var_s0 = D_80174750; var_s1 < ARRAY_COUNT(D_80174750); var_s1++, var_s0++) { - if (var_s0->unk_00 != 0) { + for (var_s1 = 0, var_s0 = gUnkEntities30; var_s1 < ARRAY_COUNT(gUnkEntities30); var_s1++, var_s0++) { + if (var_s0->mode != 0) { func_8006A06C(var_s0); } } @@ -2809,16 +2827,15 @@ void func_8006A3E8(void) { Object_8C* sp24; D_80161AB8 = 0; - if ((D_80177880 == 0) && - ((D_80178280[0].unk_1C8 == 1) || (D_80178280[0].unk_1C8 == 3) || (D_80178280[0].unk_1C8 == 4) || - (D_80178280[0].unk_1C8 == 8) || (D_80178280[0].unk_1C8 == 9) || (D_80178280[0].unk_1C8 == 6))) { + if ((D_80177880 == 0) && ((gPlayer[0].unk_1C8 == 1) || (gPlayer[0].unk_1C8 == 3) || (gPlayer[0].unk_1C8 == 4) || + (gPlayer[0].unk_1C8 == 8) || (gPlayer[0].unk_1C8 == 9) || (gPlayer[0].unk_1C8 == 6))) { D_80161AB8 = 1; } if (D_80177880 != 1) { - if ((D_80178488 != 0) && (D_80178280[0].unk_1C8 != 2)) { + if ((D_80178488 != 0) && (gPlayer[0].unk_1C8 != 2)) { func_80062664(); } - for (i = 0, sp2C = D_80161B00; i < ARRAY_COUNT(D_80161B00); i++, sp2C++) { + for (i = 0, sp2C = gObjects80; i < ARRAY_COUNT(gObjects80); i++, sp2C++) { if (sp2C->obj.status != 0) { sp2C->unk_40 = i; func_80069DF4(sp2C); @@ -2826,7 +2843,7 @@ void func_8006A3E8(void) { } } else if (D_801778E8 != 0) { for (i = 0, var_v0 = D_801782A8; i < 200; i++, var_v0++) { - if ((var_v0->obj.status != 0) && (var_v0->obj.id == 0x92)) { + if ((var_v0->obj.status != 0) && (var_v0->obj.id == OBJECT_146)) { if (i & 1) { var_v0->obj.rot.y += 0.5f; } else { @@ -2835,31 +2852,31 @@ void func_8006A3E8(void) { } } } - for (i = 0, sp30 = D_80163400; i < ARRAY_COUNT(D_80163400); i++, sp30++) { + for (i = 0, sp30 = gObjects4C; i < ARRAY_COUNT(gObjects4C); i++, sp30++) { if (sp30->obj.status != 0) { sp30->unk_40 = i; func_80069E88(sp30); } } - for (i = 0, sp34 = D_8016F110; i < ARRAY_COUNT(D_8016F110); i++, sp34++) { + for (i = 0, sp34 = gObjects408; i < ARRAY_COUNT(gObjects408); i++, sp34++) { if (sp34->obj.status != 0) { sp34->unk_040 = i; func_80069CBC(sp34); } } - for (i = 0, sp38 = D_80163FE0; i < ARRAY_COUNT(D_80163FE0); i++, sp38++) { + for (i = 0, sp38 = gObjects2F4; i < ARRAY_COUNT(gObjects2F4); i++, sp38++) { if (sp38->obj.status != 0) { sp38->unk_040 = i; func_80069AAC(sp38); } } - for (i = 0, sp28 = D_801737E0; i < ARRAY_COUNT(D_801737E0); i++, sp28++) { + for (i = 0, sp28 = gObjects6C; i < ARRAY_COUNT(gObjects6C); i++, sp28++) { if (sp28->obj.status != 0) { sp28->unk_40 = i; func_80069F30(sp28); } } - for (i = 0, sp24 = D_80170130; i < ARRAY_COUNT(D_80170130); i++, sp24++) { + for (i = 0, sp24 = gObjects8C; i < ARRAY_COUNT(gObjects8C); i++, sp24++) { if (sp24->obj.status != 0) { sp24->unk_40 = i; func_80069FD4(sp24); @@ -2873,4 +2890,4 @@ void func_8006A3E8(void) { } } -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/fox_enmy1/D_800D63D0.s") +// #pragma GLOBAL_ASM("asm/us/nonmatchings/main/fox_enmy1/D_800D63D0.s") diff --git a/src/main/fox_load.c b/src/main/fox_load.c index 49905d4d..8482224c 100644 --- a/src/main/fox_load.c +++ b/src/main/fox_load.c @@ -93,99 +93,99 @@ u8 Overlay_Init(OverlayInit* ovlInit) { return changeOvl; } -u8 Overlay_Load(u8 arg0, u8 arg1) { +u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) { u8 changeOvl; - switch (arg0) { - case 0x0: - changeOvl = Overlay_Init(&sEBFBE0_Overlay1[arg1]); + switch (ovlSetup) { + case OVL_SETUP_TITLE: + changeOvl = Overlay_Init(&sOvlEBFBE0_Title[ovlStage]); if (changeOvl == true) { func_8001DC6C(0, 0x16); } break; - case 0x1: - changeOvl = Overlay_Init(&sEBFBE0_Overlay2[arg1]); + case OVL_SETUP_MENU: + changeOvl = Overlay_Init(&sOvlEBFBE0_Menu[ovlStage]); break; - case 0x2: - changeOvl = Overlay_Init(&sEBFBE0_Overlay3[arg1]); + case OVL_SETUP_MAP: + changeOvl = Overlay_Init(&sOvlEBFBE0_Map[ovlStage]); break; - case 0x3: - changeOvl = Overlay_Init(&sEBFBE0_Overlay4[arg1]); + case OVL_SETUP_STATE_5: + changeOvl = Overlay_Init(&sOvlEBFBE0_State5[ovlStage]); break; - case 0x5: - changeOvl = Overlay_Init(&sDF4260_Overlay1[arg1]); + case OVL_SETUP_CORNERIA: + changeOvl = Overlay_Init(&sOvlDF4260_Corneria[ovlStage]); break; - case 0x6: - changeOvl = Overlay_Init(&sE08400_Overlay1_2[arg1]); + case OVL_SETUP_METEO: + changeOvl = Overlay_Init(&sOvlE08400_Meteo[ovlStage]); break; - case 0x7: - changeOvl = Overlay_Init(&sE6A810_Overlay1_6[arg1]); + case OVL_SETUP_TITANIA: + changeOvl = Overlay_Init(&sOvlE6A810_Titania[ovlStage]); break; - case 0x8: - changeOvl = Overlay_Init(&sE08400_Overlay2_2[arg1]); + case OVL_SETUP_SECTOR_X: + changeOvl = Overlay_Init(&sOvlE08400_SectorX[ovlStage]); break; - case 0x17: - changeOvl = Overlay_Init(&sE51970_Overlay1[arg1]); + case OVL_SETUP_SECTOR_Z: + changeOvl = Overlay_Init(&sOvlE51970_SectorZ[ovlStage]); break; - case 0x9: - changeOvl = Overlay_Init(&sE16C50_Overlay1[arg1]); + case OVL_SETUP_AQUAS: + changeOvl = Overlay_Init(&sOvlE16C50_Aquas[ovlStage]); break; - case 0xA: - changeOvl = Overlay_Init(&sE16C50_Overlay2[arg1]); + case OVL_SETUP_AREA_6: + changeOvl = Overlay_Init(&sOvlE16C50_Area6[ovlStage]); break; - case 0xB: - changeOvl = Overlay_Init(&sE51970_Overlay2_2[arg1]); + case OVL_SETUP_FORTUNA: + changeOvl = Overlay_Init(&sOvlE51970_Fortuna[ovlStage]); break; - case 0xC: - changeOvl = Overlay_Init(&sE16C50_Overlay3[arg1]); + case OVL_SETUP_UNK_4: + changeOvl = Overlay_Init(&sOvlE16C50_Unk4[ovlStage]); break; - case 0xD: - changeOvl = Overlay_Init(&sE9F1D0_Overlay1[arg1]); + case OVL_SETUP_SECTOR_Y: + changeOvl = Overlay_Init(&sOvlE9F1D0_SectorY[ovlStage]); break; - case 0xE: - changeOvl = Overlay_Init(&sE16C50_Overlay4[arg1]); + case OVL_SETUP_SOLAR: + changeOvl = Overlay_Init(&sOvlE16C50_Solar[ovlStage]); break; - case 0xF: - changeOvl = Overlay_Init(&sE16C50_Overlay5[arg1]); + case OVL_SETUP_ZONESS: + changeOvl = Overlay_Init(&sOvlE16C50_Zoness[ovlStage]); break; - case 0x10: - changeOvl = Overlay_Init(&sE9F1D0_Overlay2[arg1]); + case OVL_SETUP_VENOM_2: + changeOvl = Overlay_Init(&sOvlE9F1D0_Venom2[ovlStage]); break; - case 0x11: - changeOvl = Overlay_Init(&sDF4260_Overlay3[arg1]); + case OVL_SETUP_TRAINING: + changeOvl = Overlay_Init(&sOvlDF4260_Training[ovlStage]); break; - case 0x12: - changeOvl = Overlay_Init(&sDF4260_Overlay2[arg1]); + case OVL_SETUP_VENOM_1: + changeOvl = Overlay_Init(&sOvlDF4260_Venom1[ovlStage]); break; - case 0x18: - changeOvl = Overlay_Init(&sE9F1D0_Overlay3_2[arg1]); + case OVL_SETUP_VENOM_SW: + changeOvl = Overlay_Init(&sOvlE9F1D0_VenomSW[ovlStage]); break; - case 0x14: - changeOvl = Overlay_Init(&sE08400_Overlay3[arg1]); + case OVL_SETUP_20: + changeOvl = Overlay_Init(&sOvlE08400_Setup20[ovlStage]); break; - case 0x16: - changeOvl = Overlay_Init(&sE51970_Overlay3[arg1]); + case OVL_SETUP_BOLSE: + changeOvl = Overlay_Init(&sOvlE51970_Bolse[ovlStage]); break; - case 0x13: - changeOvl = Overlay_Init(&sE51970_Overlay4[arg1]); + case OVL_SETUP_KATINA: + changeOvl = Overlay_Init(&sOvlE51970_Katina[ovlStage]); break; - case 0x15: - changeOvl = Overlay_Init(&sE6A810_Overlay2_2[arg1]); + case OVL_SETUP_MACBETH: + changeOvl = Overlay_Init(&sOvlE6A810_Macbeth[ovlStage]); break; - case 0x32: - changeOvl = Overlay_Init(&sE08400_Overlay4_2[arg1]); + case OVL_SETUP_VERSUS: + changeOvl = Overlay_Init(&sOvlE08400_Versus[ovlStage]); if (changeOvl == true) { func_8001DC6C(3, 0x310); } break; - case 0x63: - changeOvl = Overlay_Init(&sLogoOverlay[arg1]); + case OVL_SETUP_LOGO: + changeOvl = Overlay_Init(&sNoOvl_Logo[ovlStage]); // Logo does not load an overlay file if (changeOvl == true) { func_8001DC6C(0, 0xE); } break; - case 0x4: - changeOvl = Overlay_Init(&sCreditsOverlay_6[arg1]); + case OVL_SETUP_CREDITS: + changeOvl = Overlay_Init(&sOvlEF0260_Credits[ovlStage]); break; default: (void) "DMA MODE ERROR %d\n"; diff --git a/src/main/fox_load_inits.c b/src/main/fox_load_inits.c index 20f1f31f..5b15e136 100644 --- a/src/main/fox_load_inits.c +++ b/src/main/fox_load_inits.c @@ -21,7 +21,7 @@ #define ROM_SEGMENT(file) \ { SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) } -OverlayInit sLogoOverlay[1] = { +OverlayInit sNoOvl_Logo[1] = { { NO_OVERLAY, { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, @@ -40,7 +40,7 @@ OverlayInit sLogoOverlay[1] = { /* 0xF */ ROM_SEGMENT(ast_D25100) } }, }; -OverlayInit sCreditsOverlay_6[6] = { +OverlayInit sOvlEF0260_Credits[6] = { { OVERLAY_OFFSETS(ovl_EF0260), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, @@ -139,7 +139,7 @@ OverlayInit sCreditsOverlay_6[6] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sEBFBE0_Overlay1[1] = { +OverlayInit sOvlEBFBE0_Title[1] = { { OVERLAY_OFFSETS(ovl_EBFBE0), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, @@ -158,7 +158,7 @@ OverlayInit sEBFBE0_Overlay1[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sEBFBE0_Overlay2[1] = { +OverlayInit sOvlEBFBE0_Menu[1] = { { OVERLAY_OFFSETS(ovl_EBFBE0), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, @@ -177,7 +177,7 @@ OverlayInit sEBFBE0_Overlay2[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sEBFBE0_Overlay3[1] = { +OverlayInit sOvlEBFBE0_Map[1] = { { OVERLAY_OFFSETS(ovl_EBFBE0), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, @@ -196,7 +196,7 @@ OverlayInit sEBFBE0_Overlay3[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sEBFBE0_Overlay4[1] = { +OverlayInit sOvlEBFBE0_State5[1] = { { OVERLAY_OFFSETS(ovl_EBFBE0), { /* 0x1 */ NO_SEGMENT, /* 0x2 */ NO_SEGMENT, @@ -215,7 +215,7 @@ OverlayInit sEBFBE0_Overlay4[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sDF4260_Overlay1[1] = { +OverlayInit sOvlDF4260_Corneria[1] = { { OVERLAY_OFFSETS(ovl_DF4260), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -234,7 +234,7 @@ OverlayInit sDF4260_Overlay1[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE08400_Overlay1_2[2] = { +OverlayInit sOvlE08400_Meteo[2] = { { OVERLAY_OFFSETS(ovl_E08400), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), @@ -269,7 +269,7 @@ OverlayInit sE08400_Overlay1_2[2] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE6A810_Overlay1_6[6] = { +OverlayInit sOvlE6A810_Titania[6] = { { OVERLAY_OFFSETS(ovl_E6A810), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -368,7 +368,7 @@ OverlayInit sE6A810_Overlay1_6[6] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE08400_Overlay2_2[2] = { +OverlayInit sOvlE08400_SectorX[2] = { { OVERLAY_OFFSETS(ovl_E08400), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), @@ -403,7 +403,7 @@ OverlayInit sE08400_Overlay2_2[2] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE51970_Overlay1[1] = { +OverlayInit sOvlE51970_SectorZ[1] = { { OVERLAY_OFFSETS(ovl_E51970), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), @@ -422,7 +422,7 @@ OverlayInit sE51970_Overlay1[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE16C50_Overlay1[1] = { +OverlayInit sOvlE16C50_Aquas[1] = { { OVERLAY_OFFSETS(ovl_E16C50), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -441,7 +441,7 @@ OverlayInit sE16C50_Overlay1[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE16C50_Overlay2[1] = { +OverlayInit sOvlE16C50_Area6[1] = { { OVERLAY_OFFSETS(ovl_E16C50), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), @@ -460,7 +460,7 @@ OverlayInit sE16C50_Overlay2[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE51970_Overlay2_2[2] = { +OverlayInit sOvlE51970_Fortuna[2] = { { OVERLAY_OFFSETS(ovl_E51970), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -495,7 +495,7 @@ OverlayInit sE51970_Overlay2_2[2] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE16C50_Overlay3[1] = { +OverlayInit sOvlE16C50_Unk4[1] = { { OVERLAY_OFFSETS(ovl_E16C50), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), @@ -514,7 +514,7 @@ OverlayInit sE16C50_Overlay3[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE9F1D0_Overlay1[1] = { +OverlayInit sOvlE9F1D0_SectorY[1] = { { OVERLAY_OFFSETS(ovl_E9F1D0), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), @@ -533,7 +533,7 @@ OverlayInit sE9F1D0_Overlay1[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE16C50_Overlay4[1] = { +OverlayInit sOvlE16C50_Solar[1] = { { OVERLAY_OFFSETS(ovl_E16C50), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -552,7 +552,7 @@ OverlayInit sE16C50_Overlay4[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE16C50_Overlay5[1] = { +OverlayInit sOvlE16C50_Zoness[1] = { { OVERLAY_OFFSETS(ovl_E16C50), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -571,7 +571,7 @@ OverlayInit sE16C50_Overlay5[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sDF4260_Overlay2[1] = { +OverlayInit sOvlDF4260_Venom1[1] = { { OVERLAY_OFFSETS(ovl_DF4260), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -590,7 +590,7 @@ OverlayInit sDF4260_Overlay2[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE9F1D0_Overlay2[1] = { +OverlayInit sOvlE9F1D0_Venom2[1] = { { OVERLAY_OFFSETS(ovl_E9F1D0), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -609,7 +609,7 @@ OverlayInit sE9F1D0_Overlay2[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE9F1D0_Overlay3_2[2] = { +OverlayInit sOvlE9F1D0_VenomSW[2] = { { OVERLAY_OFFSETS(ovl_E9F1D0), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -644,7 +644,7 @@ OverlayInit sE9F1D0_Overlay3_2[2] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE08400_Overlay3[1] = { +OverlayInit sOvlE08400_Setup20[1] = { { OVERLAY_OFFSETS(ovl_E08400), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -663,7 +663,7 @@ OverlayInit sE08400_Overlay3[1] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sE51970_Overlay3[1] = { +OverlayInit sOvlE51970_Bolse[1] = { { OVERLAY_OFFSETS(ovl_E51970), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8A68C0), @@ -682,7 +682,7 @@ OverlayInit sE51970_Overlay3[1] = { /* 0xF */ ROM_SEGMENT(ast_940AD0) } }, }; -OverlayInit sE51970_Overlay4[1] = { +OverlayInit sOvlE51970_Katina[1] = { { OVERLAY_OFFSETS(ovl_E51970), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -701,7 +701,7 @@ OverlayInit sE51970_Overlay4[1] = { /* 0xF */ ROM_SEGMENT(ast_940AD0) } }, }; -OverlayInit sE6A810_Overlay2_2[2] = { +OverlayInit sOvlE6A810_Macbeth[2] = { { OVERLAY_OFFSETS(ovl_E6A810), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -736,7 +736,7 @@ OverlayInit sE6A810_Overlay2_2[2] = { /* 0xF */ NO_SEGMENT } }, }; -OverlayInit sDF4260_Overlay3[1] = { +OverlayInit sOvlDF4260_Training[1] = { { OVERLAY_OFFSETS(ovl_DF4260), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), @@ -755,7 +755,7 @@ OverlayInit sDF4260_Overlay3[1] = { /* 0xF */ ROM_SEGMENT(ast_940AD0) } }, }; -OverlayInit sE08400_Overlay4_2[2] = { +OverlayInit sOvlE08400_Versus[2] = { { OVERLAY_OFFSETS(ovl_E08400), { /* 0x1 */ ROM_SEGMENT(ast_873CB0), /* 0x2 */ ROM_SEGMENT(ast_8AE0A0), diff --git a/src/main/fox_message.c b/src/main/fox_message.c index ff299481..4e8079e4 100644 --- a/src/main/fox_message.c +++ b/src/main/fox_message.c @@ -98,10 +98,10 @@ bool Message_DisplayText(Gfx** gfxPtr, u16* msgPtr, s32 xPos, s32 yPos, s32 len) case MSGCHAR_NP5: case MSGCHAR_NP6: case MSGCHAR_NP7: - case MSGCHAR_NP8: - case MSGCHAR_NP9: - case MSGCHAR_NPA: - case MSGCHAR_NPB: + case MSGCHAR_PRI0: + case MSGCHAR_PRI1: + case MSGCHAR_PRI2: + case MSGCHAR_PRI3: case MSGCHAR_QSP: case MSGCHAR_HSP: case MSGCHAR_NPF: @@ -147,10 +147,10 @@ void Message_DisplayScrollingText(Gfx** gfxPtr, u16* msgPtr, s32 xPos, s32 yPos, case MSGCHAR_NP5: case MSGCHAR_NP6: case MSGCHAR_NP7: - case MSGCHAR_NP8: - case MSGCHAR_NP9: - case MSGCHAR_NPA: - case MSGCHAR_NPB: + case MSGCHAR_PRI0: + case MSGCHAR_PRI1: + case MSGCHAR_PRI2: + case MSGCHAR_PRI3: case MSGCHAR_NPF: break; } diff --git a/src/main/fox_radio.c b/src/main/fox_radio.c index 41533692..a4eaca91 100644 --- a/src/main/fox_radio.c +++ b/src/main/fox_radio.c @@ -12,7 +12,7 @@ f32 D_80178740; s32 D_80178744; s32 D_80178748; -s32 D_800D4A70 = 0; +s32 sCurrentMsgPri = 0; void func_800BA760(void) { RCP_SetupDL_36(); @@ -21,101 +21,93 @@ void func_800BA760(void) { } } -s32 func_800BA7BC(u16* arg0, s32 arg1) { - s32 var_v0 = D_800D4A70; - - if (arg1 == var_v0) { +s32 func_800BA7BC(u16* msg, s32 priority) { + if (priority == sCurrentMsgPri) { return 0; } - if (arg1 < var_v0) { + if (priority < sCurrentMsgPri) { return 1; } - if (var_v0 < arg1) { - D_800D4A70 = arg1; + if (sCurrentMsgPri < priority) { + sCurrentMsgPri = priority; return 2; } } -void func_800BA808(u16* arg0, s32 arg1) { +void func_800BA808(u16* msg, s32 character) { s32 var_v1; s32 temp_v0; - s32 var_a1; + s32 priority; - switch (*arg0) { + switch (msg[0]) { default: - case 0x08: - var_a1 = 0; + case MSGCHAR_PRI0: + priority = 0; break; - case 0x09: - var_a1 = 1; + case MSGCHAR_PRI1: + priority = 1; break; - case 0x0a: - var_a1 = 2; + case MSGCHAR_PRI2: + priority = 2; break; - case 0x0b: - var_a1 = 3; + case MSGCHAR_PRI3: + priority = 3; break; } - if (D_80177834 == 7) { - if ((arg1 == 10) || (arg1 == 20) || (arg1 == 30)) { - if (arg1 == 10) { + if (gGameState == GSTATE_PLAY) { + if ((character == RCID_FALCO) || (character == RCID_SLIPPY) || (character == RCID_PEPPY)) { + if (character == RCID_FALCO) { var_v1 = 1; } - - if (arg1 == 20) { + if (character == RCID_SLIPPY) { var_v1 = 2; } - - if (arg1 == 30) { + if (character == RCID_PEPPY) { var_v1 = 3; } - if ((D_801778B0[var_v1] <= 0) && (D_801778B0[var_v1] != -2)) { return; } } } - if (D_8017829C != 0) { - temp_v0 = func_800BA7BC(arg0, var_a1); - if (temp_v0 == 1) { - return; - } + if ((D_8017829C != 0) && (func_800BA7BC(msg, priority) == 1)) { + return; } - D_800D4A70 = var_a1; - D_80177D68 = arg1; + sCurrentMsgPri = priority; + D_80177D68 = character; - if (gExpertMode && ((arg1 == 0) || (arg1 == 5))) { - D_80177D68 = 400; + if (gExpertMode && ((character == RCID_FOX) || (character == RCID_FOX_RED))) { + D_80177D68 = RCID_FOX_EXPERT; } - if (D_80178234 == 19) { - switch (arg1) { - case 200: - D_80177D68 = 240; + if (gCurrentLevel == LEVEL_VENOM_SW) { + switch (character) { + case RCID_WOLF: + D_80177D68 = RCID_WOLF_2; break; - case 210: - D_80177D68 = 250; + case RCID_PIGMA: + D_80177D68 = RCID_PIGMA_2; break; - case 220: - D_80177D68 = 260; + case RCID_LEON: + D_80177D68 = RCID_LEON_2; break; - case 230: - D_80177D68 = 270; + case RCID_ANDREW: + D_80177D68 = RCID_ANDREW_2; break; } } - D_80178308 = arg0; + D_80178308 = msg; D_8017829C = 100; - switch (D_80177834) { - case 2: - case 8: + switch (gGameState) { + case GSTATE_TITLE: + case GSTATE_CREDITS: D_8017872C = 176; D_80178728 = 85; D_80178730 = 80.0f; @@ -124,7 +116,7 @@ void func_800BA808(u16* arg0, s32 arg1) { D_8017873C = 32.0f; D_80178740 = 174.0f; break; - case 7: + case GSTATE_PLAY: D_8017872C = 180; D_80178728 = 79; D_80178730 = 74.0f; @@ -135,267 +127,267 @@ void func_800BA808(u16* arg0, s32 arg1) { break; } - D_801782E8 = Message_IdFromPtr(arg0); + D_801782E8 = Message_IdFromPtr(msg); func_8001ACDC(D_801782E8); } void func_800BAAE8(void) { static f32 D_800D4A74 = -1.0f; u16* sp44; - s32 var_s0; + s32 mirror; s32 i; f32 sp38; f32 temp_fa0; s32 j; D_80178744 = 0; - var_s0 = 0; + mirror = false; switch (D_801782A4) { - case 0x5: + case RCID_FOX_RED: D_80178744 = 1; /* fallthrough */ - case 0x0: + case RCID_FOX: sp44 = D_10050E0; break; - case 0x6: + case RCID_FOX_RED_OPEN: D_80178744 = 1; /* fallthrough */ - case 0x1: + case RCID_FOX_OPEN: sp44 = D_1006000; break; - case 0x190: + case RCID_FOX_EXPERT: sp44 = D_1006F20; break; - case 0x191: + case RCID_FOX_EXPERT_OPEN: sp44 = D_1007E40; break; - case 0xF: + case RCID_FALCO_RED: D_80178744 = 1; /* fallthrough */ - case 0xA: + case RCID_FALCO: sp44 = D_10032A0; break; - case 0x10: + case RCID_FALCO_RED_OPEN: D_80178744 = 1; /* fallthrough */ - case 0xB: + case RCID_FALCO_OPEN: sp44 = D_10041C0; break; - case 0x19: + case RCID_SLIPPY_RED: D_80178744 = 1; /* fallthrough */ - case 0x14: + case RCID_SLIPPY: sp44 = D_100D900; break; - case 0x1A: + case RCID_SLIPPY_RED_OPEN: D_80178744 = 1; /* fallthrough */ - case 0x15: + case RCID_SLIPPY_OPEN: sp44 = D_100E820; break; - case 0x23: + case RCID_PEPPY_RED: D_80178744 = 1; /* fallthrough */ - case 0x1E: + case RCID_PEPPY: sp44 = D_100BAC0; break; - case 0x24: + case RCID_PEPPY_RED_OPEN: D_80178744 = 1; /* fallthrough */ - case 0x1F: + case RCID_PEPPY_OPEN: sp44 = D_100C9E0; break; - case 0xC8: + case RCID_WOLF: sp44 = D_F00B580; break; - case 0xC9: + case RCID_WOLF_OPEN: sp44 = D_F00C4A0; break; - case 0xD2: + case RCID_PIGMA: sp44 = D_F003C80; break; - case 0xD3: + case RCID_PIGMA_OPEN: sp44 = D_F004BA0; break; - case 0xDC: + case RCID_LEON: sp44 = D_F007900; break; - case 0xDD: + case RCID_LEON_OPEN: sp44 = D_F008820; break; - case 0xE6: + case RCID_ANDREW: sp44 = D_F000000; break; - case 0xE7: + case RCID_ANDREW_OPEN: sp44 = D_F000F20; break; - case 0xF0: + case RCID_WOLF_2: sp44 = D_F00D3C0; break; - case 0xF1: + case RCID_WOLF_2_OPEN: sp44 = D_F00E2E0; break; - case 0xFA: + case RCID_PIGMA_2: sp44 = D_F005AC0; break; - case 0xFB: + case RCID_PIGMA_2_OPEN: sp44 = D_F0069E0; break; - case 0x104: + case RCID_LEON_2: sp44 = D_F009740; break; - case 0x105: + case RCID_LEON_2_OPEN: sp44 = D_F00A660; break; - case 0x10E: + case RCID_ANDREW_2: sp44 = D_F001E40; break; - case 0x10F: + case RCID_ANDREW_2_OPEN: sp44 = D_F002D60; break; - case 0x50: + case RCID_BOSS_CORNERIA: // Corneria robot boss sp44 = D_6026420; break; - case 0x51: + case RCID_BOSS_CORNERIA_OPEN: sp44 = D_6027340; break; - case 0x6E: + case RCID_BOSS_CORNERIA2: // Corneria secret boss sp44 = D_60245E0; break; - case 0x6F: + case RCID_BOSS_CORNERIA2_OPEN: sp44 = D_6025500; break; - case 0x64: + case RCID_BOSS_METEO: // Meteo Boss sp44 = D_601C8E0; break; - case 0x65: + case RCID_BOSS_METEO_OPEN: sp44 = D_601D800; break; - case 0x78: + case RCID_BOSS_AREA6: // Area 6 Boss sp44 = D_60047E0; break; - case 0x79: + case RCID_BOSS_AREA6_OPEN: sp44 = D_6005700; break; - case 0xB4: + case RCID_CAIMAN_AREA6: // Area 6 Caiman sp44 = D_60029A0; break; - case 0xB5: + case RCID_CAIMAN_AREA6_OPEN: sp44 = D_60038C0; break; - case 0x82: + case RCID_BOSS_ZONESS: // Zoness boss sp44 = D_6014510; break; - case 0x83: + case RCID_BOSS_ZONESS_OPEN: sp44 = D_6015430; break; - case 0x96: + case RCID_BOSS_SECTORX: // Sector X boss sp44 = D_6020FB0; break; - case 0x97: + case RCID_BOSS_SECTORX_OPEN: sp44 = D_6021ED0; break; - case 0xA0: + case RCID_BOSS_SECTORY: // Sector Y boss sp44 = D_6018F30; break; - case 0xA1: + case RCID_BOSS_SECTORY_OPEN: sp44 = D_6019E50; break; - case 0xBE: + case RCID_BOSS_MACBETH: // Macbeth boss sp44 = D_6010C20; break; - case 0xBF: + case RCID_BOSS_MACBETH_OPEN: sp44 = D_6011B40; break; - case 0x5F: + case RCID_ROB64_RED: D_80178744 = 1; /* fallthrough */ - case 0x5A: - case 0x8C: + case RCID_ROB64: + case RCID_ROB64_2: sp44 = D_1009C80; break; - case 0x60: + case RCID_ROB64_RED_OPEN: D_80178744 = 1; /* fallthrough */ - case 0x5B: - case 0x8D: + case RCID_ROB64_OPEN: + case RCID_ROB64_2_OPEN: sp44 = D_100ABA0; break; - case 0x28: + case RCID_KATT: sp44 = D_D003DF0; break; - case 0x29: + case RCID_KATT_OPEN: sp44 = D_D004D10; break; - case 0x32: - case 0x37: + case RCID_ANDROSS_RED: + case RCID_ANDROSS: sp44 = D_D000170; - if ((D_80177834 == 7) && (D_80178234 == 3)) { + if ((gGameState == GSTATE_PLAY) && (gCurrentLevel == LEVEL_AREA_6)) { sp44 = D_6000B60; } D_80178744 = 1; break; - case 0x33: - case 0x38: + case RCID_ANDROSS_RED_OPEN: + case RCID_ANDROSS_OPEN: sp44 = D_D001090; - if ((D_80177834 == 7) && (D_80178234 == 3)) { + if ((gGameState == GSTATE_PLAY) && (gCurrentLevel == LEVEL_AREA_6)) { sp44 = D_6001A80; } D_80178744 = 1; break; - case 0x3C: + case RCID_JAMES: sp44 = D_D005C30; break; - case 0x3D: + case RCID_JAMES_OPEN: sp44 = D_D006B50; break; - case 0xAA: + case RCID_BILL: sp44 = D_D001FB0; break; - case 0xAB: + case RCID_BILL_OPEN: sp44 = D_D002ED0; break; - case 0x46: + case RCID_PEPPER: sp44 = D_D007A70; break; - case 0x47: + case RCID_PEPPER_OPEN: sp44 = D_D008990; break; - case 0x12C: + case RCID_ROB64_TITLE: // rob title? sp44 = D_E00E100; break; - case 0x12D: + case RCID_ROB64_TITLE_OPEN: sp44 = D_E00F020; break; - case 0x136: + case RCID_PEPPER_TITLE: // pepper title? sp44 = D_E00FF40; break; - case 0x137: + case RCID_PEPPER_TITLE_OPEN: sp44 = D_E010E60; break; - case 0x15E: + case RCID_TRAINING: sp44 = D_6000900; break; - case 0x15F: + case RCID_TRAINING_OPEN: sp44 = D_6001820; break; - case 0x3: - var_s0 = 1; + case RCID_STATIC_FLIP: + mirror = true; /* fallthrough */ - case 0x2: - switch (D_80177834) { + case RCID_STATIC: + switch (gGameState) { default: sp44 = NULL; break; - case 7: + case GSTATE_PLAY: sp44 = D_1008D60; break; - case 2: - case 8: + case GSTATE_TITLE: + case GSTATE_CREDITS: sp44 = D_600C6A0; break; } - if (((s32) D_80177D68 == 50) || ((s32) D_80177D68 == 55)) { + if (((s32) D_80177D68 == RCID_ANDROSS) || ((s32) D_80177D68 == RCID_ANDROSS_RED)) { D_80178744 = 1; } break; @@ -412,7 +404,7 @@ void func_800BAAE8(void) { RCP_SetupDL_76(); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255); - if (var_s0 != 0) { + if (mirror) { for (i = 0, j = 0; i < 2; i++, j += 880) { TextureRect_16bRGBA_MirX(&gMasterDisp, &sp44[j], 44, 20, D_8017873C, D_80178740 + 20.0f + sp38 + (i * 20.0f * D_80177D38), 1.0f, D_80177D38); @@ -437,7 +429,7 @@ void func_800BB388(void) { u16* sp34; f32 sp30; - if ((D_80177834 != 4) && (D_80177D50 != 0.0f)) { + if ((gGameState != GSTATE_MAP) && (D_80177D50 != 0.0f)) { temp_fa0 = (D_80177D50 / 0.26f) * 3.0f; if ((D_80178734 + 16.0f) <= temp_fa0 + D_80178734) { D_800D4A78 = 1.0f; @@ -447,13 +439,13 @@ void func_800BB388(void) { } sp30 = temp_fa0 * D_800D4A78; RCP_SetupDL(&gMasterDisp, 0x55); - switch (D_80177834) { - case 2: - case 8: + switch (gGameState) { + case GSTATE_TITLE: + case GSTATE_CREDITS: sp38 = D_601D750; sp34 = D_601DB50; break; - case 7: + case GSTATE_PLAY: sp38 = D_1013170; sp34 = D_1013570; break; @@ -463,7 +455,7 @@ void func_800BB388(void) { } else { gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 60, 60, 255, 170); } - TextureRect_8bCI(&gMasterDisp, sp38, sp34, 0x20U, 0x20U, D_80178730, D_80178734 + 16.0f + sp30, D_80178738, + TextureRect_8bCI(&gMasterDisp, sp38, sp34, 0x20, 0x20, D_80178730, D_80178734 + 16.0f + sp30, D_80178738, D_80177D50); } if (D_80177D50 == 1.3f) { @@ -479,7 +471,7 @@ void func_800BB5D0(void) { s32 temp_ft0; u32 temp_v0; - if ((D_80177854 == 100) && (D_80177834 != 8)) { + if ((D_80177854 == 100) && (gGameState != GSTATE_CREDITS)) { return; } if (D_801782AC > 0) { @@ -489,7 +481,7 @@ void func_800BB5D0(void) { D_801782B4--; } switch (D_8017829C) { - case 0x64: + case 100: D_80178748 = 1; D_801782A4 = 1000; D_8017829C = 1; @@ -497,41 +489,41 @@ void func_800BB5D0(void) { D_80177D38 = 0.0f; D_80177D50 = 0.0f; D_8017874C = 0; - if (D_801778A8 != 1) { + if (gCamCount != 1) { D_8017829C = 0; } break; - case 0x1: + case 1: D_80177D38 += 0.25f; if (D_80177D38 == 1.0f) { D_8017829C++; D_801782AC = 10; } D_801782A4 = 2; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { D_801782A4 = 3; } break; - case 0x2: + case 2: if (D_801782AC == 0) { D_8017829C++; D_801782AC = 10; } D_801782A4 = 2; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { D_801782A4 = 3; } break; - case 0x3: + case 3: if (D_801782AC == 0) { D_8017829C++; temp_v0 = Message_GetWidth(D_80178308); if (D_80137E78 == 3) { - D_801782AC = temp_v0 + 0x10; + D_801782AC = temp_v0 + 16; } else { - D_801782AC = 2 * temp_v0 + 0x10; + D_801782AC = 2 * temp_v0 + 16; } - if ((D_80177834 == 2) || (D_80177834 == 8)) { + if ((gGameState == GSTATE_TITLE) || (gGameState == GSTATE_CREDITS)) { D_801782AC = temp_v0 * 2; } } @@ -541,11 +533,11 @@ void func_800BB5D0(void) { D_80177D50 = 1.3f; } break; - case 0x1F: + case 31: D_8017829C++; - D_801782AC = 0x50 - D_801782AC; + D_801782AC = 80 - D_801782AC; break; - case 0x20: + case 32: if (func_8001AE78() == 0) { D_80178724++; D_80178308 = D_80178720[D_80178724]; @@ -553,12 +545,12 @@ void func_800BB5D0(void) { D_801782D8 = 0; D_8017874C = 0; - D_801782AC = 0x50; + D_801782AC = 80; D_801782AC = Message_GetWidth(D_80178308) * 2; D_8017829C = 4; } break; - case 0x4: + case 4: if ((func_8001AE78() == 0) && (D_801782AC == 0)) { D_801782AC = 10; D_801782A4 = (s32) D_80177D68; @@ -570,9 +562,9 @@ void func_800BB5D0(void) { } temp_v0 = func_8001AED4(); if (D_801782D8 < 60) { - if (D_80178308[D_801782D8 + 1] == 0xF) { + if (D_80178308[D_801782D8 + 1] == 15) { if (temp_v0 == 0) { - D_8017829C = 0x1F; + D_8017829C = 31; } } else { D_801782D8++; @@ -592,17 +584,17 @@ void func_800BB5D0(void) { } D_8017874C ^= 1; break; - case 0x5: + case 5: if (D_801782AC == 0) { D_8017829C++; D_801782AC = 10; } D_801782A4 = (s32) D_80177D68; break; - case 0x6: + case 6: if (D_801782AC == 0) { if (!D_801782A4) {} - if (D_80177834 == 8) { + if (gGameState == GSTATE_CREDITS) { func_8001AE58(); } else { func_8001ACDC(0); @@ -610,7 +602,7 @@ void func_800BB5D0(void) { D_8017829C++; } D_801782A4 = 2; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { D_801782A4 = 3; } D_80177D50 -= 0.26f; @@ -618,19 +610,19 @@ void func_800BB5D0(void) { D_80177D50 = 0.0f; } break; - case 0x7: + case 7: D_80177D38 -= 0.25f; if (D_80177D38 == 0) { D_80178300 = 0; - D_800D4A70 = 0; + sCurrentMsgPri = 0; D_8017829C = 0; } D_801782A4 = 2; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { D_801782A4 = 3; } break; - case 0x8: + case 8: D_801782A4 = (s32) D_80177D68; D_80177D50 = 1.3f; D_80177D38 = 1.0f; @@ -642,21 +634,21 @@ void func_800BB5D0(void) { func_800BAAE8(); func_800BB388(); temp_ft0 = (s32) D_80177D68; - if ((temp_ft0 == 0xA) || (temp_ft0 == 0x14) || (temp_ft0 == 0x1E)) { - if (temp_ft0 == 0xA) { + if ((temp_ft0 == RCID_FALCO) || (temp_ft0 == RCID_SLIPPY) || (temp_ft0 == RCID_PEPPY)) { + if (temp_ft0 == RCID_FALCO) { var_v1 = 1; } - if (temp_ft0 == 0x14) { + if (temp_ft0 == RCID_SLIPPY) { var_v1 = 2; } - if (temp_ft0 == 0x1E) { + if (temp_ft0 == RCID_PEPPY) { var_v1 = 3; } - if ((D_801778B0[var_v1] <= 0) && (D_80177DB0 & 4) && (D_801778B0[var_v1] != -2) && (D_801782A4 != 2) && + if ((D_801778B0[var_v1] <= 0) && (gFrameCount & 4) && (D_801778B0[var_v1] != -2) && (D_801782A4 != 2) && (D_801782A4 != 3) && (D_801782A4 != 1000)) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255); - Graphics_DisplaySmallText(0x1F, 0xA7, 1.0f, 1.0f, "DOWN"); + Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN"); func_80084B94(1); } if ((D_801782A4 != 2) && (D_801782A4 != 3) && (D_801782A4 != 1000)) { @@ -664,37 +656,38 @@ void func_800BB5D0(void) { } } temp_ft0 = (s32) D_80177D68; - if ((temp_ft0 == 0xC8) || (temp_ft0 == 0xD2) || (temp_ft0 == 0xDC) || (temp_ft0 == 0xE6) || - (temp_ft0 == 0xF0) || (temp_ft0 == 0xFA) || (temp_ft0 == 0x104) || (temp_ft0 == 0x10E)) { + if ((temp_ft0 == RCID_WOLF) || (temp_ft0 == RCID_PIGMA) || (temp_ft0 == RCID_LEON) || + (temp_ft0 == RCID_ANDREW) || (temp_ft0 == RCID_WOLF_2) || (temp_ft0 == RCID_PIGMA_2) || + (temp_ft0 == RCID_LEON_2) || (temp_ft0 == RCID_ANDREW_2)) { switch (temp_ft0) { - case 0xC8: - case 0xF0: + case RCID_WOLF: + case RCID_WOLF_2: var_v1 = 4; break; - case 0xDC: - case 0x104: + case RCID_LEON: + case RCID_LEON_2: var_v1 = 5; break; - case 0xD2: - case 0xFA: + case RCID_PIGMA: + case RCID_PIGMA_2: var_v1 = 6; break; - case 0xE6: - case 0x10E: + case RCID_ANDREW: + case RCID_ANDREW_2: var_v1 = 7; break; default: var_v1 = 0; break; } - if ((D_80163FE0[var_v1].obj.status != 2) && (D_80177DB0 & 4) && (D_80178280[0].unk_1C8 == 3) && + if ((gObjects2F4[var_v1].obj.status != 2) && (gFrameCount & 4) && (gPlayer[0].unk_1C8 == 3) && (D_801782A4 != 2) && (D_801782A4 != 3) && (D_801782A4 != 1000)) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255); - Graphics_DisplaySmallText(0x1F, 0xA7, 1.0f, 1.0f, "DOWN"); + Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN"); } if ((D_801782A4 != 2) && (D_801782A4 != 3) && (D_801782A4 != 1000)) { - func_80086110(22.0f, 165.0f, D_80163FE0[var_v1].unk_0CE * 2.55f); + func_80086110(22.0f, 165.0f, gObjects2F4[var_v1].unk_0CE * 2.55f); } } if ((D_801782A4 != 2) && (D_801782A4 != 3) && (D_801782A4 != 1000)) { @@ -720,40 +713,40 @@ void func_800BC040(void) { D_801782B4--; } switch (D_8017829C) { - case 0x64: - D_801782A4 = 0x3E8; + case 100: + D_801782A4 = 1000; D_8017829C = 1; D_80177D38 = 0.0f; D_80177D50 = 0.0f; D_801782D8 = Message_GetWidth(D_80178308); - if (D_801778A8 != 1) { + if (gCamCount != 1) { D_8017829C = 0; } break; - case 0x1: + case 1: D_80177D38 += 0.02f; if (D_80177D38 == 0.04f) { D_8017829C++; D_801782AC = 5; } break; - case 0x2: + case 2: if (D_801782AC == 0) { D_8017829C++; D_801782AC = 5; } D_801782A4 = 2; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { D_801782A4 = 3; } break; - case 0x3: + case 3: if (D_801782AC == 0) { D_8017829C++; D_801782AC = 5; - if (D_80177834 == 2) { - D_801782AC = 0x1E; + if (gGameState == GSTATE_TITLE) { + D_801782AC = 30; } } D_801782A4 = (s32) D_80177D68; @@ -762,26 +755,26 @@ void func_800BC040(void) { D_80177D50 = 0.07f; } break; - case 0x4: + case 4: if (D_801782AC == 0) { D_8017829C++; D_801782AC = 10; } break; - case 0x5: + case 5: if (D_801782AC == 0) { D_8017829C++; D_801782AC = 5; } D_801782A4 = (s32) D_80177D68; break; - case 0x6: + case 6: if (D_801782AC == 0) { func_8001ACDC(0); D_8017829C++; } D_801782A4 = 2; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { D_801782A4 = 3; } D_80177D50 -= 0.015f; @@ -789,14 +782,14 @@ void func_800BC040(void) { D_80177D50 = 0.0f; } break; - case 0x7: + case 7: D_80177D38 -= 0.02f; if (D_80177D38 == 0) { D_8017829C = 0; D_801782AC = 5; } D_801782A4 = 2; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { D_801782A4 = 3; } break; @@ -806,7 +799,8 @@ void func_800BC040(void) { if ((D_8017829C > 0) && (D_8017829C != 100)) { func_800BAAE8(); func_800BB388(); - if (((s32) D_80177D68 == 10) || ((s32) D_80177D68 == 20) || ((s32) D_80177D68 == 30)) { + if (((s32) D_80177D68 == RCID_FALCO) || ((s32) D_80177D68 == RCID_SLIPPY) || + ((s32) D_80177D68 == RCID_PEPPY)) { Matrix_Push(&gGfxMatrix); RCP_SetupDL_36(); Matrix_Translate(gGfxMatrix, -150.0f, -115.0f, -443.0f, 1); diff --git a/src/main/lib.c b/src/main/lib.c index d671e151..a07fecbc 100644 --- a/src/main/lib.c +++ b/src/main/lib.c @@ -86,7 +86,7 @@ void Lib_QuickSort(u8* first, u32 curLen, u32 size, CompareFunc cFunc) { void Lib_Perspective(Gfx** dList) { u16 norm; - guPerspective(gGfxMtx, &norm, D_80161A3C, 1.3333334f, D_80161A40, D_80161A44, 1.0f); + guPerspective(gGfxMtx, &norm, D_80161A3C, (f32) SCREEN_WIDTH / SCREEN_HEIGHT, D_80161A40, D_80161A44, 1.0f); gSPPerspNormalize((*dList)++, norm); gSPMatrix((*dList)++, gGfxMtx++, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guLookAt(gGfxMtx, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -12800.0f, 0.0f, 1.0f, 0.0f); diff --git a/src/main/main.c b/src/main/main.c index fbf01a9a..7febe472 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -308,7 +308,7 @@ void Graphics_ThreadEntry(void* arg0) { u8 var_v1; u8 var_v2; - func_800A18B0(); + Game_Initialize(); osSendMesg(&gSerialThreadMsgQueue, (OSMesg) SI_READ_CONTROLLER, OS_MESG_PRI_NORMAL); Graphics_InitializeTask(gFrameCounter); { diff --git a/src/main/matrix.c b/src/main/matrix.c index e8158b2a..75d07e60 100644 --- a/src/main/matrix.c +++ b/src/main/matrix.c @@ -19,6 +19,7 @@ Matrix sGfxMatrixStack[0x20]; Matrix* gCalcMatrix; Matrix sCalcMatrixStack[0x20]; +// Copies src Matrix into dst void Matrix_Copy(Matrix* dst, Matrix* src) { dst->m[0][0] = src->m[0][0]; dst->m[0][1] = src->m[0][1]; @@ -36,29 +37,15 @@ void Matrix_Copy(Matrix* dst, Matrix* src) { dst->m[3][1] = src->m[3][1]; dst->m[3][2] = src->m[3][2]; dst->m[3][3] = src->m[3][3]; - // dst->xx = src->xx; - // dst->yx = src->yx; - // dst->zx = src->zx; - // dst->wx = src->wx; - // dst->xy = src->xy; - // dst->yy = src->yy; - // dst->zy = src->zy; - // dst->wy = src->wy; - // dst->xz = src->xz; - // dst->yz = src->yz; - // dst->zz = src->zz; - // dst->wz = src->wz; - // dst->xw = src->xw; - // dst->yw = src->yw; - // dst->zw = src->zw; - // dst->ww = src->ww; } +// Makes a copy of the stack's current matrix and puts it on the top of the stack void Matrix_Push(Matrix** mtxStack) { Matrix_Copy(*mtxStack + 1, *mtxStack); *mtxStack += 1; } +// Removes the top matrix of the stack void Matrix_Pop(Matrix** mtxStack) { *mtxStack -= 1; } @@ -385,75 +372,76 @@ void Matrix_RotateAxis(Matrix* mtx, f32 angle, f32 axisX, f32 axisY, f32 axisZ, } } +// Converts the current Gfx matrix to a Mtx void Matrix_ToMtx(Mtx* dest) { s32 temp; - u16* m1 = (u16*) &dest->m[0][0]; - u16* m2 = (u16*) &dest->m[2][0]; + u16* iPart = (u16*) &dest->m[0][0]; + u16* fpart = (u16*) &dest->m[2][0]; Matrix* src = gGfxMatrix; - temp = src->xx * 0x10000; - m1[0] = (temp >> 0x10); - m2[0] = temp & 0xFFFF; + temp = src->m[0][0] * 0x10000; + iPart[0] = (temp >> 0x10); + fpart[0] = temp & 0xFFFF; - temp = src->yx * 0x10000; - m1[1] = (temp >> 0x10); - m2[1] = temp & 0xFFFF; + temp = src->m[0][1] * 0x10000; + iPart[1] = (temp >> 0x10); + fpart[1] = temp & 0xFFFF; - temp = src->zx * 0x10000; - m1[2] = (temp >> 0x10); - m2[2] = temp & 0xFFFF; + temp = src->m[0][2] * 0x10000; + iPart[2] = (temp >> 0x10); + fpart[2] = temp & 0xFFFF; - temp = src->wx * 0x10000; - m1[3] = (temp >> 0x10); - m2[3] = temp & 0xFFFF; + temp = src->m[0][3] * 0x10000; + iPart[3] = (temp >> 0x10); + fpart[3] = temp & 0xFFFF; - temp = src->xy * 0x10000; - m1[4] = (temp >> 0x10); - m2[4] = temp & 0xFFFF; + temp = src->m[1][0] * 0x10000; + iPart[4] = (temp >> 0x10); + fpart[4] = temp & 0xFFFF; - temp = src->yy * 0x10000; - m1[5] = (temp >> 0x10); - m2[5] = temp & 0xFFFF; + temp = src->m[1][1] * 0x10000; + iPart[5] = (temp >> 0x10); + fpart[5] = temp & 0xFFFF; - temp = src->zy * 0x10000; - m1[6] = (temp >> 0x10); - m2[6] = temp & 0xFFFF; + temp = src->m[1][2] * 0x10000; + iPart[6] = (temp >> 0x10); + fpart[6] = temp & 0xFFFF; - temp = src->wy * 0x10000; - m1[7] = (temp >> 0x10); - m2[7] = temp & 0xFFFF; + temp = src->m[1][3] * 0x10000; + iPart[7] = (temp >> 0x10); + fpart[7] = temp & 0xFFFF; - temp = src->xz * 0x10000; - m1[8] = (temp >> 0x10); - m2[8] = temp & 0xFFFF; + temp = src->m[2][0] * 0x10000; + iPart[8] = (temp >> 0x10); + fpart[8] = temp & 0xFFFF; - temp = src->yz * 0x10000; - m1[9] = (temp >> 0x10); - m2[9] = temp & 0xFFFF; + temp = src->m[2][1] * 0x10000; + iPart[9] = (temp >> 0x10); + fpart[9] = temp & 0xFFFF; - temp = src->zz * 0x10000; - m1[10] = (temp >> 0x10); - m2[10] = temp & 0xFFFF; + temp = src->m[2][2] * 0x10000; + iPart[10] = (temp >> 0x10); + fpart[10] = temp & 0xFFFF; - temp = src->wz * 0x10000; - m1[11] = (temp >> 0x10); - m2[11] = temp & 0xFFFF; + temp = src->m[2][3] * 0x10000; + iPart[11] = (temp >> 0x10); + fpart[11] = temp & 0xFFFF; - temp = src->xw * 0x10000; - m1[12] = (temp >> 0x10); - m2[12] = temp & 0xFFFF; + temp = src->m[3][0] * 0x10000; + iPart[12] = (temp >> 0x10); + fpart[12] = temp & 0xFFFF; - temp = src->yw * 0x10000; - m1[13] = (temp >> 0x10); - m2[13] = temp & 0xFFFF; + temp = src->m[3][1] * 0x10000; + iPart[13] = (temp >> 0x10); + fpart[13] = temp & 0xFFFF; - temp = src->zw * 0x10000; - m1[14] = (temp >> 0x10); - m2[14] = temp & 0xFFFF; + temp = src->m[3][2] * 0x10000; + iPart[14] = (temp >> 0x10); + fpart[14] = temp & 0xFFFF; - temp = src->ww * 0x10000; - m1[15] = (temp >> 0x10); - m2[15] = temp & 0xFFFF; + temp = src->m[3][3] * 0x10000; + iPart[15] = (temp >> 0x10); + fpart[15] = temp & 0xFFFF; } void Matrix_FromMtx(Mtx* src, Matrix* dest) { @@ -478,18 +466,23 @@ void Matrix_FromMtx(Mtx* src, Matrix* dest) { dest->ww = ((m1[15] << 0x10) | m2[15]) * (1 / 65536.0f); } +// Applies the transform matrix mtx to the vector src, putting the result in dest void Matrix_MultVec3f(Matrix* mtx, Vec3f* src, Vec3f* dest) { dest->x = (mtx->m[0][0] * src->x) + (mtx->m[1][0] * src->y) + (mtx->m[2][0] * src->z) + mtx->m[3][0]; dest->y = (mtx->m[0][1] * src->x) + (mtx->m[1][1] * src->y) + (mtx->m[2][1] * src->z) + mtx->m[3][1]; dest->z = (mtx->m[0][2] * src->x) + (mtx->m[1][2] * src->y) + (mtx->m[2][2] * src->z) + mtx->m[3][2]; } +// Applies the linear part of the transformation matrix mtx to the vector src, ignoring any translation that mtx might +// have. Puts the result in dest. void Matrix_MultVec3fNoTranslate(Matrix* mtx, Vec3f* src, Vec3f* dest) { dest->x = (mtx->m[0][0] * src->x) + (mtx->m[1][0] * src->y) + (mtx->m[2][0] * src->z); dest->y = (mtx->m[0][1] * src->x) + (mtx->m[1][1] * src->y) + (mtx->m[2][1] * src->z); dest->z = (mtx->m[0][2] * src->x) + (mtx->m[1][2] * src->y) + (mtx->m[2][2] * src->z); } +// Expresses the rotational part of the transform mtx as Tait-Bryan angles, in the yaw-pitch-roll (intrinsic YXZ) +// convention used in worldspace calculations void Matrix_GetYRPAngles(Matrix* mtx, Vec3f* rot) { Matrix invYP; Vec3f origin = { 0.0f, 0.0f, 0.0f }; @@ -518,6 +511,8 @@ void Matrix_GetYRPAngles(Matrix* mtx, Vec3f* rot) { rot->z = Math_Atan2F(xHat.y, xHat.x) * M_RTOD; } +// Expresses the rotational part of the transform mtx as Tait-Bryan angles, in the extrinsic XYZ convention used in +// modelspace calculations void Matrix_GetXYZAngles(Matrix* mtx, Vec3f* rot) { Matrix invYZ; Vec3f origin = { 0.0f, 0.0f, 0.0f }; @@ -554,6 +549,7 @@ void Matrix_LookAt(Matrix* mtx, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, Matrix_Mult(mtx, &lookAt, mode); } +// Converts the current Gfx matrix to a Mtx and sets it to the display list void Matrix_SetGfxMtx(Gfx** gfx) { Matrix_ToMtx(gGfxMtx); gSPMatrix((*gfx)++, gGfxMtx++, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/main/sf_2EFE0.c b/src/main/sf_2EFE0.c index 7a8ec1ac..a4065a8c 100644 --- a/src/main/sf_2EFE0.c +++ b/src/main/sf_2EFE0.c @@ -12,7 +12,7 @@ void func_80187520(s32, void*); void func_8002E3E0(Object_2F4* arg0) { s32 var_a3 = 0; - if (D_80178234 == 0x13) { + if (gCurrentLevel == LEVEL_VENOM_SW) { if (D_8015F940 < 0xF00) { var_a3 = 50; } else if (D_8015F940 < 0x1680) { @@ -36,12 +36,12 @@ void func_8002E3E0(Object_2F4* arg0) { if (var_a3 != 0) { func_80077240(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, var_a3); } - D_80161A98 += var_a3; + gHitCount += var_a3; D_80177850 = 0xF; } s32 func_8002E4F8(u16* arg0, s32 arg1) { - if ((D_8017829C == 0) && (D_80178280[0].unk_1C8 != 0)) { + if ((D_8017829C == 0) && (gPlayer[0].unk_1C8 != 0)) { func_800BA808(arg0, arg1); return true; } else { @@ -60,35 +60,35 @@ void func_8002E548(void) { } } -void func_8002E5E0(Object* arg0) { +void func_8002E5E0(Object_408* arg0) { func_80187520(0x5B, arg0); } -void func_8002E604(Object* arg0) { +void func_8002E604(Object_408* arg0) { func_80187520(0x5C, arg0); } -void func_8002E628(Object* arg0) { +void func_8002E628(Object_408* arg0) { func_80187520(0x5D, arg0); } -void func_8002E64C(Object* arg0) { +void func_8002E64C(Object_408* arg0) { func_80187520(0x5E, arg0); } -void func_8002E670(Object* arg0) { +void func_8002E670(Object_2F4* arg0) { func_80187520(0x5F, arg0); } -void func_8002E694(Object* arg0) { +void func_8002E694(Object_2F4* arg0) { func_80187520(0x60, arg0); } -void func_8002E6B8(Object* arg0) { +void func_8002E6B8(Object_2F4* arg0) { func_80187520(0x61, arg0); } -void func_8002E6DC(Object* arg0) { +void func_8002E6DC(Object_2F4* arg0) { func_80187520(0x62, arg0); } @@ -97,7 +97,7 @@ void func_8002E6DC(Object* arg0) { #pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002ED60.s") void func_8002EE34(void) { - D_8015F904 = D_8017829C = D_80163FE0[1].unk_054 = D_80163FE0[2].unk_054 = D_80163FE0[3].unk_054 = 0; + D_8015F904 = D_8017829C = gObjects2F4[1].unk_054 = gObjects2F4[2].unk_054 = gObjects2F4[3].unk_054 = 0; } #pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002EE64.s") @@ -122,17 +122,14 @@ void func_8002F64C(void) { #pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002FC00.s") s32 func_8002FE74(void) { - switch (D_80178234) { - case 14: + switch (gCurrentLevel) { + case LEVEL_FORTUNA: return D_8015F928 == (D_800C9B4C + 0x960); - case 17: - return D_8016F110[2].unk_0D0 == 4; - case 16: - return D_8016F110[1].unk_0A6 == 2; - default: - return 0; + case LEVEL_BOLSE: + return gObjects408[2].unk_0D0 == 4; + case LEVEL_KATINA: + return gObjects408[1].unk_0A6 == 2; } - return 0; } diff --git a/src/main/sf_43AC0.c b/src/main/sf_43AC0.c deleted file mode 100644 index bfdd3b05..00000000 --- a/src/main/sf_43AC0.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042EC0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FAC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FB8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FC4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FD0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FDC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FE8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80042FF4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_800430DC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_80043188.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/func_8004319C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_43AC0/D_800D55D0.s") diff --git a/src/main/sf_6B3B0.c b/src/main/sf_6B3B0.c deleted file mode 100644 index 666837e0..00000000 --- a/src/main/sf_6B3B0.c +++ /dev/null @@ -1,125 +0,0 @@ -#include "common.h" - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A7B0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A800.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A900.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A96C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A978.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006A984.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006AA3C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006AA98.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006ABA4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006AC08.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006AD18.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006B094.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006B0A0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006B46C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006B74C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006B95C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006BA64.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006BB1C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006BB78.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006BF7C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006C008.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006D0F4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006D350.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006D36C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EA50.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EAC4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EB64.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EBC0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EC60.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006ECBC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EEFC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006EFA0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F044.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F0D8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F140.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F1EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F254.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006F40C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006FE28.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8006FEEC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800700A4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800701E0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80070BA8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80070CEC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80070D44.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80071DC0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800720E8.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800722EC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8007240C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80072474.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80072594.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074BFC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074C44.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074E3C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074F04.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074F90.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80074FF0.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800763A4.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_8007717C.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_800771CC.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/func_80077218.s") - -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_6B3B0/D_800D6A50.s") diff --git a/src/main/sf_77E40.c b/src/main/sf_77E40.c index 4816413c..eeee8db8 100644 --- a/src/main/sf_77E40.c +++ b/src/main/sf_77E40.c @@ -3,24 +3,24 @@ void func_80077240(f32 posX, f32 posY, f32 posZ, s32 arg3) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80176438); i++) { - if (D_80176438[i].unk_00 == 0) { - D_80176438[i].unk_00 = arg3; - D_80176438[i].pos.x = posX; - D_80176438[i].pos.y = posY; - D_80176438[i].pos.z = posZ; - D_80176438[i].unk_10 = 0.0f; - D_80176438[i].unk_18 = 65; + for (i = 0; i < ARRAY_COUNT(gUnkEntities1C); i++) { + if (gUnkEntities1C[i].unk_00 == 0) { + gUnkEntities1C[i].unk_00 = arg3; + gUnkEntities1C[i].pos.x = posX; + gUnkEntities1C[i].pos.y = posY; + gUnkEntities1C[i].pos.z = posZ; + gUnkEntities1C[i].unk_10 = 0.0f; + gUnkEntities1C[i].unk_18 = 65; break; } } } void func_8007729C(void) { - UnkStruct_D_80176438* var_s0; + UnkEntity1C* var_s0; s32 i; - for (i = 0, var_s0 = D_80176438; i < ARRAY_COUNT(D_80176438); i++, var_s0++) { + for (i = 0, var_s0 = gUnkEntities1C; i < ARRAY_COUNT(gUnkEntities1C); i++, var_s0++) { if (var_s0->unk_00 != 0) { if (var_s0->unk_18 != 0) { var_s0->unk_18 -= 1; @@ -30,9 +30,9 @@ void func_8007729C(void) { } if (D_80177880 == 0) { var_s0->pos.z -= D_80177D08; - } else if (D_80178280->unk_1C8 == 3) { - var_s0->pos.x += D_80178280->unk_0C0.x; - var_s0->pos.z += D_80178280->unk_0C0.z; + } else if (gPlayer[0].unk_1C8 == 3) { + var_s0->pos.x += gPlayer[0].unk_0C0.x; + var_s0->pos.z += gPlayer[0].unk_0C0.z; } if (var_s0->unk_18 < 45) { Math_SmoothStepToF(&var_s0->unk_10, 300.0f, 0.1f, 20.0f, 0.0f); @@ -41,7 +41,7 @@ void func_8007729C(void) { } } -void func_80077404(UnkStruct_D_80176438* arg0) { +void func_80077404(UnkEntity1C* arg0) { s32 var_a2; Vec3f sp60; Vec3f sp54; @@ -54,8 +54,8 @@ void func_80077404(UnkStruct_D_80176438* arg0) { if ((fabsf(sp54.x) < 20000.0f) && (fabsf(sp54.y) < 20000.0f)) { if ((sp54.z < 0.0f) && (sp54.z > -20000.0f)) { sp50 = sqrtf(VEC3F_SQ(sp54)) * 0.0015f * 0.2f; - Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1); - Matrix_RotateX(gGfxMatrix, D_80178280[D_801778A0].unk_05C, 1); + Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1); + Matrix_RotateX(gGfxMatrix, gPlayer[D_801778A0].unk_05C, 1); Matrix_Scale(gGfxMatrix, sp50, sp50, 1.0f, 1); Matrix_Translate(gGfxMatrix, 0.0f, arg0->unk_10, 0.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); @@ -94,12 +94,12 @@ void func_80077404(UnkStruct_D_80176438* arg0) { } void func_80077790(void) { - UnkStruct_D_80176438* var_s0; + UnkEntity1C* var_s0; s32 i; RCP_SetupDL(&gMasterDisp, 0x3E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - for (i = 0, var_s0 = D_80176438; i < ARRAY_COUNT(D_80176438); i++, var_s0++) { + for (i = 0, var_s0 = gUnkEntities1C; i < ARRAY_COUNT(gUnkEntities1C); i++, var_s0++) { if (var_s0->unk_00 != 0) { Matrix_Push(&gGfxMatrix); func_80077404(var_s0); @@ -112,31 +112,31 @@ Object_8C* func_8007783C(s32 objId) { Object_8C* var_a2; s32 i; - for (i = 0, var_a2 = D_80170130; i < ARRAY_COUNT(D_80170130); i++, var_a2++) { + for (i = 0, var_a2 = gObjects8C; i < ARRAY_COUNT(gObjects8C); i++, var_a2++) { if (var_a2->obj.status == 0) { - func_80061474(var_a2); + Object_8C_Initialize(var_a2); var_a2->obj.status = 2; var_a2->obj.id = objId; func_800612B8(&var_a2->unk_1C, var_a2->obj.id); break; } } - if (i == ARRAY_COUNT(D_80170130)) { + if (i == ARRAY_COUNT(gObjects8C)) { var_a2 = NULL; } return var_a2; } void func_800778C4(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x153; + arg0->obj.id = OBJECT_339; arg0->obj.pos.x = posX; arg0->obj.pos.y = posY; arg0->obj.pos.z = posZ; - arg0->unk_54 = arg4; - arg0->unk_58 = arg5; - arg0->unk_5C = arg6; + arg0->unk_54.x = arg4; + arg0->unk_54.y = arg5; + arg0->unk_54.z = arg6; arg0->unk_70 = arg7; arg0->unk_4C = 0; arg0->unk_6C = 0.5f; @@ -148,9 +148,9 @@ void func_800778C4(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, f32 void func_8007797C(f32 posX, f32 posY, f32 posZ, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { s32 i; - for (i = ARRAY_COUNT(D_80170130) - 1; i >= 0; i--) { - if (D_80170130[i].obj.status == 0) { - func_800778C4(&D_80170130[i], posX, posY, posZ, arg3, arg4, arg5, arg6); + for (i = ARRAY_COUNT(gObjects8C) - 1; i >= 0; i--) { + if (gObjects8C[i].obj.status == 0) { + func_800778C4(&gObjects8C[i], posX, posY, posZ, arg3, arg4, arg5, arg6); break; } } @@ -178,7 +178,7 @@ void func_80077B78(void* arg0) { void func_80077B84(Object_8C* arg0) { func_8005980C(arg0->unk_70); - if ((arg0->unk_6C == 71.0f) || ((D_80178280->unk_1C8 == 7) && (D_80178234 == 0))) { + if ((arg0->unk_6C == 71.0f) || ((gPlayer[0].unk_1C8 == 7) && (gCurrentLevel == LEVEL_CORNERIA))) { RCP_SetupDL(&gMasterDisp, 0x26); } else { RCP_SetupDL(&gMasterDisp, 0x43); @@ -205,10 +205,10 @@ void func_80077B84(Object_8C* arg0) { gDPSetEnvColor(gMasterDisp++, 255, 32, 32, arg0->unk_44); break; case 6: - if (D_80178234 == 0x11) { + if (gCurrentLevel == LEVEL_BOLSE) { RCP_SetupDL(&gMasterDisp, 0x26); } - switch ((arg0->unk_40 + D_80177DB0) & 3) { + switch ((arg0->unk_40 + gFrameCount) & 3) { case 0: gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 0, 0, arg0->unk_44); break; @@ -259,12 +259,12 @@ void func_800780F8(Object_8C* arg0) { s32 i; if (arg0->unk_4A >= 0xB) { - if (!((arg0->unk_40 + D_80177DB0) & 1)) { + if (!((arg0->unk_40 + gFrameCount) & 1)) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 128, 128, 32); } else { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 128, 128, 128); } - } else if (!((arg0->unk_40 + D_80177DB0) & 1)) { + } else if (!((arg0->unk_40 + gFrameCount) & 1)) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); } else { gDPSetPrimColor(gMasterDisp++, 0, 0, 96, 96, 255, 255); @@ -322,7 +322,7 @@ void func_80078604(Object_8C* arg0) { } void func_8007868C(Object_8C* arg0) { - RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); Matrix_Scale(gGfxMatrix, arg0->unk_70, arg0->unk_70, arg0->unk_70, 1); if (arg0->unk_44 >= 2) { @@ -334,7 +334,7 @@ void func_8007868C(Object_8C* arg0) { } void func_8007879C(Object_8C* arg0) { - RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC); + RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar); gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK); Matrix_Scale(gGfxMatrix, arg0->unk_70 * 0.6f, 1.0f, arg0->unk_70 * 3.5f, 1); Matrix_RotateX(gGfxMatrix, (M_PI / 2.0f), 1); @@ -347,13 +347,13 @@ void func_800788B0(Object_8C* arg0) { s32 temp_ft3; s32* tmp; - switch (D_80178234) { - case 1: + switch (gCurrentLevel) { + case LEVEL_METEO: func_8005980C(arg0->unk_70); gDPSetPrimColor(gMasterDisp++, 0, 0, 128, 128, 128, 255); gSPDisplayList(gMasterDisp++, D_601FF80); break; - case 13: + case LEVEL_AQUAS: RCP_SetupDL(&gMasterDisp, 0x43); temp_ft3 = Math_ModF(arg0->unk_40, 4.0f); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) arg0->unk_6C); @@ -377,11 +377,11 @@ void func_80078AE0(void* arg0) { void func_80078AEC(Object_8C* arg0) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 180); - func_8005980C(arg0->unk_70 * (13.0f + ((D_80177DB0 & 1) * 2.5f))); + func_8005980C(arg0->unk_70 * (13.0f + ((gFrameCount & 1) * 2.5f))); gSPDisplayList(gMasterDisp++, D_102ED50); } -void func_80078B8C(void* unused) { +void func_80078B8C(Object_8C* arg0) { RCP_SetupDL_21(); gSPDisplayList(gMasterDisp++, D_101ABD0); RCP_SetupDL(&gMasterDisp, 0x40); @@ -392,7 +392,7 @@ void func_80078BE0(Object_8C* arg0) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 160); var_fv0 = 3.0f; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { var_fv0 *= 1.2f; } func_8005980C(arg0->unk_70 * var_fv0); @@ -412,17 +412,17 @@ void func_80078CE8(Object_8C* arg0) { } void func_80078D60(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x189; + arg0->obj.id = OBJECT_393; arg0->obj.pos.x = posX; arg0->obj.pos.y = posY; arg0->obj.pos.z = posZ; arg0->unk_70 = arg4; if (arg4 == 3.1f) { - arg0->unk_54 = D_80163FE0[8].unk_0E8; - arg0->unk_58 = D_80163FE0[8].unk_0EC; - arg0->unk_5C = D_80163FE0[8].unk_0F0; + arg0->unk_54.x = gObjects2F4[8].unk_0E8.x; + arg0->unk_54.y = gObjects2F4[8].unk_0E8.y; + arg0->unk_54.z = gObjects2F4[8].unk_0E8.z; } if (arg4 != 30.0f) { arg0->unk_4E = 1; @@ -437,9 +437,9 @@ void func_80078D60(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) { void func_80078E50(f32 posX, f32 posY, f32 posZ, f32 arg3) { s32 i; - for (i = ARRAY_COUNT(D_80170130) - 1; i >= 0; i--) { - if (D_80170130[i].obj.status == 0) { - func_80078D60(&D_80170130[i], posX, posY, posZ, arg3); + for (i = ARRAY_COUNT(gObjects8C) - 1; i >= 0; i--) { + if (gObjects8C[i].obj.status == 0) { + func_80078D60(&gObjects8C[i], posX, posY, posZ, arg3); break; } } @@ -447,9 +447,9 @@ void func_80078E50(f32 posX, f32 posY, f32 posZ, f32 arg3) { void func_80078EBC(Object_8C* arg0) { if (arg0->unk_4E == 2) { - arg0->unk_54 = D_80178280->unk_0C0.x; - arg0->unk_58 = D_80178280->unk_0C0.y; - arg0->unk_5C = D_80178280->unk_0C0.z; + arg0->unk_54.x = gPlayer[0].unk_0C0.x; + arg0->unk_54.y = gPlayer[0].unk_0C0.y; + arg0->unk_54.z = gPlayer[0].unk_0C0.z; } arg0->obj.rot.z += 35.0f; if (arg0->unk_50 >= 7) { @@ -458,7 +458,7 @@ void func_80078EBC(Object_8C* arg0) { arg0->unk_6C -= 0.25f; } if (arg0->unk_6C <= 0.0f) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } @@ -483,27 +483,27 @@ void func_8007905C(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, u8 a f32 xAng; f32 yAng; - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 2; - arg0->obj.id = 0x165; + arg0->obj.id = OBJECT_357; arg0->obj.pos.x = posX; arg0->obj.pos.y = posY; arg0->obj.pos.z = posZ; arg0->unk_4C = arg5; if (arg4 == 1.6f) { - arg0->unk_54 = (posX - D_8016F110[1].obj.pos.x) * 0.1f; - arg0->unk_5C = (posZ - D_8016F110[1].obj.pos.z) * 0.1f; + arg0->unk_54.x = (posX - gObjects408[1].obj.pos.x) * 0.1f; + arg0->unk_54.z = (posZ - gObjects408[1].obj.pos.z) * 0.1f; } else if (arg4 == 1.3f) { - arg0->unk_54 = ((Rand_ZeroOne() * 0.05f) + 0.03f) * posX; - arg0->unk_5C = ((Rand_ZeroOne() * 0.05f) + 0.03f) * posZ; - arg0->unk_58 = 5.0f; + arg0->unk_54.x = ((Rand_ZeroOne() * 0.05f) + 0.03f) * posX; + arg0->unk_54.z = ((Rand_ZeroOne() * 0.05f) + 0.03f) * posZ; + arg0->unk_54.y = 5.0f; } else if (arg4 == 1.55f) { - arg0->unk_54 = (Rand_ZeroOne() - 0.5f) * 10.0f; - arg0->unk_5C = (Rand_ZeroOne() - 0.5f) * 10.0f; - } else if ((D_80178234 == 0x11) && ((arg4 == 5.11f) || (arg4 == 7.22f))) { - sp3C.x = D_80178280->unk_074; - sp3C.y = D_80178280->unk_078; - sp3C.z = D_80178280->unk_07C; + arg0->unk_54.x = (Rand_ZeroOne() - 0.5f) * 10.0f; + arg0->unk_54.z = (Rand_ZeroOne() - 0.5f) * 10.0f; + } else if ((gCurrentLevel == LEVEL_BOLSE) && ((arg4 == 5.11f) || (arg4 == 7.22f))) { + sp3C.x = gPlayer[0].unk_074; + sp3C.y = gPlayer[0].unk_078; + sp3C.z = gPlayer[0].unk_07C; yAng = Math_Atan2F(sp3C.x - posX, sp3C.z - posZ); sp38 = sqrtf(SQ(sp3C.x - posX) + SQ(sp3C.z - posZ)); xAng = -Math_Atan2F(sp3C.y - posY, sp38); @@ -513,13 +513,13 @@ void func_8007905C(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, u8 a sp54.y = (Rand_ZeroOne() - 0.5f) * 50.0f; sp54.z = (Rand_ZeroOne() * 10.0f) + 150.0f; Matrix_MultVec3f(gCalcMatrix, &sp54, &sp48); - arg0->unk_54 = sp48.x; - arg0->unk_58 = sp48.y; - arg0->unk_5C = sp48.z; + arg0->unk_54.x = sp48.x; + arg0->unk_54.y = sp48.y; + arg0->unk_54.z = sp48.z; } else { - arg0->unk_58 = (D_80177C98 == 0) ? (Rand_ZeroOne() * 7.0f) + 7.0f : (Rand_ZeroOne() - 0.5f) * 10.0f; - arg0->unk_54 = (Rand_ZeroOne() - 0.5f) * 10.0f; - arg0->unk_5C = (Rand_ZeroOne() - 0.5f) * 10.0f; + arg0->unk_54.y = (gLevelType == 0) ? (Rand_ZeroOne() * 7.0f) + 7.0f : (Rand_ZeroOne() - 0.5f) * 10.0f; + arg0->unk_54.x = (Rand_ZeroOne() - 0.5f) * 10.0f; + arg0->unk_54.z = (Rand_ZeroOne() - 0.5f) * 10.0f; } arg0->unk_70 = ((Rand_ZeroOne() * 0.8f) + 0.3f) * arg4; arg0->unk_50 = (s32) (Rand_ZeroOne() * 50.0f) + 0x46; @@ -534,8 +534,8 @@ void func_800794CC(f32 posX, f32 posY, f32 posZ, f32 arg3) { s32 i; for (i = 50; i >= 0; i--) { - if (D_80170130[i].obj.status == 0) { - func_8007905C(&D_80170130[i], posX, posY, posZ, arg3, 0); + if (gObjects8C[i].obj.status == 0) { + func_8007905C(&gObjects8C[i], posX, posY, posZ, arg3, 0); break; } } @@ -545,8 +545,8 @@ void func_8007953C(f32 posX, f32 posY, f32 posZ, f32 arg3) { s32 i; for (i = 79; i >= 0; i--) { - if (D_80170130[i].obj.status == 0) { - func_8007905C(&D_80170130[i], posX, posY, posZ, arg3, 0); + if (gObjects8C[i].obj.status == 0) { + func_8007905C(&gObjects8C[i], posX, posY, posZ, arg3, 0); break; } } @@ -556,8 +556,8 @@ void func_800795AC(f32 posX, f32 posY, f32 posZ, f32 arg3) { s32 i; for (i = 0; i < 95; i++) { - if (D_80170130[i].obj.status == 0) { - func_8007905C(&D_80170130[i], posX, posY, posZ, arg3, 0); + if (gObjects8C[i].obj.status == 0) { + func_8007905C(&gObjects8C[i], posX, posY, posZ, arg3, 0); break; } } @@ -567,38 +567,38 @@ void func_80079618(f32 posX, f32 posY, f32 posZ, f32 arg3) { s32 i; for (i = 50; i >= 0; i--) { - if (D_80170130[i].obj.status == 0) { - func_8007905C(&D_80170130[i], posX, posY, posZ, arg3, 1); + if (gObjects8C[i].obj.status == 0) { + func_8007905C(&gObjects8C[i], posX, posY, posZ, arg3, 1); break; } } } void func_8007968C(Object_8C* arg0) { - if ((D_80178234 != 0xB) || (arg0->unk_44 != 7)) { + if ((gCurrentLevel != LEVEL_MACBETH) || (arg0->unk_44 != 7)) { if ((arg0->unk_50 == 0) || (arg0->obj.pos.y < D_80177940)) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } else { - if (!(D_80177DB0 & 3)) { + if (!(gFrameCount & 3)) { func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y + 550.0f, arg0->obj.pos.z, 10.0f); } if ((arg0->unk_50 == 0) || (arg0->obj.pos.y < (D_80177940 - 100.0f))) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } arg0->obj.rot.x += arg0->unk_60.x; arg0->obj.rot.y += arg0->unk_60.y; arg0->obj.rot.z += arg0->unk_60.z; - if (D_80177C98 == 0) { - arg0->unk_58 -= 0.5f; + if (gLevelType == 0) { + arg0->unk_54.y -= 0.5f; } - if ((D_80178234 == 0x11) && (D_80178280->unk_1C8 == 7) && (D_80177A80 >= 0xB0)) { - arg0->unk_54 *= 0.95f; - arg0->unk_58 *= 0.95f; - arg0->unk_5C *= 0.95f; + if ((gCurrentLevel == LEVEL_BOLSE) && (gPlayer[0].unk_1C8 == 7) && (D_80177A80 >= 0xB0)) { + arg0->unk_54.x *= 0.95f; + arg0->unk_54.y *= 0.95f; + arg0->unk_54.z *= 0.95f; } - if ((D_80178234 == 0xB) && (arg0->unk_44 == 0xA)) { + if ((gCurrentLevel == LEVEL_MACBETH) && (arg0->unk_44 == 0xA)) { arg0->obj.rot.x = 0.0f; arg0->obj.rot.y = 0.0f; if (arg0->unk_50 >= 25) { @@ -619,16 +619,16 @@ s32 func_800798C4(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) { void func_800798F0(Object_8C* arg0) { Vec3f frameJointTable[50]; - if ((D_80178234 == 0x11) && (D_80178280->unk_1C8 == 7)) { + if ((gCurrentLevel == LEVEL_BOLSE) && (gPlayer[0].unk_1C8 == 7)) { func_8005F670(&arg0->obj.pos); } RCP_SetupDL(&gMasterDisp, 0x1D); - if (D_80178234 == 0x10) { - gSPFogPosition(gMasterDisp++, D_801783D8, 1005); + if (gCurrentLevel == LEVEL_KATINA) { + gSPFogPosition(gMasterDisp++, gFogNear, 1005); } func_8005980C(arg0->unk_70); - switch (D_80178234) { - case 11: + switch (gCurrentLevel) { + case LEVEL_MACBETH: switch (arg0->unk_44) { case 1: if (arg0->unk_40 & 1) { @@ -711,7 +711,7 @@ void func_800798F0(Object_8C* arg0) { break; } break; - case 13: + case LEVEL_AQUAS: Matrix_SetGfxMtx(&gMasterDisp); RCP_SetupDL(&gMasterDisp, 0x3C); gSPDisplayList(gMasterDisp++, D_600A220); @@ -750,8 +750,8 @@ void func_800798F0(Object_8C* arg0) { break; } RCP_SetupDL(&gMasterDisp, 0x40); - if (D_80178234 == 0x10) { - gSPFogPosition(gMasterDisp++, D_801783D8, D_801783DC); + if (gCurrentLevel == LEVEL_KATINA) { + gSPFogPosition(gMasterDisp++, gFogNear, gFogFar); } } @@ -763,19 +763,19 @@ void func_8007A28C(Object_8C* arg0) { if (arg0->unk_50 >= 0xB) { D_801779A8[0] = 60.0f; } - if (arg0->unk_50 == 0x30) { - D_80178340 = 0x96; + if (arg0->unk_50 == 48) { + D_80178340 = 150; } - if (arg0->unk_50 >= 0x2E) { + if (arg0->unk_50 > 45) { D_80178358 = 0; - D_80178348 = D_80178350 = D_80178354 = 0xFF; + D_80178348 = D_80178350 = D_80178354 = 255; } D_8017835C = 3; if (arg0->unk_50 == 0) { arg0->unk_44 -= 2; if (arg0->unk_44 < 0) { arg0->unk_44 = 0; - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); D_8017812C = 0; } } @@ -795,9 +795,9 @@ void func_8007A3C0(Object_8C* arg0) { } void func_8007A4B8(Object_8C* arg0, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x17F; + arg0->obj.id = OBJECT_383; arg0->unk_6C = arg4; arg0->unk_50 = 50; arg0->unk_44 = 200; @@ -811,9 +811,9 @@ void func_8007A4B8(Object_8C* arg0, f32 xPos, f32 yPos, f32 zPos, f32 arg4) { void func_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 arg3) { s32 i; - for (i = ARRAY_COUNT(D_80170130) - 1; i >= 0; i--) { - if (D_80170130[i].obj.status == 0) { - func_8007A4B8(&D_80170130[i], xPos, yPos, zPos, arg3); + for (i = ARRAY_COUNT(gObjects8C) - 1; i >= 0; i--) { + if (gObjects8C[i].obj.status == 0) { + func_8007A4B8(&gObjects8C[i], xPos, yPos, zPos, arg3); break; } } @@ -821,7 +821,7 @@ void func_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 arg3) { } void func_8007A5F8(Object_8C* arg0, Vec3f* arg1, u32 arg2) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 2; arg0->obj.id = 0x175; arg0->obj.pos.x = arg1->x; @@ -842,9 +842,9 @@ void func_8007A5F8(Object_8C* arg0, Vec3f* arg1, u32 arg2) { void func_8007A6F0(Vec3f* arg0, u32 arg1) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { - func_8007A5F8(&D_80170130[i], arg0, arg1); + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + func_8007A5F8(&gObjects8C[i], arg0, arg1); break; } } @@ -852,11 +852,11 @@ void func_8007A6F0(Vec3f* arg0, u32 arg1) { void func_8007A748(Object_8C* arg0) { if (arg0->unk_50 == 0) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } -s32 func_8007A774(UnkStruct_D_80178280* arg0, Object_8C* arg1, f32 arg2) { +s32 func_8007A774(Player* arg0, Object_8C* arg1, f32 arg2) { if ((fabsf(arg0->unk_138 - arg1->obj.pos.z) < arg2) && (fabsf(arg0->unk_074 - arg1->obj.pos.x) < arg2) && (fabsf(arg0->unk_078 - arg1->obj.pos.y) < arg2) && (arg0->unk_498 == 0)) { func_800A6CD0(arg0, 0, arg1->unk_1C.unk_18); @@ -867,9 +867,9 @@ s32 func_8007A774(UnkStruct_D_80178280* arg0, Object_8C* arg1, f32 arg2) { } void func_8007A818(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, u8 arg5, u8 arg6, u16 arg7) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x167; + arg0->obj.id = OBJECT_359; arg0->obj.pos.x = posX; arg0->obj.pos.y = posY; arg0->obj.pos.z = posZ; @@ -879,7 +879,7 @@ void func_8007A818(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, u8 a arg0->unk_60.z = (Rand_ZeroOne() - 0.5f) * 10.0f; arg0->unk_60.y = arg4 * 0.1f; if (arg7 != 0) { - arg0->unk_54 = (Rand_ZeroOne() - 0.5f) * 30.0f; + arg0->unk_54.x = (Rand_ZeroOne() - 0.5f) * 30.0f; } func_800612B8(&arg0->unk_1C, arg0->obj.id); } @@ -887,10 +887,10 @@ void func_8007A818(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, u8 a void func_8007A900(f32 posX, f32 posY, f32 posZ, f32 arg3, u8 arg4, u8 arg5, u16 arg6) { s32 i; - if (D_80178234 == 0xC) { - for (i = ARRAY_COUNT(D_80170130) - 1; i >= 0; i--) { - if (D_80170130[i].obj.status == 0) { - func_8007A818(&D_80170130[i], posX, posY, posZ, arg3, arg4, arg5, arg6); + if (gCurrentLevel == 0xC) { + for (i = ARRAY_COUNT(gObjects8C) - 1; i >= 0; i--) { + if (gObjects8C[i].obj.status == 0) { + func_8007A818(&gObjects8C[i], posX, posY, posZ, arg3, arg4, arg5, arg6); break; } } @@ -900,7 +900,7 @@ void func_8007A900(f32 posX, f32 posY, f32 posZ, f32 arg3, u8 arg4, u8 arg5, u16 void func_8007A994(Object_8C* arg0) { Math_SmoothStepToF(&arg0->unk_70, arg0->unk_6C, 0.1f, 10.0f, 0.01f); arg0->obj.rot.z += arg0->unk_60.z; - arg0->unk_58 += arg0->unk_60.y; + arg0->unk_54.y += arg0->unk_60.y; if (arg0->unk_4A & 1) { arg0->unk_48++; if (arg0->unk_48 >= 6) { @@ -909,7 +909,7 @@ void func_8007A994(Object_8C* arg0) { } arg0->unk_44 -= arg0->unk_46; if (arg0->unk_44 < 0x15) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } arg0->unk_4A++; } @@ -935,21 +935,21 @@ void func_8007AB50(Object_8C* arg0) { Math_SmoothStepToF(&arg0->unk_70, arg0->unk_6C, 0.1f, 10.0f, 0.0f); arg0->unk_44 -= 20; if (arg0->unk_44 < 0) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } else { Math_SmoothStepToF(&arg0->unk_70, arg0->unk_6C, 0.1f, 10.0f, 0.0f); arg0->unk_44 -= 10; if (arg0->unk_44 < 0) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } } void func_8007AC0C(Object_8C* arg0, f32 posX, f32 unused_posY, f32 posY, f32 arg4, f32 arg5, f32 arg6) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x174; + arg0->obj.id = OBJECT_372; arg0->obj.pos.x = posX; arg0->obj.pos.y = D_80177940; arg0->obj.pos.z = posY; @@ -957,26 +957,26 @@ void func_8007AC0C(Object_8C* arg0, f32 posX, f32 unused_posY, f32 posY, f32 arg arg0->unk_70 = arg4; arg0->unk_6C = arg5; arg0->obj.rot.y = arg6; - arg0->unk_54 = D_80178280->unk_0C0.x * 0.6f; - arg0->unk_5C = D_80178280->unk_0C0.z * 0.6; // Forgotten f means bad codegen + arg0->unk_54.x = gPlayer[0].unk_0C0.x * 0.6f; + arg0->unk_54.z = gPlayer[0].unk_0C0.z * 0.6; // Forgotten f means bad codegen func_800612B8(&arg0->unk_1C, arg0->obj.id); } void func_8007ACE0(f32 posX, f32 posY, f32 posZ, f32 arg3, f32 arg4, f32 arg5) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { - func_8007AC0C(&D_80170130[i], posX, posY, posZ, arg3, arg4, arg5); + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + func_8007AC0C(&gObjects8C[i], posX, posY, posZ, arg3, arg4, arg5); break; } } } void func_8007AD58(Object_8C* arg0, f32 posX, f32 unused_posY, f32 posZ, f32 arg4, f32 arg5, f32 arg6) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x174; + arg0->obj.id = OBJECT_372; arg0->unk_4E = 1; arg0->obj.pos.x = posX; arg0->obj.pos.y = D_80177940; @@ -996,11 +996,11 @@ void func_8007ADF4(f32 arg0, f32 posY, f32 arg2, f32 arg3, f32 arg4) { s32 i; for (var_fs1 = 11.25f, var_s2 = 0; var_s2 < 16; var_s2++, var_fs1 += 22.5f) { - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { temp_fs2 = __sinf(M_DTOR * var_fs1) * arg4 * 20.0f; temp_fs0 = __cosf(M_DTOR * var_fs1) * arg4 * 20.0f; - func_8007AD58(&D_80170130[i], arg0 + temp_fs2, posY, arg2 + temp_fs0, arg3, arg4, var_fs1); + func_8007AD58(&gObjects8C[i], arg0 + temp_fs2, posY, arg2 + temp_fs0, arg3, arg4, var_fs1); break; } } @@ -1008,14 +1008,14 @@ void func_8007ADF4(f32 arg0, f32 posY, f32 arg2, f32 arg3, f32 arg4) { } void func_8007AF30(Object_8C* arg0, f32 posX, f32 posZ, f32 arg3, f32 arg4, f32 arg5) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x17E; + arg0->obj.id = OBJECT_382; arg0->obj.pos.x = posX; arg0->obj.pos.y = -10.0f; arg0->obj.pos.z = posZ; - arg0->unk_54 = arg3; - arg0->unk_5C = arg4 - D_80177D08; + arg0->unk_54.x = arg3; + arg0->unk_54.z = arg4 - D_80177D08; arg0->unk_6C = arg5; arg0->unk_50 = 0x64; func_800612B8(&arg0->unk_1C, arg0->obj.id); @@ -1024,9 +1024,9 @@ void func_8007AF30(Object_8C* arg0, f32 posX, f32 posZ, f32 arg3, f32 arg4, f32 void func_8007AFD0(f32 posX, f32 posZ, f32 arg2, f32 arg3, f32 arg4) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { - func_8007AF30(&D_80170130[i], posX, posZ, arg2, arg3, arg4); + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + func_8007AF30(&gObjects8C[i], posX, posZ, arg2, arg3, arg4); break; } } @@ -1042,7 +1042,7 @@ void func_8007B040(Object_8C* arg0) { D_801782EC[sp28 - 1] = arg0->unk_6C * 0.7f; } if (arg0->unk_50 == 0) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } @@ -1051,14 +1051,14 @@ void func_8007B0F4(Object_8C* arg0) { arg0->unk_44 -= 13; arg0->obj.rot.y = 180.0f - arg0->obj.rot.y; if (arg0->unk_44 < 0) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } void func_8007B180(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x17D; + arg0->obj.id = OBJECT_381; arg0->obj.pos.x = posX; arg0->obj.pos.y = posY; arg0->obj.pos.z = posZ; @@ -1071,18 +1071,18 @@ void func_8007B180(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) { void func_8007B228(f32 posX, f32 posY, f32 posZ, f32 arg3) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80170130) && D_80178234 == 8; i++) { - if (D_80170130[i].obj.status == 0) { - func_8007B180(&D_80170130[i], posX, posY, posZ, arg3); + for (i = 0; i < ARRAY_COUNT(gObjects8C) && gCurrentLevel == 8; i++) { + if (gObjects8C[i].obj.status == 0) { + func_8007B180(&gObjects8C[i], posX, posY, posZ, arg3); break; } } } void func_8007B2BC(Object_8C* arg0, f32 xPos, f32 yPos, f32 zPos, f32 arg4, s32 arg5) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x180; + arg0->obj.id = OBJECT_384; arg0->obj.pos.x = xPos; arg0->obj.pos.y = yPos; arg0->obj.pos.z = zPos; @@ -1095,9 +1095,9 @@ void func_8007B2BC(Object_8C* arg0, f32 xPos, f32 yPos, f32 zPos, f32 arg4, s32 void func_8007B344(f32 xPos, f32 yPos, f32 zPos, f32 arg3, s32 arg4) { s32 i; - for (i = ARRAY_COUNT(D_80170130) - 1; i >= 0; i--) { - if (D_80170130[i].obj.status == 0) { - func_8007B2BC(&D_80170130[i], xPos, yPos, zPos, arg3, arg4); + for (i = ARRAY_COUNT(gObjects8C) - 1; i >= 0; i--) { + if (gObjects8C[i].obj.status == 0) { + func_8007B2BC(&gObjects8C[i], xPos, yPos, zPos, arg3, arg4); break; } } @@ -1112,7 +1112,7 @@ void func_8007B3B8(Object_8C* arg0) { var_fv0 = 15.0f; var_fv1 = 0.05f; var_v0 = 4; - } else if ((arg0->unk_4C == 5) && ((D_80178234 == 0x10) || (D_80178234 == 1))) { + } else if ((arg0->unk_4C == 5) && ((gCurrentLevel == 0x10) || (gCurrentLevel == 1))) { var_fv0 = 10.0f; var_fv1 = 0.1f; var_v0 = 4; @@ -1124,14 +1124,14 @@ void func_8007B3B8(Object_8C* arg0) { Math_SmoothStepToF(&arg0->unk_70, arg0->unk_6C, var_fv1, var_fv0, 0.0f); arg0->unk_44 -= var_v0; if (arg0->unk_44 < 0) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } void func_8007B494(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, s32 arg5) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x181; + arg0->obj.id = OBJECT_385; arg0->obj.pos.x = posX; arg0->obj.pos.y = posY; arg0->obj.pos.z = posZ; @@ -1151,9 +1151,9 @@ void func_8007B494(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, s32 void func_8007B550(f32 posX, f32 posY, f32 posZ, f32 arg3, s32 arg4) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - if (D_80170130[i].obj.status == 0) { - func_8007B494(&D_80170130[i], posX, posY, posZ, arg3, arg4); + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + if (gObjects8C[i].obj.status == 0) { + func_8007B494(&gObjects8C[i], posX, posY, posZ, arg3, arg4); break; } } @@ -1163,7 +1163,7 @@ void func_8007B5C0(Object_8C* arg0) { Math_SmoothStepToF(&arg0->unk_70, arg0->unk_6C, 0.1f, 10.0f, 0.1f); arg0->unk_44 -= arg0->unk_46; if (arg0->unk_44 < 0) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } @@ -1171,12 +1171,12 @@ void func_8007B62C(Object_8C* arg0) { if (arg0->unk_50 == 0) { arg0->unk_46 -= 4; if (arg0->unk_46 <= 0) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } } -void func_8007B670(void* arg0) { +void func_8007B670(Object_8C* arg0) { } void func_8007B67C(Object_8C* arg0) { @@ -1189,7 +1189,7 @@ void func_8007B67C(Object_8C* arg0) { if (arg0->unk_46 >= 9) { arg0->unk_48++; if (arg0->unk_48 >= 10) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } } var_v1 = arg0->unk_4A; @@ -1197,9 +1197,9 @@ void func_8007B67C(Object_8C* arg0) { if (var_v1 > 10) { var_v1 -= 10; } - arg0->unk_54 = D_80178280[var_v1 - 1].unk_0C0.x; - arg0->unk_58 = D_80178280[var_v1 - 1].unk_0C0.y; - arg0->unk_5C = D_80178280[var_v1 - 1].unk_0C0.z; + arg0->unk_54.x = gPlayer[var_v1 - 1].unk_0C0.x; + arg0->unk_54.y = gPlayer[var_v1 - 1].unk_0C0.y; + arg0->unk_54.z = gPlayer[var_v1 - 1].unk_0C0.z; } } @@ -1207,20 +1207,20 @@ void func_8007B758(Object_8C* arg0) { Math_SmoothStepToF(&arg0->unk_70, arg0->unk_6C, 0.1f, 10.0f, 0.1f); arg0->unk_44 -= 2; if (arg0->unk_44 < 0) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } - func_8007A774(D_80178280, arg0, arg0->unk_70 * 20.0f); + func_8007A774(gPlayer, arg0, arg0->unk_70 * 20.0f); } void func_8007B7E8(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) { - func_80061474(arg0); + Object_8C_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0x16C; + arg0->obj.id = OBJECT_364; arg0->obj.pos.x = posX; arg0->obj.pos.y = posY; arg0->obj.pos.z = posZ; - arg0->unk_54 = (Rand_ZeroOne() - 0.5f) * 5.0f; - arg0->unk_58 = (Rand_ZeroOne() - 0.5f) * 3.0f; + arg0->unk_54.x = (Rand_ZeroOne() - 0.5f) * 5.0f; + arg0->unk_54.y = (Rand_ZeroOne() - 0.5f) * 3.0f; arg0->unk_48 = 3; if (Rand_ZeroOne() < 0.5f) { arg0->unk_48 = -arg0->unk_48; @@ -1235,9 +1235,9 @@ void func_8007B7E8(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) { void func_8007B8F8(f32 posX, f32 posY, f32 posZ, f32 arg3) { s32 i, j; - for (i = ARRAY_COUNT(D_80170130) - 1, j = 0; j < ARRAY_COUNT(D_80170130); i--, j++) { - if (D_80170130[i].obj.status == 0) { - func_8007B7E8(&D_80170130[i], posX, posY, posZ, arg3); + for (i = ARRAY_COUNT(gObjects8C) - 1, j = 0; j < ARRAY_COUNT(gObjects8C); i--, j++) { + if (gObjects8C[i].obj.status == 0) { + func_8007B7E8(&gObjects8C[i], posX, posY, posZ, arg3); break; } } @@ -1247,10 +1247,10 @@ void func_8007B960(Object_8C* arg0) { arg0->unk_70 += 0.07f; arg0->unk_4A -= arg0->unk_46; if (arg0->unk_4A < 0) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } arg0->obj.rot.z += arg0->unk_48; - arg0->unk_58 += 0.2f; + arg0->unk_54.y += 0.2f; } #pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_77E40/func_8007B9DC.s") @@ -1444,7 +1444,7 @@ void func_8007B960(Object_8C* arg0) { void func_80084194(Object_8C* arg0) { s32 tmp; - if (D_80178234 != 0xD) { + if (gCurrentLevel != LEVEL_AQUAS) { RCP_SetupDL(&gMasterDisp, 0x31); Matrix_Scale(gGfxMatrix, arg0->unk_70, arg0->unk_70, arg0->unk_70, 1); Matrix_SetGfxMtx(&gMasterDisp); diff --git a/src/main/sf_A4B50.c b/src/main/sf_A4B50.c index aee47384..b8b393dc 100644 --- a/src/main/sf_A4B50.c +++ b/src/main/sf_A4B50.c @@ -3,15 +3,15 @@ extern f32 D_800D2F64; extern Vec3f D_800D2F80; extern Vec3f D_800D2F8C; -extern UnkStruct_D_80161A68* D_800D2F98[21]; +extern EnvSettings* D_800D2F98[21]; extern f32 D_800D2FEC[5]; extern s32 D_800D3000[4][4]; extern Vec3f D_800D3040[6]; extern Vec3f D_800D3088[4]; extern Vec3f D_800D30B8[4]; -s32 func_800A3F50(u16 arg0) { - if ((D_801778B0[2] > 0) && (D_801778B0[3] > 0) && (D_801778B0[1] > 0) && (D_80161A98 >= arg0)) { +s32 Play_CheckMedalStatus(u16 arg0) { + if ((D_801778B0[2] > 0) && (D_801778B0[3] > 0) && (D_801778B0[1] > 0) && (gHitCount >= arg0)) { return true; } return false; @@ -21,8 +21,8 @@ void func_800A3FB0(void) { D_800D2F64 = 0.0f; } -s32 func_800A3FC4(void) { - if (D_80161A90[0] >= 3) { +s32 Play_GetMaxHealth(void) { + if (gGoldRingCount[0] >= 3) { return 0x17F; } return 0xFF; @@ -47,9 +47,9 @@ void func_800A3FEC(void) { f32 sp84; D_801782FC++; - switch (D_80178234) { - case 7: - spB4 = (D_80177DB0 & 1) ? SEGMENTED_TO_VIRTUAL(D_6001C50) : SEGMENTED_TO_VIRTUAL(D_6004500); + switch (gCurrentLevel) { + case LEVEL_SOLAR: + spB4 = (gFrameCount & 1) ? SEGMENTED_TO_VIRTUAL(D_6001C50) : SEGMENTED_TO_VIRTUAL(D_6004500); spB0 = SEGMENTED_TO_VIRTUAL(D_6022760); spA8 = 15; sp90 = 70.0f; @@ -57,8 +57,8 @@ void func_800A3FEC(void) { sp88 = 2.2f; sp84 = 0.5f; break; - case 8: - spB4 = (D_80177DB0 & 1) ? SEGMENTED_TO_VIRTUAL(D_6009ED0) : SEGMENTED_TO_VIRTUAL(D_600C780); + case LEVEL_ZONESS: + spB4 = (gFrameCount & 1) ? SEGMENTED_TO_VIRTUAL(D_6009ED0) : SEGMENTED_TO_VIRTUAL(D_600C780); spB0 = SEGMENTED_TO_VIRTUAL(D_602AC50); spA8 = 7; sp90 = 40.0f; @@ -124,8 +124,8 @@ void func_800A3FEC(void); #pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A3FEC.s") #endif -void func_800A4460(UnkStruct_D_80178280* arg0) { - if ((D_80178234 == 9) && (D_8016F110[0].obj.status == 2) && (D_8016F110[0].unk_04E == 0x11)) { +void func_800A4460(Player* arg0) { + if ((gCurrentLevel == LEVEL_VENOM_2) && (gObjects408[0].obj.status == 2) && (gObjects408[0].unk_04E == 0x11)) { arg0->unk_060 = __sinf(arg0->unk_0F4 * 0.7f * M_DTOR) * 0.5f; arg0->unk_088 += 13.0f; arg0->unk_0F4 += 20.0f; @@ -136,9 +136,9 @@ void func_800A4460(UnkStruct_D_80178280* arg0) { arg0->unk_060 = __sinf(arg0->unk_0F4 * 0.7f * M_DTOR) * 0.5f; arg0->unk_088 += 10.0f; arg0->unk_0F4 += 8.0f; - if ((D_80177C98 == 0) || ((arg0->unk_238 == 1) && (D_80177880 == 0))) { + if ((gLevelType == 0) || ((arg0->unk_238 == 1) && (D_80177880 == 0))) { arg0->unk_080 = -__sinf(arg0->unk_088 * M_DTOR) * 0.5f; - if ((arg0->unk_49C.unk_00 < 2) || (arg0->unk_49C.unk_01 < 2)) { + if ((arg0->wings.rightState <= 1) || (arg0->wings.leftState <= 1)) { arg0->unk_0F0 = __sinf(arg0->unk_0F4 * M_DTOR) * 5.0f; } else { arg0->unk_0F0 = __sinf(arg0->unk_0F4 * M_DTOR) * 1.5f; @@ -147,28 +147,28 @@ void func_800A4460(UnkStruct_D_80178280* arg0) { } } -void func_800A46A0(UnkStruct_D_80178280* arg0) { +void func_800A46A0(Player* arg0) { s32 var_v1; f32 sp40; if ((arg0->unk_238 == 0) || (D_80177880 == 1)) { - if (arg0->unk_49C.unk_00 < 2) { - if (!(D_80177DB0 & 1) && (D_80177D70[arg0->unk_1C4] != 0)) { + if (arg0->wings.rightState <= 1) { + if (!(gFrameCount & 1) && (D_80177D70[arg0->unk_1C4] != 0)) { func_8007D10C(((Rand_ZeroOne() - 0.5f) * 10.0f) + arg0->unk_2D4.x, (Rand_ZeroOne() * 5.0f) + arg0->unk_2D4.y, arg0->unk_2D4.z, 1.0f); } - if (!(D_80177DB0 & 1) && (Rand_ZeroOne() < 0.5f) && (D_801778E8 == 0)) { + if (!(gFrameCount & 1) && (Rand_ZeroOne() < 0.5f) && (D_801778E8 == 0)) { func_8007C484(((Rand_ZeroOne() - 0.5f) * 5.0f) + arg0->unk_2D4.x, (Rand_ZeroOne() * 5.0f) + arg0->unk_2D4.y, arg0->unk_2D4.z, arg0->unk_0C0.x, arg0->unk_0C0.y, arg0->unk_0C0.z, (Rand_ZeroOne() * 0.02f) + 0.02f, arg0->unk_1C4 + 1); } } - if (arg0->unk_49C.unk_01 < 2) { - if (!(D_80177DB0 & 1) && (D_80177D88[arg0->unk_1C4] != 0)) { + if (arg0->wings.leftState <= 1) { + if (!(gFrameCount & 1) && (D_80177D88[arg0->unk_1C4] != 0)) { func_8007D10C(((Rand_ZeroOne() - 0.5f) * 10.0f) + arg0->unk_2C8.x, (Rand_ZeroOne() * 5.0f) + arg0->unk_2C8.y, arg0->unk_2C8.z, 1.0f); } - if (!(D_80177DB0 & 1) && (Rand_ZeroOne() < 0.5f) && (D_801778E8 == 0)) { + if (!(gFrameCount & 1) && (Rand_ZeroOne() < 0.5f) && (D_801778E8 == 0)) { func_8007C484(((Rand_ZeroOne() - 0.5f) * 5.0f) + arg0->unk_2C8.x, (Rand_ZeroOne() * 5.0f) + arg0->unk_2C8.y, arg0->unk_2C8.z, arg0->unk_0C0.x, arg0->unk_0C0.y, arg0->unk_0C0.z, (Rand_ZeroOne() * 0.02f) + 0.02f, arg0->unk_1C4 + 1); @@ -176,14 +176,14 @@ void func_800A46A0(UnkStruct_D_80178280* arg0) { } } var_v1 = 7; - if (arg0->unk_264 < 0x40) { - if (arg0->unk_264 >= 0x11) { + if (arg0->health < 0x40) { + if (arg0->health > 0x10) { var_v1 = 0xF; } - if (arg0->unk_264 >= 0x21) { + if (arg0->health > 0x20) { var_v1 = 0x1F; } - if (arg0->unk_264 >= 0x31) { + if (arg0->health > 0x30) { var_v1 = 0x3F; } if ((arg0->unk_238 == 0) || (D_80177880 == 1)) { @@ -191,12 +191,12 @@ void func_800A46A0(UnkStruct_D_80178280* arg0) { if (arg0->unk_1CC == 1) { sp40 = 30.0f; } - if (!(D_80177DB0 & var_v1)) { + if (!(gFrameCount & var_v1)) { func_8007D10C(((Rand_ZeroOne() - 0.5f) * 10.0f) + arg0->unk_074, (Rand_ZeroOne() * 10.0f) + (arg0->unk_078 + sp40), ((Rand_ZeroOne() - 0.5f) * 10.0f) + arg0->unk_138, 2.2f); } - if (!((var_v1 >> 2) & D_80177DB0) && (Rand_ZeroOne() < 0.5f)) { + if (!((var_v1 >> 2) & gFrameCount) && (Rand_ZeroOne() < 0.5f)) { func_8007C484(((Rand_ZeroOne() - 0.5f) * 30.0f) + arg0->unk_074, (Rand_ZeroOne() * 10.0f) + (arg0->unk_078 + sp40), ((Rand_ZeroOne() - 0.5f) * 30.0f) + arg0->unk_138, arg0->unk_0C0.x, arg0->unk_0C0.y, @@ -205,13 +205,13 @@ void func_800A46A0(UnkStruct_D_80178280* arg0) { arg0->unk_224 = 2; } } - } else if (!((var_v1 >> 2) & D_80177DB0) && (Rand_ZeroOne() < 0.5f) && (arg0->unk_224 == 0)) { + } else if (!((var_v1 >> 2) & gFrameCount) && (Rand_ZeroOne() < 0.5f) && (arg0->unk_224 == 0)) { arg0->unk_224 = 2; } } } -void func_800A4C40(UnkStruct_D_80178280* arg0) { +void func_800A4C40(Player* arg0) { Vec3f sp54 = D_800D2F80; Vec3f sp48 = D_800D2F8C; Vec3f sp3C; @@ -225,22 +225,22 @@ void func_800A4C40(UnkStruct_D_80178280* arg0) { Matrix_MultVec3f(gCalcMatrix, &sp54, &sp3C); Matrix_MultVec3f(gCalcMatrix, &sp48, &sp30); if (arg0->unk_078 < (D_80177940 + 100.0f)) { - if ((sp3C.y < D_80177940 + 80.0f) && !(D_80177DB0 & 1)) { + if ((sp3C.y < D_80177940 + 80.0f) && !(gFrameCount & 1)) { if (D_80161A64) {} func_8007ACE0(sp3C.x, D_80177940, sp3C.z, 0.1f, 2.0f, arg0->unk_0E8 + arg0->unk_114 + 20.0f); } - if ((sp30.y < D_80177940 + 80.0f) && !(D_80177DB0 & 1)) { + if ((sp30.y < D_80177940 + 80.0f) && !(gFrameCount & 1)) { func_8007ACE0(sp30.x, D_80177940, sp30.z, 0.1f, 2.0f, (arg0->unk_0E8 + arg0->unk_114) - 20.0f); } } if ((sp30.y < D_80177940 + 80.0f) || (sp3C.y < D_80177940 + 80.0f)) { if (D_80161A64 == 0) { D_80161A64 = 1; - func_80019218(0x1100000B, arg0->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_80019218(0x1100000B, &arg0->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } } else { D_80161A64 = 0; - func_8001A55C(&arg0->unk_460[0].x, 0x1100000B); + func_8001A55C(&arg0->unk_460, 0x1100000B); } } } @@ -279,31 +279,31 @@ void func_800A4F7C(void) { break; } for (i = 0, j = 0; i < 199; j++) { - if (D_80178310[j].unk_10 < 0) { + if (D_80178310[j].id <= OBJECT_INVALID) { break; } - if (D_80178310[j].unk_10 == 0x93) { + if (D_80178310[j].id == OBJECT_147) { func_800A4F4C(&D_801782A8[i]); D_801782A8[i].obj.status = 2; - D_801782A8[i].obj.id = D_80178310[j].unk_10; - D_801782A8[i].obj.pos.x = D_80178310[j].unk_6; - D_801782A8[i].obj.pos.z = D_80178310[j].unk_0; - D_801782A8[i].obj.pos.y = D_80178310[j].unk_8; + D_801782A8[i].obj.id = D_80178310[j].id; + D_801782A8[i].obj.pos.x = D_80178310[j].xPos; + D_801782A8[i].obj.pos.z = D_80178310[j].zPos1; + D_801782A8[i].obj.pos.y = D_80178310[j].yPos; func_800612B8(&D_801782A8[i].unk_1C, D_801782A8[i].obj.id); i++; } } for (i = 5, j = 0; i < 199; j++) { - if (D_80178310[j].unk_10 < 0) { + if (D_80178310[j].id <= OBJECT_INVALID) { break; } - if (D_80178310[j].unk_10 != 0x93) { + if (D_80178310[j].id != OBJECT_147) { func_800A4F4C(&D_801782A8[i]); D_801782A8[i].obj.status = 2; - D_801782A8[i].obj.id = D_80178310[j].unk_10; - D_801782A8[i].obj.pos.x = D_80178310[j].unk_6; - D_801782A8[i].obj.pos.z = D_80178310[j].unk_0; - D_801782A8[i].obj.pos.y = D_80178310[j].unk_8; + D_801782A8[i].obj.id = D_80178310[j].id; + D_801782A8[i].obj.pos.x = D_80178310[j].xPos; + D_801782A8[i].obj.pos.z = D_80178310[j].zPos1; + D_801782A8[i].obj.pos.y = D_80178310[j].yPos; D_801782A8[i].obj.rot.y = D_80178310[j].unk_C; func_800612B8(&D_801782A8[i].unk_1C, D_801782A8[i].obj.id); i++; @@ -323,48 +323,48 @@ void func_800A5338(void) { D_80178310 = SEGMENTED_TO_VIRTUAL(D_603B074); for (j = 0, var_s0 = D_801782A8; j < 200; j++) { - if (D_80178310[j].unk_10 < 0) { + if (D_80178310[j].id <= OBJECT_INVALID) { break; } - if (D_80178310[j].unk_10 < 0xA1) { + if (D_80178310[j].id < OBJECT_161) { func_800A4F4C(var_s0); var_s0->obj.status = 2; - var_s0->obj.id = D_80178310[j].unk_10; - var_s0->obj.pos.x = D_80178310[j].unk_6; - var_s0->obj.pos.z = D_80178310[j].unk_0; - var_s0->obj.pos.y = D_80178310[j].unk_8; + var_s0->obj.id = D_80178310[j].id; + var_s0->obj.pos.x = D_80178310[j].xPos; + var_s0->obj.pos.z = D_80178310[j].zPos1; + var_s0->obj.pos.y = D_80178310[j].yPos; var_s0->obj.rot.y = D_80178310[j].unk_C; func_800612B8(&var_s0->unk_1C, var_s0->obj.id); - if (var_s0->obj.id == 1) { + if (var_s0->obj.id == OBJECT_1) { var_s0->unk_1C.dList = D_6020760; } var_s0++; } } - for (j = 0, var_s0_2 = D_80163400; j < ARRAY_COUNT(D_80163400); j++) { - if (D_80178310[j].unk_10 < 0) { + for (j = 0, var_s0_2 = gObjects4C; j < ARRAY_COUNT(gObjects4C); j++) { + if (D_80178310[j].id <= OBJECT_INVALID) { break; } - if (D_80178310[j].unk_10 == 0xA2) { - func_80061394(var_s0_2); + if (D_80178310[j].id == OBJECT_162) { + Object_4C_Initialize(var_s0_2); var_s0_2->obj.status = 1; - var_s0_2->obj.id = D_80178310[j].unk_10; - var_s0_2->obj.pos.x = D_80178310[j].unk_6; - var_s0_2->obj.pos.z = D_80178310[j].unk_0; - var_s0_2->obj.pos.y = D_80178310[j].unk_8; + var_s0_2->obj.id = D_80178310[j].id; + var_s0_2->obj.pos.x = D_80178310[j].xPos; + var_s0_2->obj.pos.z = D_80178310[j].zPos1; + var_s0_2->obj.pos.y = D_80178310[j].yPos; func_800612B8(&var_s0_2->unk_1C, var_s0_2->obj.id); var_s0_2++; } } i = 0; // fake? - func_80061404(&D_8016F110[i]); - D_8016F110[i].obj.status = 1; - D_8016F110[i].obj.pos.x = 0.0f; - D_8016F110[i].obj.pos.y = 0.0f; - D_8016F110[i].obj.pos.z = 0.0f; - D_8016F110[i].obj.id = 0x124; - func_800612B8(&D_8016F110[i].unk_01C, D_8016F110[i].obj.id); + Object_408_Initialize(&gObjects408[i]); + gObjects408[i].obj.status = 1; + gObjects408[i].obj.pos.x = 0.0f; + gObjects408[i].obj.pos.y = 0.0f; + gObjects408[i].obj.pos.z = 0.0f; + gObjects408[i].obj.id = OBJECT_292; + func_800612B8(&gObjects408[i].unk_01C, gObjects408[i].obj.id); } void func_800A55B0(void) { @@ -375,57 +375,57 @@ void func_800A55B0(void) { D_80178310 = SEGMENTED_TO_VIRTUAL(D_6030B14); for (j = 0, var_s0 = D_801782A8; j < 200; j++) { - if (D_80178310[j].unk_10 < 0) { + if (D_80178310[j].id <= OBJECT_INVALID) { break; } - if (D_80178310[j].unk_10 < 0xA1) { + if (D_80178310[j].id < OBJECT_161) { func_800A4F4C(var_s0); var_s0->obj.status = 2; - var_s0->obj.id = D_80178310[j].unk_10; - var_s0->obj.pos.x = D_80178310[j].unk_6; - var_s0->obj.pos.z = D_80178310[j].unk_0; - var_s0->obj.pos.y = D_80178310[j].unk_8; + var_s0->obj.id = D_80178310[j].id; + var_s0->obj.pos.x = D_80178310[j].xPos; + var_s0->obj.pos.z = D_80178310[j].zPos1; + var_s0->obj.pos.y = D_80178310[j].yPos; var_s0->obj.rot.y = D_80178310[j].unk_C; func_800612B8(&var_s0->unk_1C, var_s0->obj.id); var_s0++; } } i = 0; // fake? - func_80061404(&D_8016F110[i]); - D_8016F110[i].obj.status = 1; - D_8016F110[i].obj.pos.x = 0.0f; - D_8016F110[i].obj.pos.y = 0.0f; - D_8016F110[i].obj.pos.z = 0.0f; - D_8016F110[i].obj.id = 0x13A; - func_800612B8(&D_8016F110[i].unk_01C, D_8016F110[i].obj.id); + Object_408_Initialize(&gObjects408[i]); + gObjects408[i].obj.status = 1; + gObjects408[i].obj.pos.x = 0.0f; + gObjects408[i].obj.pos.y = 0.0f; + gObjects408[i].obj.pos.z = 0.0f; + gObjects408[i].obj.id = OBJECT_314; + func_800612B8(&gObjects408[i].unk_01C, gObjects408[i].obj.id); i = 1; - func_80061404(&D_8016F110[i]); - D_8016F110[i].obj.status = 1; - D_8016F110[i].obj.pos.x = 0.0f; - D_8016F110[i].obj.pos.y = 0.0f; - D_8016F110[i].obj.pos.z = 0.0f; - D_8016F110[i].obj.id = 0x13A; - func_800612B8(&D_8016F110[i].unk_01C, D_8016F110[i].obj.id); + Object_408_Initialize(&gObjects408[i]); + gObjects408[i].obj.status = 1; + gObjects408[i].obj.pos.x = 0.0f; + gObjects408[i].obj.pos.y = 0.0f; + gObjects408[i].obj.pos.z = 0.0f; + gObjects408[i].obj.id = OBJECT_314; + func_800612B8(&gObjects408[i].unk_01C, gObjects408[i].obj.id); i = 2; - func_80061404(&D_8016F110[i]); - D_8016F110[i].obj.status = 1; - D_8016F110[i].obj.pos.x = 0.0f; - D_8016F110[i].obj.pos.y = 0.0f; - D_8016F110[i].obj.pos.z = 0.0f; - D_8016F110[i].obj.id = 0x13A; - func_800612B8(&D_8016F110[i].unk_01C, D_8016F110[i].obj.id); + Object_408_Initialize(&gObjects408[i]); + gObjects408[i].obj.status = 1; + gObjects408[i].obj.pos.x = 0.0f; + gObjects408[i].obj.pos.y = 0.0f; + gObjects408[i].obj.pos.z = 0.0f; + gObjects408[i].obj.id = OBJECT_314; + func_800612B8(&gObjects408[i].unk_01C, gObjects408[i].obj.id); } void func_800A57E0(void) { s32 i = 0; // fake? - func_80061404(&D_8016F110[i]); - D_8016F110[i].obj.status = 1; - D_8016F110[i].obj.pos.x = 0.0f; - D_8016F110[i].obj.pos.y = 0.0f; - D_8016F110[i].obj.pos.z = 0.0f; - D_8016F110[i].obj.id = 0x141; - func_800612B8(&D_8016F110[i].unk_01C, D_8016F110[i].obj.id); + Object_408_Initialize(&gObjects408[i]); + gObjects408[i].obj.status = 1; + gObjects408[i].obj.pos.x = 0.0f; + gObjects408[i].obj.pos.y = 0.0f; + gObjects408[i].obj.pos.z = 0.0f; + gObjects408[i].obj.id = OBJECT_321; + func_800612B8(&gObjects408[i].unk_01C, gObjects408[i].obj.id); } void func_800A5844(void) { @@ -435,12 +435,12 @@ void func_800A5844(void) { D_8017827C = 0; D_80161684 = 0; D_80161A50 = 0; - D_80177820 = 0; + gOverlayStage = 0; D_8015F924 = D_80177CA0 = 0; D_80177CB0 = 0.0f; D_80161A9C = D_80177A80 = D_80177838 = D_80177840 = D_8017829C = 0; D_8017782C = 1; - if (((D_80178234 != 0x13) || (D_80161A2E != 2)) && (D_80178234 != 9)) { + if (((gCurrentLevel != LEVEL_VENOM_SW) || (D_80161A2E != 2)) && (gCurrentLevel != LEVEL_VENOM_2)) { for (i = 1; i < 4; i++) { if (D_801778D0[i] < 0) { if (D_801778D0[i] == -1) { @@ -457,45 +457,45 @@ void func_800A594C(void) { if (D_801778E8 != 0) { switch (D_8017789C) { case 0: - D_80161A68 = SEGMENTED_TO_VIRTUAL(D_302DD70); + sEnvSettings = SEGMENTED_TO_VIRTUAL(D_302DD70); break; case 1: - D_80161A68 = SEGMENTED_TO_VIRTUAL(D_302DDB4); + sEnvSettings = SEGMENTED_TO_VIRTUAL(D_302DDB4); break; case 2: - D_80161A68 = SEGMENTED_TO_VIRTUAL(D_302DDF8); + sEnvSettings = SEGMENTED_TO_VIRTUAL(D_302DDF8); break; } } else { - D_80161A68 = SEGMENTED_TO_VIRTUAL(D_800D2F98[D_80178234]); + sEnvSettings = SEGMENTED_TO_VIRTUAL(D_800D2F98[gCurrentLevel]); } if (D_8017782C == 0) { - if (D_80178234 == 7) { + if (gCurrentLevel == LEVEL_SOLAR) { func_8001D1C8(0xFF, 1); - func_80019218(0x4100C023U, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_8001A55C(&D_80178280->unk_460[0].x, 0x3140807E); + func_80019218(0x4100C023, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_8001A55C(&gPlayer[0].unk_460, 0x3140807E); } - } else if (D_80178234 == 0xD) { - D_80161A68 = SEGMENTED_TO_VIRTUAL(D_602E584); + } else if (gCurrentLevel == LEVEL_AQUAS) { + sEnvSettings = SEGMENTED_TO_VIRTUAL(D_602E584); } - D_80177C90 = D_80161A68->unk_0A; - D_80177C98 = D_80161A68->unk_00; - D_801784AC = D_80161A68->unk_04; - D_80161A36 = D_80161A68->unk_08; - D_80178320 = D_80161A68->unk_0C; - D_80178328 = D_80161A68->unk_10; - D_80178330 = D_80161A68->unk_14; - D_801783D8 = D_80161A68->unk_18; - D_801783DC = D_80161A68->unk_1C; - D_80178548 = D_80178564 = D_80161A70 = D_80161A68->unk_2C; - D_8017854C = D_80178568 = D_80161A74 = D_80161A68->unk_30; - D_80178550 = D_8017856C = D_80161A78 = D_80161A68->unk_34; - D_80178554 = D_80161A68->unk_38; - D_80178558 = D_80161A68->unk_3C; - D_8017855C = D_80161A68->unk_40; - D_801784D0 = D_801784F8 = D_80178520 = D_801784B8 = D_801784C4 = D_80161A68->unk_20; - D_801784D4 = D_801784FC = D_80178524 = D_801784BC = D_801784C8 = D_80161A68->unk_24; - D_801784D8 = D_80178500 = D_80178528 = D_801784C0 = D_801784CC = D_80161A68->unk_28; + D_80177C90 = sEnvSettings->unk_0A; + gLevelType = sEnvSettings->type; + D_801784AC = sEnvSettings->unk_04; + gBgColor = sEnvSettings->bgColor; + gFogRed = sEnvSettings->fogR; + gFogGreen = sEnvSettings->fogG; + gFogBlue = sEnvSettings->fogB; + gFogNear = sEnvSettings->fogN; + gFogFar = sEnvSettings->fogF; + gLight1R = gLight2R = D_80161A70 = sEnvSettings->lightR; + gLight1G = gLight2G = D_80161A74 = sEnvSettings->lightG; + gLight1B = gLight2B = D_80161A78 = sEnvSettings->lightB; + gAmbientR = sEnvSettings->ambR; + gAmbientG = sEnvSettings->ambG; + gAmbientB = sEnvSettings->ambB; + D_801784D0 = D_801784F8 = D_80178520 = D_801784B8 = D_801784C4 = sEnvSettings->unk_20.x; + D_801784D4 = D_801784FC = D_80178524 = D_801784BC = D_801784C8 = sEnvSettings->unk_20.y; + D_801784D8 = D_80178500 = D_80178528 = D_801784C0 = D_801784CC = sEnvSettings->unk_20.z; D_80161A44 = 12800.0f; D_80178540 = 40; D_80178544 = 40; @@ -515,35 +515,35 @@ void func_800A5D6C(void) { for (i = 0; i < 1000; i++) { D_80178288[i] = (Rand_ZeroOneSeeded() * 480.0f) - 80.0f; D_80178290[i] = (Rand_ZeroOneSeeded() * 360.0f) - 60.0f; - D_80178298[i] = (D_800C9C3C[i % ARRAY_COUNT(D_800C9C3C)] << 0x10) | D_800C9C3C[i % ARRAY_COUNT(D_800C9C3C)]; + D_80178298[i] = FILL_COLOR(D_800C9C3C[i % ARRAY_COUNT(D_800C9C3C)]); } } void func_800A5EBC(void) { func_800A5D6C(); D_80177940 = -25000.0f; - D_80178410 = 0x258; - if (D_80178234 == 3) { - D_80178410 = 0x12C; + D_80178410 = 600; + if (gCurrentLevel == LEVEL_AREA_6) { + D_80178410 = 300; } - if (D_80178234 == 0xF) { - D_80178410 = 0x190; + if (gCurrentLevel == LEVEL_UNK_15) { + D_80178410 = 400; } - if (D_80177834 != 7) { - D_80178410 = 0x320; + if (gGameState != GSTATE_PLAY) { + D_80178410 = 800; } - if (D_80178234 == 0xE) { - D_80178410 = 0x1F4; + if (gCurrentLevel == LEVEL_FORTUNA) { + D_80178410 = 500; } if (D_801778E8 != 0) { D_80178410 = 0; } - if (D_80178234 == 0x11) { - D_80178410 = 0x12C; + if (gCurrentLevel == LEVEL_BOLSE) { + D_80178410 = 300; D_80177940 = -0.0f; } - if (D_80178234 == 0xA) { - D_80178410 = 0x320; + if (gCurrentLevel == LEVEL_TRAINING) { + D_80178410 = 800; D_80177940 = -0.0f; } } @@ -564,29 +564,29 @@ void func_800A6070(Vec3f* arg0, u32 arg1) { func_80019218(arg1, arg0, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } -void func_800A60B8(void* arg0) { +void func_800A60B8(UnkEntity1C* arg0) { s32 i; u8* var_v0 = (u8*) arg0; - for (i = 0; i < 0x1C; i++, var_v0++) { + for (i = 0; i < sizeof(UnkEntity1C); i++, var_v0++) { *var_v0 = 0; } } -void func_800A60E8(UnkStruct_D_80174750* arg0) { +void func_800A60E8(UnkEntity30* arg0) { s32 i; u8* var_v0 = (u8*) arg0; - for (i = 0; i < sizeof(UnkStruct_D_80174750); i++, var_v0++) { + for (i = 0; i < sizeof(UnkEntity30); i++, var_v0++) { *var_v0 = 0; } } -void func_800A6118(UnkStruct_D_80175A10* arg0) { +void func_800A6118(UnkEntity28* arg0) { s32 i; u8* var_v0 = (u8*) arg0; - for (i = 0; i < sizeof(UnkStruct_D_80175A10); i++, var_v0++) { + for (i = 0; i < sizeof(UnkEntity28); i++, var_v0++) { *var_v0 = 0; } } @@ -595,41 +595,41 @@ void func_800A6148(void) { s16 i; s16 j; - for (i = 0; i < ARRAY_COUNT(D_80176438); i++) { - func_800A60B8(&D_80176438[i]); + for (i = 0; i < ARRAY_COUNT(gUnkEntities1C); i++) { + func_800A60B8(&gUnkEntities1C[i]); } - for (i = 0; i < ARRAY_COUNT(D_80175A10); i++) { - func_800A6118(&D_80175A10[i]); + for (i = 0; i < ARRAY_COUNT(gUnkEntities28); i++) { + func_800A6118(&gUnkEntities28[i]); } - for (i = 0; i < ARRAY_COUNT(D_80174750); i++) { - func_800A60E8(&D_80174750[i]); + for (i = 0; i < ARRAY_COUNT(gUnkEntities30); i++) { + func_800A60E8(&gUnkEntities30[i]); } - for (i = 0; i < ARRAY_COUNT(D_80161B00); i++) { - func_80060FBC(&D_80161B00[i].obj, &D_80161B00[i].unk_70); - func_80061364(&D_80161B00[i]); + for (i = 0; i < ARRAY_COUNT(gObjects80); i++) { + Object_Kill(&gObjects80[i].obj, &gObjects80[i].unk_70); + Object_80_Initialize(&gObjects80[i]); } - for (i = 0; i < ARRAY_COUNT(D_80163400); i++) { - func_80061394(&D_80163400[i]); + for (i = 0; i < ARRAY_COUNT(gObjects4C); i++) { + Object_4C_Initialize(&gObjects4C[i]); } - for (i = 0; i < ARRAY_COUNT(D_80163FE0); i++) { - func_80060FBC(&D_80163FE0[i].obj, &D_80163FE0[i].unk_100); - func_800613C4(&D_80163FE0[i]); + for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) { + Object_Kill(&gObjects2F4[i].obj, &gObjects2F4[i].unk_100); + Object_2F4_Initialize(&gObjects2F4[i]); } - for (i = 0; i < ARRAY_COUNT(D_8016F110); i++) { - func_80060FBC(&D_8016F110[i].obj, &D_8016F110[i].unk_3FC); - func_80061404(&D_8016F110[i]); + for (i = 0; i < ARRAY_COUNT(gObjects408); i++) { + Object_Kill(&gObjects408[i].obj, &gObjects408[i].unk_3FC); + Object_408_Initialize(&gObjects408[i]); } - for (i = 0; i < ARRAY_COUNT(D_80170130); i++) { - func_80060FBC(&D_80170130[i].obj, &D_80170130[i].unk_80); - func_80061474(&D_80170130[i]); + for (i = 0; i < ARRAY_COUNT(gObjects8C); i++) { + Object_Kill(&gObjects8C[i].obj, &gObjects8C[i].unk_80); + Object_8C_Initialize(&gObjects8C[i]); } - for (i = 0; i < ARRAY_COUNT(D_801737E0); i++) { - func_80060FBC(&D_801737E0[i].obj, &D_801737E0[i].unk_5C); - func_80061444(&D_801737E0[i]); + for (i = 0; i < ARRAY_COUNT(gObjects6C); i++) { + Object_Kill(&gObjects6C[i].obj, &gObjects6C[i].unk_5C); + Object_6C_Initialize(&gObjects6C[i]); } - for (i = 0; i < ARRAY_COUNT(D_80174050); i++) { - func_80060FBC(&D_80174050[i].obj, &D_80174050[i].unk_38); - func_80035E48(&D_80174050[i]); + for (i = 0; i < ARRAY_COUNT(gObjects70); i++) { + Object_Kill(&gObjects70[i].obj, &gObjects70[i].unk_38); + func_80035E48(&gObjects70[i]); } D_801782B8 = D_801782BC = D_801782C0 = D_801782D0 = D_80178284 = D_8017828C = D_8017812C = D_80177E70 = D_80177E78 = D_80177E80 = 0; @@ -664,10 +664,10 @@ void func_800A6590(void) { if (D_80161A60 != 0) { D_80161A60--; if (D_80161A60 & 2) { - D_80178348 = 0xFF; - D_80178350 = 0xFF; - D_80178354 = 0xFF; - D_80178340 = 0xFE; + D_80178348 = 255; + D_80178350 = 255; + D_80178354 = 255; + D_80178340 = 254; } else { D_80178340 = 0; } @@ -677,49 +677,49 @@ void func_800A6590(void) { void func_800A668C(f32 arg0, f32 arg1, f32 arg2) { s32 i; - for (i = 0; i < ARRAY_COUNT(D_80174050); i++) { - if (D_80174050[i].obj.status == 0) { - func_80035E48(&D_80174050[i]); - D_80174050[i].obj.status = 2; - D_80174050[i].unk_60 = 0; - D_80174050[i].obj.pos.x = arg0; - D_80174050[i].obj.pos.y = arg1; - D_80174050[i].obj.pos.z = arg2; + for (i = 0; i < ARRAY_COUNT(gObjects70); i++) { + if (gObjects70[i].obj.status == 0) { + func_80035E48(&gObjects70[i]); + gObjects70[i].obj.status = 2; + gObjects70[i].unk_60 = 0; + gObjects70[i].obj.pos.x = arg0; + gObjects70[i].obj.pos.y = arg1; + gObjects70[i].obj.pos.z = arg2; break; } } } void func_800A670C(Object_2F4* arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4) { - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 1; - arg0->obj.id = 0xBD; + arg0->obj.id = OBJECT_189; arg0->unk_0B8 = arg1; arg0->obj.pos.x = arg2; arg0->obj.pos.y = arg3; arg0->obj.pos.z = arg4; arg0->unk_10C = 0.5f; if ((arg1 == 0) || (arg1 == 1)) { - arg0->unk_0EC = (Rand_ZeroOne() * 5.0f) + 10.0f; - arg0->unk_0E8 = 10.0f; + arg0->unk_0E8.y = (Rand_ZeroOne() * 5.0f) + 10.0f; + arg0->unk_0E8.x = 10.0f; if (arg1 == 0) { - arg0->unk_0E8 = -10.0f; + arg0->unk_0E8.x = -10.0f; } - arg0->unk_0BC = 0xF; + arg0->unk_0BC = 15; } else { - if (D_80177C98 == 0) { - arg0->unk_0EC = (Rand_ZeroOne() * 7.0f) + 7.0f; - arg0->unk_0E8 = (Rand_ZeroOne() - 0.5f) * 10.0f; - arg0->unk_0F0 = (Rand_ZeroOne() * 5.0f) + 5.0f; + if (gLevelType == 0) { + arg0->unk_0E8.y = (Rand_ZeroOne() * 7.0f) + 7.0f; + arg0->unk_0E8.x = (Rand_ZeroOne() - 0.5f) * 10.0f; + arg0->unk_0E8.z = (Rand_ZeroOne() * 5.0f) + 5.0f; if (D_80177880 == 1) { - arg0->unk_0F0 = (Rand_ZeroOne() - 0.5f) * 10.0f; + arg0->unk_0E8.z = (Rand_ZeroOne() - 0.5f) * 10.0f; } - arg0->unk_0BC = (s32) (Rand_ZeroOne() * 10.0f) + 0xA; + arg0->unk_0BC = (s32) (Rand_ZeroOne() * 10.0f) + 10; } else { - arg0->unk_0E8 = (Rand_ZeroOne() - 0.5f) * 10.0f; - arg0->unk_0EC = (Rand_ZeroOne() - 0.5f) * 10.0f; - arg0->unk_0F0 = (Rand_ZeroOne() - 0.5f) * 10.0f; + arg0->unk_0E8.x = (Rand_ZeroOne() - 0.5f) * 10.0f; + arg0->unk_0E8.y = (Rand_ZeroOne() - 0.5f) * 10.0f; + arg0->unk_0E8.z = (Rand_ZeroOne() - 0.5f) * 10.0f; arg0->unk_0BC = (s32) (Rand_ZeroOne() * 25.0f) + 25; arg0->unk_10C = 0.0f; } @@ -738,9 +738,9 @@ void func_800A69F8(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { s32 i; if (D_801778E8 == 0) { - for (i = ARRAY_COUNT(D_80163FE0) - 1; i >= 10; i--) { - if (D_80163FE0[i].obj.status == 0) { - func_800A670C(&D_80163FE0[i], arg0, arg1, arg2, arg3); + for (i = ARRAY_COUNT(gObjects2F4) - 1; i >= 10; i--) { + if (gObjects2F4[i].obj.status == 0) { + func_800A670C(&gObjects2F4[i], arg0, arg1, arg2, arg3); break; } } @@ -749,40 +749,40 @@ void func_800A69F8(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { #ifdef NON_MATCHING s32 func_800A6A74(void) { - return D_80161A90[0] && D_80161A90[1] && D_80161A90[2] && D_80161A90[3]; + return gGoldRingCount[0] && gGoldRingCount[1] && gGoldRingCount[2] && gGoldRingCount[3]; } #else s32 func_800A6A74(void); #pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A6A74.s") #endif -void func_800A6AC0(UnkStruct_D_80178280* arg0, s32 arg1, s32 arg2) { - if ((arg0->unk_1CC == 0) && (D_80177AB8[arg0->unk_1C4] < 1.0f)) { - if (arg1 == 1) { - D_80177D40[arg0->unk_1C4] = 30; - if (arg0->unk_49C.unk_00 == 2) { - D_80177D10[arg0->unk_1C4] -= arg2; - if (D_80177D10[arg0->unk_1C4] <= 0) { - func_800A69F8(1, arg0->unk_2D4.x, arg0->unk_2D4.y, arg0->unk_2D4.z); - arg0->unk_49C.unk_00 = 1; - func_8007D0E0(arg0->unk_2D4.x, arg0->unk_2D4.y, arg0->unk_2D4.z, 2.0f); - D_80177D70[arg0->unk_1C4] = 50; - func_800A5FA0(arg0->unk_460, 0x0900A02C, arg0->unk_1C4); +void func_800A6AC0(Player* player, s32 side, s32 damage) { + if ((player->unk_1CC == 0) && (D_80177AB8[player->unk_1C4] < 1.0f)) { + if (side == 1) { + D_80177D40[player->unk_1C4] = 30; + if (player->wings.rightState == 2) { + gRightWingHealth[player->unk_1C4] -= damage; + if (gRightWingHealth[player->unk_1C4] <= 0) { + func_800A69F8(1, player->unk_2D4.x, player->unk_2D4.y, player->unk_2D4.z); + player->wings.rightState = 1; + func_8007D0E0(player->unk_2D4.x, player->unk_2D4.y, player->unk_2D4.z, 2.0f); + D_80177D70[player->unk_1C4] = 50; + func_800A5FA0(&player->unk_460, 0x0900A02C, player->unk_1C4); if (D_8015F90C == 0) { D_8015F90C = 1000; } } } - } else if (arg1 == 2) { - D_80177D58[arg0->unk_1C4] = 30; - if (arg0->unk_49C.unk_01 == 2) { - D_80177D28[arg0->unk_1C4] -= arg2; - if (D_80177D28[arg0->unk_1C4] <= 0) { - func_800A69F8(0, arg0->unk_2C8.x, arg0->unk_2C8.y, arg0->unk_2C8.z); - arg0->unk_49C.unk_01 = 1; - func_8007D0E0(arg0->unk_2C8.x, arg0->unk_2C8.y, arg0->unk_2C8.z, 2.0f); - D_80177D88[arg0->unk_1C4] = 50; - func_800A5FA0(arg0->unk_460, 0x0900A02C, arg0->unk_1C4); + } else if (side == 2) { + D_80177D58[player->unk_1C4] = 30; + if (player->wings.leftState == 2) { + gLeftWingHealth[player->unk_1C4] -= damage; + if (gLeftWingHealth[player->unk_1C4] <= 0) { + func_800A69F8(0, player->unk_2C8.x, player->unk_2C8.y, player->unk_2C8.z); + player->wings.leftState = 1; + func_8007D0E0(player->unk_2C8.x, player->unk_2C8.y, player->unk_2C8.z, 2.0f); + D_80177D88[player->unk_1C4] = 50; + func_800A5FA0(&player->unk_460, 0x0900A02C, player->unk_1C4); if (D_8015F90C == 0) { D_8015F90C = 1000; } @@ -792,22 +792,22 @@ void func_800A6AC0(UnkStruct_D_80178280* arg0, s32 arg1, s32 arg2) { } } -void func_800A6CD0(UnkStruct_D_80178280* arg0, s32 arg1, s32 arg2) { +void func_800A6CD0(Player* arg0, s32 arg1, s32 damage) { Vec3f sp44; Vec3f sp38; f32 sp34 = 20.0f; - arg0->unk_1A4 = arg2; + arg0->unk_1A4 = damage; arg0->unk_21C = arg1; - if ((arg2 == 39) || (arg2 == 41) || (arg2 == 42) || (arg2 == 43)) { - arg2 = 40; + if ((damage == 39) || (damage == 41) || (damage == 42) || (damage == 43)) { + damage = 40; } if (gExpertMode) { - arg0->unk_268 = arg2 * 2; + arg0->damage = damage * 2; } else { - arg0->unk_268 = arg2; + arg0->damage = damage; } - if (arg0->unk_268 != 0) { + if (arg0->damage != 0) { arg0->unk_220 = 4; } arg0->unk_284 = 0; @@ -815,30 +815,30 @@ void func_800A6CD0(UnkStruct_D_80178280* arg0, s32 arg1, s32 arg2) { if (arg0->unk_1A4 > 40) { sp34 = (arg0->unk_110 * 0.3f) + 20.0f; arg0->unk_498 = 5; - } else if ((D_80178234 == 9) && (D_80178284 == 0)) { + } else if ((gCurrentLevel == LEVEL_VENOM_2) && (D_80178284 == 0)) { arg0->unk_498 = 3; - } else if ((D_80178234 == 6) || (D_80178234 == 13)) { + } else if ((gCurrentLevel == LEVEL_VENOM_1) || (gCurrentLevel == LEVEL_AQUAS)) { arg0->unk_498 = 5; } else { arg0->unk_498 = 20; } if (D_80177AD0[arg0->unk_1C4] != 0) { - func_800A5FA0(arg0->unk_460, 0x0903900E, arg0->unk_1C4); + func_800A5FA0(&arg0->unk_460, 0x0903900E, arg0->unk_1C4); D_80177AE8[arg0->unk_1C4] = 5; D_80177AB8[arg0->unk_1C4] = 2.0f; - arg0->unk_268 = 0; + arg0->damage = 0; } else { - if (arg0->unk_264 != 0) { - if (arg0->unk_264 < 50) { + if (arg0->health != 0) { + if (arg0->health < 50) { func_80019218(0x49008011, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - } else if (arg0->unk_264 < 100) { + } else if (arg0->health < 100) { func_80019218(0x49008010, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } } - if (arg2 < 25) { - func_800A5FA0(arg0->unk_460, 0x0903900E, arg0->unk_1C4); + if (damage < 25) { + func_800A5FA0(&arg0->unk_460, 0x0903900E, arg0->unk_1C4); } else { - func_800A5FA0(arg0->unk_460, 0x0903A00F, arg0->unk_1C4); + func_800A5FA0(&arg0->unk_460, 0x0903A00F, arg0->unk_1C4); } } Matrix_RotateY(gCalcMatrix, arg0->unk_114 * M_DTOR, 0); @@ -906,7 +906,7 @@ void func_800A6CD0(UnkStruct_D_80178280* arg0, s32 arg1, s32 arg2) { } break; } - if ((D_80178234 == 6) && (arg0->unk_1A4 == 42)) { + if ((gCurrentLevel == LEVEL_VENOM_1) && (arg0->unk_1A4 == 42)) { if (arg0->unk_074 > 0.0f) { arg0->unk_0D8.x = -30.0f; } else { @@ -916,12 +916,12 @@ void func_800A6CD0(UnkStruct_D_80178280* arg0, s32 arg1, s32 arg2) { } } -void func_800A729C(UnkStruct_D_80178280* arg0, u32 arg1, f32 arg2, f32 arg3) { +void func_800A729C(Player* arg0, u32 arg1, f32 arg2, f32 arg3) { arg0->unk_21C = arg1; switch (arg1) { case 1: case 2: - arg0->unk_074 = arg0->unk_090; + arg0->unk_074 = arg0->unk_08C.y; arg0->unk_0D8.x = 0.0f; arg0->unk_074 += D_800D2FEC[arg0->unk_21C]; if (arg0->unk_1CC == 1) { @@ -975,12 +975,12 @@ s32 func_800A73E4(f32* arg0, s32* arg1, f32 posX, f32 posY, f32 posZ) { f32 cry; f32 crx; - switch (D_80178234) { - case 7: + switch (gCurrentLevel) { + case LEVEL_SOLAR: spA4 = SEGMENTED_TO_VIRTUAL(D_6001C50); spA0 = SEGMENTED_TO_VIRTUAL(D_6022760); break; - case 8: + case LEVEL_ZONESS: spA4 = SEGMENTED_TO_VIRTUAL(D_6009ED0); spA0 = SEGMENTED_TO_VIRTUAL(D_602AC50); break; @@ -1037,9 +1037,9 @@ s32 func_800A73E4(f32* arg0, s32* arg1, f32 posX, f32 posY, f32 posZ) { } s32 func_800A78C4(f32* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { - if ((fabsf((arg0[0] + arg3) - arg6) < (arg0[1] + D_8017853C)) && - (fabsf((arg0[4] + arg1) - arg4) < (arg0[5] + D_8017853C)) && - (fabsf((arg0[2] + arg2) - arg5) < (arg0[3] + D_8017853C))) { + if ((fabsf(arg0[0] + arg3 - arg6) < (arg0[1] + D_8017853C)) && + (fabsf(arg0[4] + arg1 - arg4) < (arg0[5] + D_8017853C)) && + (fabsf(arg0[2] + arg2 - arg5) < (arg0[3] + D_8017853C))) { return true; } return false; @@ -1047,8 +1047,8 @@ s32 func_800A78C4(f32* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f #ifdef NON_MATCHING // stupid 0.0f stuff -s32 func_800A7974(UnkStruct_D_80178280* arg0, f32* arg1, s32* arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, - f32 arg8, f32 arg9, f32 argA, f32 argB) { +s32 func_800A7974(Player* arg0, f32* arg1, s32* arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, + f32 arg9, f32 argA, f32 argB) { s32 spB4; s32 i; f32 var_fv0; @@ -1165,12 +1165,12 @@ s32 func_800A7974(UnkStruct_D_80178280* arg0, f32* arg1, s32* arg2, f32 arg3, f3 return 0; } #else -s32 func_800A7974(UnkStruct_D_80178280* arg0, f32* arg1, s32* arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, - f32 arg8, f32 arg9, f32 argA, f32 argB); +s32 func_800A7974(Player* arg0, f32* arg1, s32* arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, + f32 arg9, f32 argA, f32 argB); #pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_A4B50/func_800A7974.s") #endif -bool func_800A8054(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, Vec3f* arg7, Vec3f* arg8) { +bool func_800A8054(s32 objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, Vec3f* arg7, Vec3f* arg8) { Vec3f sp54; Vec3f sp48; Vec3f sp3C; @@ -1187,7 +1187,7 @@ bool func_800A8054(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f sp48.z = arg3; var_v0 = false; - switch (arg0) { + switch (objId) { case 0xB4: var_s0 = 0; break; @@ -1356,7 +1356,7 @@ bool func_800A8054(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f } // arg5 could be Vec3f (not Vec3f*) -s32 func_800A8304(UnkStruct_D_80178280* arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { +s32 func_800A8304(Player* arg0, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) { Vec3f sp84; Vec3f sp78; Vec3f sp6C; @@ -1421,12 +1421,12 @@ s32 func_800A8304(UnkStruct_D_80178280* arg0, s32 arg1, f32 arg2, f32 arg3, f32 return 0; } -void func_800A86E4(UnkStruct_D_80178280* arg0) { +void func_800A86E4(Player* arg0) { s32 i; Object_6C* var_s0; s32 sp6C; - for (i = 0, var_s0 = D_801737E0; i < ARRAY_COUNT(D_801737E0); i++, var_s0++) { + for (i = 0, var_s0 = gObjects6C; i < ARRAY_COUNT(gObjects6C); i++, var_s0++) { if ((var_s0->obj.status == 2) && ((arg0->unk_1C8 == 3) || (arg0->unk_1C8 == 5)) && (var_s0->unk_4A == 0) && func_800A7974(arg0, var_s0->unk_1C.unk_0C, &sp6C, var_s0->obj.pos.x, var_s0->obj.pos.y, var_s0->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)) { @@ -1436,7 +1436,7 @@ void func_800A86E4(UnkStruct_D_80178280* arg0) { } } -void func_800A8804(UnkStruct_D_80178280* arg0, UnkStruct_D_80178280* arg1) { +void func_800A8804(Player* arg0, Player* arg1) { if (arg0->unk_498 == 0) { func_800A6CD0(arg0, 0, D_800D3000[arg0->unk_1CC][arg1->unk_1CC]); arg0->unk_288 = arg1->unk_1C4 + 1; @@ -1444,7 +1444,7 @@ void func_800A8804(UnkStruct_D_80178280* arg0, UnkStruct_D_80178280* arg1) { } } -void func_800A887C(UnkStruct_D_80178280* arg0) { +void func_800A887C(Player* arg0) { Vec3f sp3C; Matrix_Translate(gCalcMatrix, arg0->unk_074, arg0->unk_078, arg0->unk_138, 0); @@ -1482,7 +1482,7 @@ void func_800A887C(UnkStruct_D_80178280* arg0) { Matrix_RotateZ(gCalcMatrix, -(arg0->unk_0F8 * M_DTOR), 1); sp3C.y = 0.0f; sp3C.z = 0.0f; - if (arg0->unk_49C.unk_01 == 2) { + if (arg0->wings.leftState == 2) { sp3C.x = 40.0f; } else { sp3C.y = -10.0f; @@ -1492,7 +1492,7 @@ void func_800A887C(UnkStruct_D_80178280* arg0) { sp3C.x = 24.0f; } Matrix_MultVec3f(gCalcMatrix, &sp3C, &arg0->unk_2C8); - if (arg0->unk_49C.unk_00 == 2) { + if (arg0->wings.rightState == 2) { sp3C.x = -40.0f; } else { sp3C.x = -30.0f; diff --git a/src/main/sf_hud.c b/src/main/sf_hud.c index 623429ae..af746b39 100644 --- a/src/main/sf_hud.c +++ b/src/main/sf_hud.c @@ -12,7 +12,7 @@ void func_80084930(f32 arg0, f32 arg1, s32 arg2) { D_3000080, D_3000080, }; - UnkStruct_D_80178280* temp; + Player* temp; s32 var_t0; s32 var_v0; s32 i; @@ -20,7 +20,7 @@ void func_80084930(f32 arg0, f32 arg1, s32 arg2) { RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - temp = D_80178280; + temp = gPlayer; var_t0 = 0; switch (temp->unk_1CC) { @@ -79,7 +79,7 @@ void func_80084B94(s32 arg0) { RCP_SetupDL(&gMasterDisp, 0x24); if (arg0 == 0) { for (i = 1; i < 4; i++) { - if (((D_801778B0[i] != 0) || (D_80178280->unk_1C8 != 7)) && (D_801778B0[i] <= 0) && (D_801778B0[i] != -2)) { + if (((D_801778B0[i] != 0) || (gPlayer[0].unk_1C8 != 7)) && (D_801778B0[i] <= 0) && (D_801778B0[i] != -2)) { Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, D_800D1A70[i - 1].x, D_800D1A70[i - 1].y, D_800D1A70[i - 1].z, 1); Matrix_Scale(gGfxMatrix, 0.68f, 0.68f, 1.0f, 1); @@ -200,7 +200,7 @@ void func_80086110(f32 arg0, f32 arg1, s32 arg2) { if ((arg2 <= 0) && (arg2 != -2) && ((D_80177854 == 100) || (D_80177830 == 1) || (D_80177838 != 0))) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); - if ((arg2 == 0) && (D_80178280[0].unk_1C8 == 7)) { + if ((arg2 == 0) && (gPlayer[0].unk_1C8 == 7)) { Graphics_DisplaySmallText(arg0 + (8.0f * temp) + 4.0f, arg1 + 2.0f, 1.0f, 1.0f, " OK "); } else { Graphics_DisplaySmallText(arg0 + (8.0f * temp) + 4.0f, arg1 + 2.0f, 1.0f, 1.0f, "DOWN"); @@ -217,58 +217,59 @@ void func_80086110(f32 arg0, f32 arg1, s32 arg2) { s32 func_800863C8(void) { s32 var_v1 = 0; - switch (D_80178234) { - case 10: + switch (gCurrentLevel) { + case LEVEL_TRAINING: var_v1++; - case 9: + case LEVEL_VENOM_2: var_v1++; - case 19: + case LEVEL_VENOM_SW: var_v1++; - case 6: + case LEVEL_VENOM_1: var_v1++; - case 3: + case LEVEL_AREA_6: var_v1++; - case 17: + case LEVEL_BOLSE: var_v1++; - case 18: + case LEVEL_SECTOR_Z: var_v1++; - case 11: + case LEVEL_MACBETH: var_v1++; - case 12: + case LEVEL_TITANIA: var_v1++; - case 8: + case LEVEL_ZONESS: var_v1++; - case 7: + case LEVEL_SOLAR: var_v1++; - case 2: + case LEVEL_SECTOR_X: var_v1++; - case 13: + case LEVEL_AQUAS: var_v1++; - case 16: + case LEVEL_KATINA: var_v1++; - case 14: + case LEVEL_FORTUNA: var_v1++; - case 5: + case LEVEL_SECTOR_Y: var_v1++; - case 1: + case LEVEL_METEO: var_v1++; - case 0: + + case LEVEL_CORNERIA: break; } return var_v1; @@ -287,12 +288,12 @@ void func_80086444(void) { f32 D_800D1CC4[] = { 2.0f, 5.0f }; f32 D_800D1CCC[] = { 1.6f, 1.6f }; - switch (D_80178234) { - case 19: + switch (gCurrentLevel) { + case LEVEL_VENOM_SW: i = 1; break; - case 6: + case LEVEL_VENOM_2: i = 0; break; @@ -377,7 +378,7 @@ void func_80086CC8(void) { if (D_80177838 != 0) { func_80086C08(temp - 4.5f - 32.0f, sp18 - 24.0f - 4.0f, 7.4f, 3.9f); - if (D_80178234 != 10) { + if (gCurrentLevel != LEVEL_TRAINING) { func_80086C08(122.0f, 122.0f, 2.9f, 1.2f); } @@ -397,7 +398,7 @@ void func_800884E4(void) { s32 var_v1; s32 i; - D_80177B70[D_80177B48] = D_80161A98; + D_80177B70[D_80177B48] = gHitCount; var_v1 = 0xFF0000; for (i = 0; i < 3; i++) { @@ -477,7 +478,7 @@ void func_80088784(s32 arg0) { Matrix_Scale(gGfxMatrix, 0.37f, 0.37f, 0.37f, 1); Matrix_SetGfxMtx(&gMasterDisp); - if (D_80177C98 == 0) { + if (gLevelType == 0) { gSPDisplayList(gMasterDisp++, D_800D1D4C[arg0]); } else { gSPDisplayList(gMasterDisp++, D_800D1D94[arg0]); @@ -541,7 +542,7 @@ void func_80089994(s32 arg0) { f32 var_fv1; f32 var_fv2; - if (D_801778A8 != 1) { + if (gCamCount != 1) { var_fv1 = 38.0f; var_fv2 = 38.0f; } else { @@ -581,7 +582,7 @@ void func_80089C38(void) { RCP_SetupDL(&gMasterDisp, 0xC); - alpha = D_80177DB0 % 21; + alpha = gFrameCount % 21; if (alpha > 10) { alpha = 20 - alpha; @@ -599,7 +600,7 @@ void func_80089D28(void) { RCP_SetupDL(&gMasterDisp, 1); - gb = D_80177DB0 % 21; + gb = gFrameCount % 21; if (gb > 10) { gb = 20 - gb; @@ -631,7 +632,7 @@ void func_80089E98(s32 arg0) { case 2: case 3: var_a1_2 = var_a1 = arg0; - if (D_801778A8 != 1) { + if (gCamCount != 1) { if (arg0 == 1) { var_a1 = 3; } @@ -639,11 +640,11 @@ void func_80089E98(s32 arg0) { var_a1 = 1; } - if (D_80178280[arg0].unk_1C8 == 13) { + if (gPlayer[arg0].unk_1C8 == 13) { break; } } - if ((var_a1_2 == D_801778A0) && (D_80177DB0 & 2)) { + if ((var_a1_2 == D_801778A0) && (gFrameCount & 2)) { var_a1 = (var_a1 * 2) + 1; } else { var_a1 = var_a1 * 2; @@ -677,9 +678,9 @@ void func_80089E98(s32 arg0) { case 103: if (D_801778E8 == 1) { func_80089670(); - break; + } else { + func_80089C38(); } - func_80089C38(); break; case 200: @@ -707,22 +708,22 @@ s32 func_8008AC54(s32 arg0) { s32 i; s32 ret = 0; - for (i = 0, var_a1 = D_80163FE0; i < 60; i++, var_a1++) { + for (i = 0, var_a1 = gObjects2F4; i < 60; i++, var_a1++) { switch (arg0) { case 0: - if ((var_a1->obj.status == 2) && (var_a1->obj.id == 0xBE)) { + if ((var_a1->obj.status == 2) && (var_a1->obj.id == OBJECT_190)) { ret++; } break; case 1: - if ((var_a1->obj.status == 2) && (var_a1->obj.id == 0xBF)) { + if ((var_a1->obj.status == 2) && (var_a1->obj.id == OBJECT_191)) { ret++; } break; case 2: - if (((var_a1->obj.id == 0xBE) || (var_a1->obj.id == 0xBF)) && (var_a1->obj.status == 2)) { + if (((var_a1->obj.id == OBJECT_190) || (var_a1->obj.id == OBJECT_191)) && (var_a1->obj.status == 2)) { ret++; } break; @@ -733,52 +734,52 @@ s32 func_8008AC54(s32 arg0) { } void func_8008AD94(void) { - if (D_80177834 == 7) { + if (gGameState == GSTATE_PLAY) { RCP_SetupDL(&gMasterDisp, 0x4C); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); switch ((s32) D_80177D68) { - case 0: + case RCID_FOX: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "FOX"); break; - case 10: + case RCID_FALCO: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "FALCO"); break; - case 20: + case RCID_SLIPPY: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "SLIPPY"); break; - case 30: + case RCID_PEPPY: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "PEPPY"); break; - case 200: - case 240: + case RCID_WOLF: + case RCID_WOLF_2: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "WOLF"); break; - case 220: - case 260: + case RCID_LEON: + case RCID_LEON_2: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "LEON"); break; - case 210: - case 250: + case RCID_PIGMA: + case RCID_PIGMA_2: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "PIGMA"); break; - case 230: - case 270: + case RCID_ANDREW: + case RCID_ANDREW_2: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "ANDREW"); break; - case 170: + case RCID_BILL: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "BILL"); break; - case 40: + case RCID_KATT: Graphics_DisplaySmallText(73, 173, 1.0f, 1.0f, "KATT"); break; } @@ -861,16 +862,16 @@ void func_8008B2F0(void) { D_8016179C = 20.0f; D_801617A0 = 18.0f; - if (D_80161A90[0] >= 3) { + if (gGoldRingCount[0] >= 3) { D_801617A4 = D_801617A8 = 1.5f; } else { D_801617A4 = D_801617A8 = 1.0f; } - var_fv0 = D_80178280[0].unk_264; + var_fv0 = gPlayer[0].health; D_801617AC = var_fv0 / ((256.0f * D_801617A8) - 1.0f); - if (D_80161A90[0] >= 3) { + if (gGoldRingCount[0] >= 3) { D_80161730 = 2; } else { D_80161730 = 1; @@ -878,7 +879,7 @@ void func_8008B2F0(void) { break; case 1: - if (D_80161A90[0] >= 3) { + if (gGoldRingCount[0] >= 3) { D_801617B0 = 55; D_80161730 = 2; } @@ -887,17 +888,17 @@ void func_8008B2F0(void) { D_800D1EB4 = D_800D1EB8 = D_800D1EBC = 255; if (D_801617B0 > 0) { if (--D_801617B0 == 0) { - D_80178280[0].unk_26C += 128; + gPlayer[0].heal += 128; } } - if (((D_801617B0 != 0) || ((D_801617A4 - D_801617A8) > 0.1f)) && (D_80177DB0 & 2)) { + if (((D_801617B0 != 0) || ((D_801617A4 - D_801617A8) > 0.1f)) && (gFrameCount & 2)) { D_800D1EB4 = 0; D_800D1EB8 = 255; D_800D1EBC = 0; } - if ((D_801617B0 == 0) && ((s32) D_80161A90[0] >= 3)) { + if ((D_801617B0 == 0) && ((s32) gGoldRingCount[0] >= 3)) { D_801617A4 = 1.5f; } else { D_801617A4 = 1.0f; @@ -905,7 +906,7 @@ void func_8008B2F0(void) { Math_SmoothStepToF(&D_801617A8, D_801617A4, 0.02f, 1000.0f, 0.001f); - var_fv0 = D_80178280[0].unk_264; + var_fv0 = gPlayer[0].health; if (var_fv0 > (256.0f * D_801617A8) - 1.0f) { var_fv0 = (256.0f * D_801617A8) - 1.0f; } @@ -1074,8 +1075,8 @@ void func_8008CA44(void) { s32 i; s32 j; - if ((D_80178280[D_801778A0].unk228 != 0) && (D_80178280[D_801778A0].unk210 == 0) && (D_80177854 != 0x64)) { - j = D_80178280[D_801778A0].unk228; + if ((gPlayer[D_801778A0].unk228 != 0) && (gPlayer[D_801778A0].unk210 == 0) && (D_80177854 != 0x64)) { + j = gPlayer[D_801778A0].unk228; for (i = 0; i < 12; i++) { if ((j & D_800D2048[i]) != D_800D2048[i]) { @@ -1084,10 +1085,10 @@ void func_8008CA44(void) { j = (D_800D2048[i] ^ 0xFF) & j; - if (D_80177DB0 & 4) { + if (gFrameCount & 4) { func_8008C6F4(i, 0); } - if ((D_80177DB0 - 2) & 4) { + if ((gFrameCount - 2) & 4) { func_8008C6F4(i, 1); } } @@ -1145,7 +1146,7 @@ void func_8008D31C(void) { f32 D_800D20E8[] = { 60.0f, 220.0f, 60.0f, 220.0f }; f32 D_800D20F8[] = { 78.0f, 78.0f, 198.0f, 198.0f }; - Math_SmoothStepToF(&D_800D19E0[D_801778A0], D_80178280[D_801778A0].unk_264 * (1.0f / 255.0f), 0.3f, 10.0f, 0.01f); + Math_SmoothStepToF(&D_800D19E0[D_801778A0], gPlayer[D_801778A0].health * (1.0f / 255.0f), 0.3f, 10.0f, 0.01f); RCP_SetupDL(&gMasterDisp, 0x4E); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); @@ -1191,12 +1192,12 @@ void func_8008D4F0(f32 arg0, f32 arg1) { D_800D211C[var_v1] = arg1; } - temp_fs0 = D_80178280[D_801778A0].unk_2BC * 0.011111111f; + temp_fs0 = gPlayer[D_801778A0].unk_2BC * (1.0f / 90.0f); temp_fv0 = 1.0f - temp_fs0; temp2 = sp68 * temp_fs0; - if (D_80178280[D_801778A0].unk_2B4 == 0) { + if (gPlayer[D_801778A0].unk_2B4 == 0) { Math_SmoothStepToF(&D_800D19AC[var_v1], 255.0f, 0.4f, 100.0f, 0.01f); } else { Math_SmoothStepToF(&D_800D19AC[var_v1], 100.0f, 0.4f, 100.0f, 0.01f); @@ -1243,9 +1244,9 @@ void func_8008D984(void) { s32 D_800D21A8[] = { 146, 165, 146, 165 }; s32 D_800D21B8[] = { 94, 94, 137, 137 }; - if (D_80177DA0[D_801778A0] != D_800D2180[D_801778A0]) { - D_800D2180[D_801778A0] = D_80177DA0[D_801778A0]; - if (D_80177DA0[D_801778A0] == 0) { + if (gBombCount[D_801778A0] != D_800D2180[D_801778A0]) { + D_800D2180[D_801778A0] = gBombCount[D_801778A0]; + if (gBombCount[D_801778A0] == 0) { D_800D2190[D_801778A0] = 0; } else { D_800D2190[D_801778A0] = 30; @@ -1256,9 +1257,9 @@ void func_8008D984(void) { D_800D2190[D_801778A0]--; } - if ((D_800D2190[D_801778A0] & 2) || ((D_800D2190[D_801778A0] == 0) && (D_80177DA0[D_801778A0] != 0))) { + if ((D_800D2190[D_801778A0] & 2) || ((D_800D2190[D_801778A0] == 0) && (gBombCount[D_801778A0] != 0))) { RCP_SetupDL_78(); - if (D_80177DA0[D_801778A0] >= 2) { + if (gBombCount[D_801778A0] >= 2) { if (Math_SmoothStepToF(&D_800D21A4, D_800D21A0, 0.4f, 100.0f, 0.1f) == 0.0f) { if (D_800D21A0 == 255.0f) { D_800D21A0 = 96.0f; @@ -1455,66 +1456,66 @@ void func_8008E620(f32 arg0, f32 arg1) { f32 b; s32 ret; - switch (D_80178234) { - case 0: - ret = func_800A3F50(150); + switch (gCurrentLevel) { + case LEVEL_CORNERIA: + ret = Play_CheckMedalStatus(150); break; - case 1: - ret = func_800A3F50(200); + case LEVEL_METEO: + ret = Play_CheckMedalStatus(200); break; - case 14: - ret = func_800A3F50(50); + case LEVEL_FORTUNA: + ret = Play_CheckMedalStatus(50); break; - case 2: - ret = func_800A3F50(150); + case LEVEL_SECTOR_X: + ret = Play_CheckMedalStatus(150); break; - case 12: - ret = func_800A3F50(150); + case LEVEL_TITANIA: + ret = Play_CheckMedalStatus(150); break; - case 17: - ret = func_800A3F50(150); + case LEVEL_BOLSE: + ret = Play_CheckMedalStatus(150); break; - case 5: - ret = func_800A3F50(150); + case LEVEL_SECTOR_Y: + ret = Play_CheckMedalStatus(150); break; - case 16: - ret = func_800A3F50(150); + case LEVEL_KATINA: + ret = Play_CheckMedalStatus(150); break; - case 7: - ret = func_800A3F50(100); + case LEVEL_SOLAR: + ret = Play_CheckMedalStatus(100); break; - case 11: - ret = func_800A3F50(150); + case LEVEL_MACBETH: + ret = Play_CheckMedalStatus(150); break; - case 13: - ret = func_800A3F50(150); + case LEVEL_AQUAS: + ret = Play_CheckMedalStatus(150); break; - case 8: - ret = func_800A3F50(250); + case LEVEL_ZONESS: + ret = Play_CheckMedalStatus(250); break; - case 18: - ret = func_800A3F50(100); + case LEVEL_SECTOR_Z: + ret = Play_CheckMedalStatus(100); break; - case 3: - ret = func_800A3F50(300); + case LEVEL_AREA_6: + ret = Play_CheckMedalStatus(300); break; - case 9: - case 19: - ret = func_800A3F50(200); + case LEVEL_VENOM_2: + case LEVEL_VENOM_SW: + ret = Play_CheckMedalStatus(200); break; default: @@ -1522,16 +1523,16 @@ void func_8008E620(f32 arg0, f32 arg1) { break; } - if (D_801617B8) { - D_801617B8--; + if (gMedalFlashTimer) { + gMedalFlashTimer--; } - if (ret != D_801617B4) { - D_801617B8 = 30; - D_801617B4 = ret; + if (ret != gMedalStatus) { + gMedalFlashTimer = 30; + gMedalStatus = ret; } - if (D_801617B8 & 1) { + if (gMedalFlashTimer & 1) { r = 255; g = 255; b = 255; @@ -1578,12 +1579,12 @@ void func_8008F96C(void) { if (D_80161708 != 0) { func_8008E9EC(24.0f, 30.0f); - if (D_80178234 != 10) { - func_80087530(248.0f, 11.0f, D_80161AA0[D_801778A0]); + if (gCurrentLevel != LEVEL_TRAINING) { + func_80087530(248.0f, 11.0f, gLifeCount[D_801778A0]); } } - if (D_80178234 == 10) { + if (gCurrentLevel == LEVEL_TRAINING) { func_DF4260_801988E0(); } } @@ -1629,7 +1630,7 @@ s32 func_8009092C(Object_2F4* arg0) { return true; } - var_s1 = &D_8016F110[1]; + var_s1 = &gObjects408[1]; for (i = 1; i < 4; i++, var_s1++) { if (var_s1->obj.status == 2) { @@ -1652,8 +1653,8 @@ s32 func_80090A00(Object_2F4* arg0) { arg0->unk_134 = 0.0f; arg0->unk_130 = 360.0f; arg0->unk_0BC = 8; - arg0->unk_0F8 = 100.0f; - arg0->unk_0F4 = 300.0f; + arg0->unk_0F4.y = 100.0f; + arg0->unk_0F4.x = 300.0f; arg0->unk_060 = 1; arg0->unk_064 = 1; @@ -1670,7 +1671,7 @@ s32 func_80090A00(Object_2F4* arg0) { } case 2: - arg0->unk_124.x = D_8016F110[0].obj.pos.x + 1000.0f; + arg0->unk_124.x = gObjects408[0].obj.pos.x + 1000.0f; arg0->unk_124.y = 300.0f; arg0->unk_124.z = arg0->obj.pos.z - 10000.0f; arg0->unk_058++; @@ -1684,9 +1685,9 @@ s32 func_80090A00(Object_2F4* arg0) { break; case 3: - arg0->unk_124.x = D_8016F110[0].obj.pos.x - 1000.0f; + arg0->unk_124.x = gObjects408[0].obj.pos.x - 1000.0f; arg0->unk_124.y = 400.0f; - arg0->unk_124.z = D_8016F110[0].obj.pos.z; + arg0->unk_124.z = gObjects408[0].obj.pos.z; arg0->unk_058++; if (arg0->unk_05C == arg0->unk_058) { arg0->unk_064 = 4; @@ -1696,11 +1697,11 @@ s32 func_80090A00(Object_2F4* arg0) { break; case 4: - arg0->unk_124.z = D_80178280[0].unk_138; + arg0->unk_124.z = gPlayer[0].unk_138; arg0->unk_124.y = 100.0f; - arg0->unk_124.x = D_80178280[0].unk_074; - if ((fabsf(arg0->obj.pos.x - D_80178280[0].unk_074) < 300.0f) && - (fabsf(arg0->obj.pos.z - D_80178280[0].unk_138) < 300.0f)) { + arg0->unk_124.x = gPlayer[0].unk_074; + if ((fabsf(arg0->obj.pos.x - gPlayer[0].unk_074) < 300.0f) && + (fabsf(arg0->obj.pos.z - gPlayer[0].unk_138) < 300.0f)) { arg0->unk_064 = 5; arg0->unk_05C = 20; arg0->unk_058 = 0; @@ -1708,12 +1709,12 @@ s32 func_80090A00(Object_2F4* arg0) { break; case 5: - arg0->unk_124.z = D_80178280[0].unk_138 + 1000.0f; + arg0->unk_124.z = gPlayer[0].unk_138 + 1000.0f; arg0->unk_124.y = 1000.0f; - arg0->unk_124.x = D_80178280[0].unk_074 - 1000.0f; + arg0->unk_124.x = gPlayer[0].unk_074 - 1000.0f; arg0->unk_058++; if (arg0->unk_05C == arg0->unk_058) { - func_80060FBC(&arg0->obj, &arg0->unk_100); + Object_Kill(&arg0->obj, &arg0->unk_100); } break; } @@ -1724,13 +1725,13 @@ s32 func_80090CCC(Object_2F4* arg0) { s32 ret = 0; if (func_8009092C(arg0) != 0) { - arg0->unk_124.z = D_8016F110[arg0->unk_0E6].obj.pos.z; - arg0->unk_124.y = D_8016F110[arg0->unk_0E6].obj.pos.y; - arg0->unk_124.x = D_8016F110[arg0->unk_0E6].obj.pos.x; + arg0->unk_124.z = gObjects408[arg0->unk_0E6].obj.pos.z; + arg0->unk_124.y = gObjects408[arg0->unk_0E6].obj.pos.y; + arg0->unk_124.x = gObjects408[arg0->unk_0E6].obj.pos.x; } else { - arg0->unk_124.z = D_8016F110[0].obj.pos.z; - arg0->unk_124.y = D_8016F110[0].obj.pos.y; - arg0->unk_124.x = D_8016F110[0].obj.pos.x; + arg0->unk_124.z = gObjects408[0].obj.pos.z; + arg0->unk_124.y = gObjects408[0].obj.pos.y; + arg0->unk_124.x = gObjects408[0].obj.pos.x; } if ((fabsf(arg0->obj.pos.x - arg0->unk_124.x) < 2000.0f) && (fabsf(arg0->obj.pos.z - arg0->unk_124.z) < 2000.0f)) { @@ -1752,7 +1753,7 @@ s32 func_80090CCC(Object_2F4* arg0) { arg0->unk_13C = 30.0f; } - if (D_8016F110[arg0->unk_0E6].obj.status == 0) { + if (gObjects408[arg0->unk_0E6].obj.status == 0) { arg0->unk_0B8 = 1; arg0->unk_0E6 = 0; arg0->unk_068 = 0; @@ -1769,7 +1770,7 @@ s32 func_80090E8C(Object_2F4* arg0) { f32 var_fv1_2; if (arg0->unk_0BC == 0) { - if (D_80177C98 == 1) { + if (gLevelType == 1) { x = (Rand_ZeroOne() - 0.5f) * 20000.0f; y = (Rand_ZeroOne() - 0.5f) * 5000.0f; z = (Rand_ZeroOne() - 0.5f) * 20000.0f; @@ -1793,8 +1794,8 @@ s32 func_80090E8C(Object_2F4* arg0) { var_fv1_2 = 5000.0f; } - if ((var_fv1_2 < fabsf(arg0->obj.pos.x - D_8016F110->obj.pos.x)) && - (var_fv1_2 < fabsf(arg0->obj.pos.z - D_8016F110->obj.pos.z))) { + if ((var_fv1_2 < fabsf(arg0->obj.pos.x - gObjects408->obj.pos.x)) && + (var_fv1_2 < fabsf(arg0->obj.pos.z - gObjects408->obj.pos.z))) { arg0->unk_0B8 = 0; } @@ -1815,9 +1816,9 @@ s32 func_800910C0(Object_2F4* arg0) { arg0->unk_0BC = (s32) (Rand_ZeroOne() * 20.0f) + 10; } - arg0->unk_124.x = arg0->unk_2DC.x + D_8016F110->obj.pos.x; + arg0->unk_124.x = arg0->unk_2DC.x + gObjects408->obj.pos.x; arg0->unk_124.y = arg0->unk_2DC.y; - arg0->unk_124.z = arg0->unk_2DC.z + D_8016F110->obj.pos.z; + arg0->unk_124.z = arg0->unk_2DC.z + gObjects408->obj.pos.z; if (arg0->unk_0E4 == 1) { var_fv1 = 1500.0f; @@ -1845,14 +1846,14 @@ void func_80091254(Object_2F4* arg0) { } s32 func_80091298(Object_2F4* arg0) { - arg0->unk_118 = D_80178280[0].unk_0D0 + 10.0f; + arg0->unk_118 = gPlayer[0].unk_0D0 + 10.0f; arg0->unk_120 = 3.6f; - arg0->unk_124.x = D_80178280[0].unk_074 + ((f32) (arg0->unk_0E4 - 2) * 700.0f); - arg0->unk_124.y = D_80178280[0].unk_078; - arg0->unk_124.z = D_80178280[0].unk_138; + arg0->unk_124.x = gPlayer[0].unk_074 + ((f32) (arg0->unk_0E4 - 2) * 700.0f); + arg0->unk_124.y = gPlayer[0].unk_078; + arg0->unk_124.z = gPlayer[0].unk_138; if ((fabsf(arg0->obj.pos.x - arg0->unk_124.x) < 700.0f) || (fabsf(arg0->obj.pos.z - arg0->unk_124.z) < 700.0f)) { - arg0->unk_118 = D_80178280[0].unk_0D0 - 10.0f; + arg0->unk_118 = gPlayer[0].unk_0D0 - 10.0f; arg0->unk_120 = 1.2f; } return false; @@ -1868,15 +1869,15 @@ s32 func_80091368(Object_2F4* arg0) { switch (arg0->unk_0E4) { case 1: - func_800BA808(gMsg_ID_20220, 10); + func_800BA808(gMsg_ID_20220, RCID_FALCO); break; case 3: - func_800BA808(gMsg_ID_20221, 30); + func_800BA808(gMsg_ID_20221, RCID_PEPPY); break; case 2: - func_800BA808(gMsg_ID_20222, 20); + func_800BA808(gMsg_ID_20222, RCID_SLIPPY); break; } D_801778B0[arg0->unk_0E4] = -1; @@ -1894,7 +1895,7 @@ s32 func_80091368(Object_2F4* arg0) { } if (arg0->obj.pos.y > 3000.0f) { - func_80060FBC(&arg0->obj, &arg0->unk_100); + Object_Kill(&arg0->obj, &arg0->unk_100); } break; } @@ -1929,7 +1930,7 @@ void func_800914FC(Object_2F4* arg0) { arg0->unk_0B8 = 3; } - if (D_80178280[0].unk_1C8 == 7) { + if (gPlayer[0].unk_1C8 == 7) { if ((arg0->unk_0B8 != 2) && (arg0->unk_0B8 != 3)) { arg0->unk_060 = 1; arg0->unk_0B8 = 2; @@ -1960,14 +1961,14 @@ s32 func_80091864(Object_2F4* arg0) { sp44 += 40.0f; if (sp44 >= 360.0f) { sp44 -= 360.0f; - } else if ((arg0->obj.pos.y < (D_80177940 + 50.0f)) && (D_80177C98 == 0) && (sp44 > 180.0f)) { + } else if ((arg0->obj.pos.y < (D_80177940 + 50.0f)) && (gLevelType == 0) && (sp44 > 180.0f)) { sp44 = 0.0f; } arg0->unk_050 = 0; } - sp3C = Math_SmoothStepToAngle(&arg0->unk_0F8, sp40, 0.5f, arg0->unk_11C, 0.001f) * 30.0f; - Math_SmoothStepToAngle(&arg0->unk_0F4, sp44, 0.5f, arg0->unk_11C, 0.0001f); + sp3C = Math_SmoothStepToAngle(&arg0->unk_0F4.y, sp40, 0.5f, arg0->unk_11C, 0.001f) * 30.0f; + Math_SmoothStepToAngle(&arg0->unk_0F4.x, sp44, 0.5f, arg0->unk_11C, 0.0001f); sp2C = sp28 = 0.0f; if (sp3C < 0.0f) { @@ -2001,27 +2002,27 @@ s32 func_80091864(Object_2F4* arg0) { s32 func_80091B90(Object_2F4* arg0) { Vec3f vec; - arg0->obj.rot.x = -arg0->unk_0F4; - arg0->obj.rot.y = arg0->unk_0F8; + arg0->obj.rot.x = -arg0->unk_0F4.x; + arg0->obj.rot.y = arg0->unk_0F4.y; Math_SmoothStepToF(&arg0->unk_114, arg0->unk_118, 0.2f, 1.0f, 0.0f); Math_SmoothStepToF(&arg0->unk_11C, arg0->unk_120, 1.0f, 1.0f, 0.0f); Math_Vec3fFromAngles(&vec, arg0->obj.rot.x, arg0->obj.rot.y, arg0->unk_138 + arg0->unk_114); - arg0->unk_0EC = arg0->unk_14C + vec.y; - arg0->unk_0E8 = arg0->unk_148 + vec.x; - arg0->unk_0F0 = arg0->unk_144 + vec.z; + arg0->unk_0E8.y = arg0->unk_14C + vec.y; + arg0->unk_0E8.x = arg0->unk_148 + vec.x; + arg0->unk_0E8.z = arg0->unk_144 + vec.z; arg0->unk_148 -= arg0->unk_148 * 0.1f; arg0->unk_14C -= arg0->unk_14C * 0.1f; arg0->unk_144 -= arg0->unk_144 * 0.1f; - if ((arg0->obj.pos.y < D_80177940 + 40.0f) && (arg0->unk_0EC < 0.0f) && (D_80177C98 == 0)) { + if ((arg0->obj.pos.y < D_80177940 + 40.0f) && (arg0->unk_0E8.y < 0.0f) && (gLevelType == 0)) { arg0->obj.pos.y = D_80177940 + 40.0f; - arg0->unk_0EC = 0.0f; + arg0->unk_0E8.y = 0.0f; } - arg0->unk_0F0 -= D_80177D08; + arg0->unk_0E8.z -= D_80177D08; return false; } @@ -2081,7 +2082,7 @@ s32 func_80091F00(Object_2F4* arg0) { func_80019218(0x2903300E, &arg0->unk_100, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); func_8007D10C(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 1.5f); - Matrix_RotateY(gCalcMatrix, arg0->unk_0F8 * M_DTOR, 0); + Matrix_RotateY(gCalcMatrix, arg0->unk_0F4.y * M_DTOR, 0); if (Rand_ZeroOne() < 0.5f) { sp40.x = -20.0f; @@ -2107,13 +2108,13 @@ s32 func_80091F00(Object_2F4* arg0) { if ((arg0->unk_0D0 == 3) && (arg0->unk_0D4 == 1)) { switch (arg0->unk_0E4) { case 1: - func_800BA808(gMsg_ID_20210, 10); + func_800BA808(gMsg_ID_20210, RCID_FALCO); break; case 3: - func_800BA808(gMsg_ID_20200, 30); + func_800BA808(gMsg_ID_20200, RCID_PEPPY); break; case 2: - func_800BA808(gMsg_ID_20190, 20); + func_800BA808(gMsg_ID_20190, RCID_SLIPPY); break; } } @@ -2121,13 +2122,13 @@ s32 func_80091F00(Object_2F4* arg0) { if ((arg0->unk_0D0 != 3) && (arg0->unk_0D4 == 1)) { switch (arg0->unk_0E4) { case 1: - func_800BA808(gMsg_ID_20060, 10); + func_800BA808(gMsg_ID_20060, RCID_FALCO); break; case 3: - func_800BA808(gMsg_ID_20070, 30); + func_800BA808(gMsg_ID_20070, RCID_PEPPY); break; case 2: - func_800BA808(gMsg_ID_20080, 20); + func_800BA808(gMsg_ID_20080, RCID_SLIPPY); break; } } @@ -2135,13 +2136,13 @@ s32 func_80091F00(Object_2F4* arg0) { if ((arg0->unk_0D4 == 2) || (arg0->unk_0D4 == 100)) { switch (arg0->unk_0E4) { case 1: - func_800BA808(gMsg_ID_20030, 10); + func_800BA808(gMsg_ID_20030, RCID_FALCO); break; case 3: - func_800BA808(gMsg_ID_20040, 30); + func_800BA808(gMsg_ID_20040, RCID_PEPPY); break; case 2: - func_800BA808(gMsg_ID_20050, 20); + func_800BA808(gMsg_ID_20050, RCID_SLIPPY); break; } } @@ -2151,18 +2152,18 @@ s32 func_80091F00(Object_2F4* arg0) { } void func_80092244(Object_2F4* arg0) { - D_80175A10[arg0->unk_040].unk_00 = 1; - D_80175A10[arg0->unk_040].unk_02 = arg0->unk_0E4; - D_80175A10[arg0->unk_040].pos.x = arg0->obj.pos.x; - D_80175A10[arg0->unk_040].pos.y = arg0->obj.pos.y; - D_80175A10[arg0->unk_040].pos.z = arg0->obj.pos.z; - D_80175A10[arg0->unk_040].unk_10 = arg0->unk_0F8 + 180.0f; + gUnkEntities28[arg0->unk_040].unk_00 = 1; + gUnkEntities28[arg0->unk_040].unk_02 = arg0->unk_0E4; + gUnkEntities28[arg0->unk_040].pos.x = arg0->obj.pos.x; + gUnkEntities28[arg0->unk_040].pos.y = arg0->obj.pos.y; + gUnkEntities28[arg0->unk_040].pos.z = arg0->obj.pos.z; + gUnkEntities28[arg0->unk_040].unk_10 = arg0->unk_0F4.y + 180.0f; } void func_800922F4(Object_2F4* arg0) { s32 temp; - if ((D_801778B0[arg0->unk_0E4] < 64) && (D_80178280[0].unk_1C8 != 7)) { + if ((D_801778B0[arg0->unk_0E4] < 64) && (gPlayer[0].unk_1C8 != 7)) { temp = 7; if (D_801778B0[arg0->unk_0E4] > 16) { temp = 15; @@ -2174,18 +2175,18 @@ void func_800922F4(Object_2F4* arg0) { temp = 63; } - if (!(D_80177DB0 & temp)) { + if (!(gFrameCount & temp)) { func_8007D10C(arg0->obj.pos.x + ((Rand_ZeroOne() - 0.5f) * 10.0f), arg0->obj.pos.y + (Rand_ZeroOne() * 10.0f), arg0->obj.pos.z + ((Rand_ZeroOne() - 0.5f) * 10.0f), 2.2f); } - if (!((temp >> 2) & D_80177DB0)) { + if (!((temp >> 2) & gFrameCount)) { if (Rand_ZeroOne() < 0.5f) { func_8007C120(arg0->obj.pos.x + ((Rand_ZeroOne() - 0.5f) * 30.0f), arg0->obj.pos.y + (Rand_ZeroOne() * 10.0f), - arg0->obj.pos.z + ((Rand_ZeroOne() - 0.5f) * 30.0f), arg0->unk_0E8, arg0->unk_0EC, - arg0->unk_0F0, arg0->unk_110 * 0.07f, 3); + arg0->obj.pos.z + ((Rand_ZeroOne() - 0.5f) * 30.0f), arg0->unk_0E8.x, arg0->unk_0E8.y, + arg0->unk_0E8.z, arg0->unk_110 * 0.07f, 3); } } } @@ -2202,35 +2203,35 @@ void func_800922F4(Object_2F4* arg0) { #pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80093164.s") void func_80093310(void) { - Object_2F4* this = &D_80163FE0[0]; + Object_2F4* this = &gObjects2F4[0]; - func_800613C4(this); + Object_2F4_Initialize(this); this->obj.status = 1; this->obj.pos.x = 0.0f; this->obj.pos.y += 1700.0f; this->obj.pos.z -= 5000.0f; - D_80163FE0->unk_0B6 = 1; + gObjects2F4->unk_0B6 = 1; if (1) {} - this->obj.id = 195; + this->obj.id = OBJECT_195; func_800612B8(&this->unk_01C, this->obj.id); func_80019218(0x11030010, &this->unk_100, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) { s32 i; - Object_8C* var_s0 = &D_80170130[ARRAY_COUNT(D_80170130) - 1]; - UnkStruct_D_80178280* sp24 = D_80178280; + Object_8C* var_s0 = &gObjects8C[ARRAY_COUNT(gObjects8C) - 1]; + Player* sp24 = gPlayer; for (i = 0; i < 100; i++) { if (var_s0->obj.status == 0) { - func_80061474(var_s0); + Object_8C_Initialize(var_s0); var_s0->obj.status = 1; - var_s0->obj.id = 363; + var_s0->obj.id = OBJECT_363; var_s0->obj.pos.x = x; var_s0->obj.pos.y = y; var_s0->obj.pos.z = z; - if ((sp24->unk_1C8 == 2) && (D_80178234 == 13) && (sp24->unk_1D0 < 2)) { + if ((sp24->unk_1C8 == 2) && (gCurrentLevel == LEVEL_AQUAS) && (sp24->unk_1D0 < 2)) { var_s0->unk_6C = 0.4f; var_s0->unk_44 = 0; var_s0->unk_46 = 24; @@ -2239,8 +2240,8 @@ void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) { var_s0->unk_48 = -var_s0->unk_48; } } else { - var_s0->unk_54 = (Rand_ZeroOne() - 0.5f) * 5.0f; - var_s0->unk_58 = (Rand_ZeroOne() - 0.5f) * 3.0f; + var_s0->unk_54.x = (Rand_ZeroOne() - 0.5f) * 5.0f; + var_s0->unk_54.y = (Rand_ZeroOne() - 0.5f) * 3.0f; var_s0->unk_48 = 0; if (Rand_ZeroOne() < 0.5f) { @@ -2268,9 +2269,9 @@ void func_800933D8(f32 x, f32 y, f32 z, f32 arg3) { #pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_800935E8.s") void func_80094954(Object_8C* arg0) { - UnkStruct_D_80178280* temp = D_80178280; + Player* temp = gPlayer; - if ((temp->unk_1C8 == 2) && (D_80178234 == 13) && (temp->unk_1D0 < 2)) { + if ((temp->unk_1C8 == 2) && (gCurrentLevel == LEVEL_AQUAS) && (temp->unk_1D0 < 2)) { switch (arg0->unk_4E) { case 0: arg0->unk_44 += arg0->unk_46; @@ -2290,10 +2291,10 @@ void func_80094954(Object_8C* arg0) { } if ((arg0->unk_4E == 1) && (arg0->unk_4A <= 0)) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + Object_Kill(&arg0->obj, &arg0->unk_80); } - arg0->unk_58 += arg0->unk_6C; + arg0->unk_54.y += arg0->unk_6C; arg0->unk_6C -= 0.05f; if (arg0->unk_6C < -1.0f) { @@ -2311,21 +2312,21 @@ void func_80094954(Object_8C* arg0) { if (temp->unk_1C8 == 6) { arg0->unk_46 = 2; if (temp->unk_1D0 >= 4) { - arg0->unk_58 -= 0.13f; + arg0->unk_54.y -= 0.13f; } } arg0->unk_70 += 0.8f; arg0->unk_4A -= arg0->unk_46; - if ((arg0->unk_4A < 0) || ((temp->unk_1C8 == 2) && (D_80178234 == 13) && (temp->unk_1D0 == 5))) { - func_80060FBC(&arg0->obj, &arg0->unk_80); + if ((arg0->unk_4A < 0) || ((temp->unk_1C8 == 2) && (gCurrentLevel == LEVEL_AQUAS) && (temp->unk_1D0 == 5))) { + Object_Kill(&arg0->obj, &arg0->unk_80); } arg0->obj.rot.z += arg0->unk_48; } void func_80094BBC(Object_8C* arg0) { - if ((D_80178280[0].unk_1C8 == 2) && (D_80178234 == 13) && (D_80178280[0].unk_1D0 < 2)) { + if ((gPlayer[0].unk_1C8 == 2) && (gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].unk_1D0 < 2)) { RCP_SetupDL(&gMasterDisp, 0x44); gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 21, 34, arg0->unk_4A); gDPSetEnvColor(gMasterDisp++, 255, 255, 251, 0); @@ -2346,9 +2347,9 @@ void stub_80094D18(void) { #pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_hud/func_80094D20.s") void func_80095350(Object_2F4* arg0) { - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 2; - arg0->obj.id = 195; + arg0->obj.id = OBJECT_195; arg0->unk_0B6 = 9999; func_800612B8(&arg0->unk_01C, arg0->obj.id); } @@ -2362,9 +2363,9 @@ void func_800953A0(Object_2F4* arg0, s32 arg1) { { -200.0f, 0.0f, -7000.0f }, }; - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 2; - arg0->obj.id = 195; + arg0->obj.id = OBJECT_195; arg0->obj.pos = D_800D2510[arg1]; arg0->obj.pos.z -= D_80177D20; arg0->unk_0B6 = 45; @@ -2381,9 +2382,9 @@ void func_8009546C(Object_2F4* arg0, s32 arg1) { { -1200.0f, 0.0f, -1000.0f }, { -1400.0f, 0.0f, 700.0f }, }; - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 2; - arg0->obj.id = 195; + arg0->obj.id = OBJECT_195; arg0->obj.pos = D_800D2540[arg1]; arg0->obj.pos.z -= D_80177D20; arg0->unk_0B6 = 46; @@ -2400,9 +2401,9 @@ void func_80095538(Object_2F4* arg0, s32 arg1) { { 300.0f, 0.0f, -1700.0f }, { -260.0f, 0.0f, -2000.0f }, { -200.0f, 0.0f, -2600.0f }, }; - func_800613C4(arg0); + Object_2F4_Initialize(arg0); arg0->obj.status = 2; - arg0->obj.id = 195; + arg0->obj.id = OBJECT_195; arg0->obj.pos = D_800D257C[arg1]; arg0->obj.pos.z -= D_80177D20; arg0->unk_0B6 = 47; diff --git a/src/overlays/ovl_DF4260/DF4260.c b/src/overlays/ovl_DF4260/DF4260.c index 6ab253f1..afc87209 100644 --- a/src/overlays/ovl_DF4260/DF4260.c +++ b/src/overlays/ovl_DF4260/DF4260.c @@ -4,7 +4,7 @@ void func_DF4260_80187520(s32 arg0, s32 arg1) { } -void func_DF4260_80187530(s32 arg0) { +void func_DF4260_80187530(Object_80* arg0) { } #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018753C.s") diff --git a/src/overlays/ovl_DF4260/DFEE30.c b/src/overlays/ovl_DF4260/DFEE30.c index 095a0d9e..fc458cf0 100644 --- a/src/overlays/ovl_DF4260/DFEE30.c +++ b/src/overlays/ovl_DF4260/DFEE30.c @@ -14,7 +14,7 @@ void func_DF4260_801924A8(UnkStruct_func_DF4260_801924A8* arg0) { switch (arg0->unk48) { case 0: - if (D_80178280[0].unk_07C < arg0->unkC) { + if (gPlayer[0].unk_07C < arg0->unkC) { D_80177AB0 = 0; D_80177A98 = 0; arg0->unk48++; diff --git a/src/overlays/ovl_EBFBE0/fox_option.c b/src/overlays/ovl_EBFBE0/fox_option.c index 97d7cbb6..1b20373d 100644 --- a/src/overlays/ovl_EBFBE0/fox_option.c +++ b/src/overlays/ovl_EBFBE0/fox_option.c @@ -371,12 +371,12 @@ void func_EBFBE0_80191B20(void) { D_80178354 = 0; D_80178340 = 0; - D_80161A38 = 0xFF; + gBlurAlpha = 0xFF; - D_80161A36 = 0; + gBgColor = 0; D_EBFBE0_801B91A4 = 0; - if ((D_80161A34 == 7) && (D_80178234 == 10)) { + if ((D_80161A34 == 7) && (gCurrentLevel == LEVEL_TRAINING)) { D_80161A34 = 0; D_EBFBE0_801B91A4 = 1; } @@ -387,7 +387,7 @@ void func_EBFBE0_80191B20(void) { var_v0_2 = gExpertMode; gExpertMode = false; - D_80177DB0 = 0; + gFrameCount = 0; D_EBFBE0_801B8284 = 0; D_EBFBE0_801B9178 = 0; D_EBFBE0_801B917C = 0; @@ -504,7 +504,7 @@ void func_EBFBE0_80191B20(void) { D_EBFBE0_801B91EC = 0; D_EBFBE0_801B9244 = 0; D_EBFBE0_801B9248 = 0; - func_8001D444(0, 0x24, 0, 0xFF); + func_8001D444(0, 36, 0, 255); } void func_EBFBE0_801920C4(void) { @@ -533,7 +533,7 @@ void func_EBFBE0_801920C4(void) { func_EBFBE0_80192190(); break; } - D_80177DB0++; + gFrameCount++; } void func_EBFBE0_80192190(void) { @@ -665,7 +665,7 @@ void func_EBFBE0_80192340(void) { } void func_EBFBE0_801924C4(void) { - D_80161A38 = 0xFF; + gBlurAlpha = 0xFF; D_EBFBE0_801B912C = 0; switch (D_EBFBE0_801B9124) { @@ -752,7 +752,7 @@ void func_EBFBE0_801928BC(void) { if (D_80178340 == 0xFF) { D_80178410 = 0; D_EBFBE0_801B9124 = 100; - D_80177834 = 4; + gGameState = GSTATE_MAP; D_8017783C = 2; D_80177B40 = 0; D_80177898 = 0; @@ -767,8 +767,8 @@ void func_EBFBE0_801928BC(void) { void func_EBFBE0_80192938(void) { if (D_80178340 == 0xFF) { - D_80178234 = 0xA; - D_80177834 = 7; + gCurrentLevel = LEVEL_TRAINING; + gGameState = GSTATE_PLAY; D_8017783C = 2; D_80177854 = 0; D_80177898 = 0; @@ -780,7 +780,7 @@ void func_EBFBE0_80192938(void) { func_8001DC6C(0, 28); } else { D_80178340 += 0x20; - if (D_80178340 >= 0x100) { + if (D_80178340 > 0xFF) { D_80178340 = 0xFF; } } @@ -790,7 +790,7 @@ void func_EBFBE0_801929F0(void) { s32 i; D_800D2870 = 0; - D_80161A38 = 0xFF; + gBlurAlpha = 0xFF; gStopInputTimer = 0; D_80178410 = 800; D_EBFBE0_801B9248 = 0; @@ -874,7 +874,7 @@ void func_EBFBE0_80192D58(void) { D_EBFBE0_801AE620[i], 0.1f); } - D_80161A38 += 4; + gBlurAlpha += 4; if (D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_38.unk_04 == D_EBFBE0_801AE570[D_EBFBE0_801B91A4]) { for (i = 0; i < 6; i++) { @@ -883,7 +883,7 @@ void func_EBFBE0_80192D58(void) { D_EBFBE0_801AE638[i].unk_00.unk_1C = D_EBFBE0_801AE5D0[i]; } D_EBFBE0_801B91BC = 1; - D_80161A38 = 0xFF; + gBlurAlpha = 0xFF; D_EBFBE0_801B912C = 1; } break; @@ -949,7 +949,7 @@ void func_EBFBE0_80192D58(void) { break; case 11: - D_80161A38 = 0x10; + gBlurAlpha = 0x10; D_EBFBE0_801B9178 = 3; D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_38.unk_0C -= 0.01f; D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_38.unk_10 -= 0.01f; @@ -1000,11 +1000,11 @@ void func_EBFBE0_80192D58(void) { Math_SmoothStepToF(&D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_00.unk_1C, var_fs0, 0.25f, 100.0f, 0.1f); Math_SmoothStepToF(&D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_38.unk_04, var_fs1, 0.25f, 100.0f, 0.1f); - D_80161A38 += 4; + gBlurAlpha += 4; if ((D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_00.unk_1C == var_fs0) && (D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_38.unk_04 == var_fs1)) { - D_80161A38 += 255; + gBlurAlpha += 255; D_EBFBE0_801B9124 = D_EBFBE0_801B91A4; if (D_EBFBE0_801B91A4 == 4 && D_EBFBE0_801B91AC) { @@ -1020,7 +1020,7 @@ void func_EBFBE0_80192D58(void) { D_EBFBE0_801B8284 += 18; } else { D_80178410 = 0; - D_80177834 = 2; + gGameState = GSTATE_TITLE; D_8017783C = 2; D_80177AE0 = 0; D_EBFBE0_801B827C = 1; @@ -1066,7 +1066,7 @@ void func_EBFBE0_80193864(void) { void func_EBFBE0_80193B04(void) { s32 i; - D_80161A38 = 0xFF; + gBlurAlpha = 0xFF; gStopInputTimer = 0; D_80178410 = 800; @@ -1141,7 +1141,7 @@ void func_EBFBE0_80193C4C(void) { Math_SmoothStepToF(&D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_00.unk_1C, 25.0f, 0.25f, 100.0f, 0.1f); Math_SmoothStepToF(&D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_38.unk_04, 90.0f, 0.25f, 100.0f, 0.1f); - D_80161A38 += 4; + gBlurAlpha += 4; if (D_EBFBE0_801AE878[D_EBFBE0_801B91A8].unk_38.unk_04 == D_EBFBE0_801AEF84[D_EBFBE0_801B91A8]) { for (i = 0; i < 3; i++) { @@ -1153,7 +1153,7 @@ void func_EBFBE0_80193C4C(void) { D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_00.unk_1C = 25.0f; D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_38.unk_04 = 90.0f; D_EBFBE0_801B91BC = 1; - D_80161A38 = 0xFF; + gBlurAlpha = 0xFF; D_EBFBE0_801B912C = 1; } break; @@ -1180,7 +1180,7 @@ void func_EBFBE0_80193C4C(void) { break; case 11: - D_80161A38 = 0x10; + gBlurAlpha = 0x10; D_EBFBE0_801B9178 = 5; D_EBFBE0_801AE878[D_EBFBE0_801B91A8].unk_38.unk_0C -= 0.01f; D_EBFBE0_801AE878[D_EBFBE0_801B91A8].unk_38.unk_10 -= 0.01f; @@ -1229,11 +1229,11 @@ void func_EBFBE0_80193C4C(void) { Math_SmoothStepToF(&D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_00.unk_1C, -10.0f, 0.35f, 100.0f, 0.1f); Math_SmoothStepToF(&D_EBFBE0_801AE638[D_EBFBE0_801B91A4].unk_38.unk_04, 150.0f, 0.35f, 100.0f, 0.1f); - D_80161A38 += 4; + gBlurAlpha += 4; if ((var_fs0 == D_EBFBE0_801AE878[D_EBFBE0_801B91A8].unk_00.unk_1C) && (D_EBFBE0_801AE878[D_EBFBE0_801B91A8].unk_38.unk_04 == -15.5f)) { - D_80161A38 += 0xFF; + gBlurAlpha += 0xFF; D_EBFBE0_801B9124 = (D_EBFBE0_801B91A8 + 1) * 10; D_801778AC = D_EBFBE0_801B91A8; D_EBFBE0_801B91C4 = 1; @@ -1278,30 +1278,30 @@ void func_EBFBE0_80194678(void) { D_EBFBE0_801B91BC = 1; D_EBFBE0_801B91A0 = 0; - D_80177C74 = gSaveFile.save.data.unk_14; - func_800182F4(D_EBFBE0_801AE998[D_80177C74] | 0xE0000000); + gSoundMode = gSaveFile.save.data.soundMode; + func_800182F4(D_EBFBE0_801AE998[gSoundMode] | 0xE0000000); - D_80177C80[0] = gSaveFile.save.data.unk_15; - D_80177C80[1] = gSaveFile.save.data.unk_16; - D_80177C80[2] = gSaveFile.save.data.unk_17; + gVolumeSettings[0] = gSaveFile.save.data.musicVolume; + gVolumeSettings[1] = gSaveFile.save.data.voiceVolume; + gVolumeSettings[2] = gSaveFile.save.data.sfxVolume; - if (D_80177C80[0] > 99) { - D_80177C80[0] = 99; + if (gVolumeSettings[0] > 99) { + gVolumeSettings[0] = 99; } - if (D_80177C80[1] > 99) { - D_80177C80[1] = 99; + if (gVolumeSettings[1] > 99) { + gVolumeSettings[1] = 99; } - if (D_80177C80[2] > 99) { - D_80177C80[2] = 99; + if (gVolumeSettings[2] > 99) { + gVolumeSettings[2] = 99; } - func_8001D8A8(0, D_80177C80[0]); - func_8001D8A8(1, D_80177C80[1]); - func_8001D8A8(2, D_80177C80[2]); + func_8001D8A8(0, gVolumeSettings[0]); + func_8001D8A8(1, gVolumeSettings[1]); + func_8001D8A8(2, gVolumeSettings[2]); - D_EBFBE0_801AEB48[0].unk_18 = D_80177C80[0] + 146.0f; - D_EBFBE0_801AEB48[1].unk_18 = D_80177C80[1] + 146.0f; - D_EBFBE0_801AEB48[2].unk_18 = D_80177C80[2] + 146.0f; + D_EBFBE0_801AEB48[0].unk_18 = gVolumeSettings[0] + 146.0f; + D_EBFBE0_801AEB48[1].unk_18 = gVolumeSettings[1] + 146.0f; + D_EBFBE0_801AEB48[2].unk_18 = gVolumeSettings[2] + 146.0f; D_EBFBE0_801B9288 = 0; D_EBFBE0_801B9284 = 0; @@ -1340,7 +1340,7 @@ void func_EBFBE0_801948A8(void) { temp = func_EBFBE0_8019C418(&D_EBFBE0_801B9288, 3, 1, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9250); if (temp != 0) { D_EBFBE0_801B9270[sp34] = 255.0f; - func_80019218(0x49000002U, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); } if (D_EBFBE0_801B9288 == 0) { @@ -1375,17 +1375,17 @@ void func_EBFBE0_801948A8(void) { } void func_EBFBE0_80194AEC(void) { - s32 sp3C = D_80177C74; + s32 sp3C = gSoundMode; s32 pad; if (func_EBFBE0_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, D_80177AF8, &D_EBFBE0_801B9260) != 0) { func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - D_80177C74 = sp3C; - if (D_80177C74 >= 3) { - D_80177C74 = 0; + gSoundMode = sp3C; + if (gSoundMode >= 3) { + gSoundMode = 0; } - gSaveFile.save.data.unk_14 = D_80177C74; - func_800182F4(D_EBFBE0_801AE998[D_80177C74] | 0xE0000000); + gSaveFile.save.data.soundMode = gSoundMode; + func_800182F4(D_EBFBE0_801AE998[gSoundMode] | 0xE0000000); } } @@ -1397,7 +1397,7 @@ void func_EBFBE0_80194BD0(void) { if (func_EBFBE0_8019C66C(&(D_EBFBE0_801AEB48[D_EBFBE0_801B9288 - 1].unk_18), 146.0f, 245.0f, &D_EBFBE0_801B9268)) { var_v1 = D_EBFBE0_801AEB48[D_EBFBE0_801B9288 - 1].unk_18 - 146.0f; - D_80177C80[D_EBFBE0_801B9288 - 1] = var_v1; + gVolumeSettings[D_EBFBE0_801B9288 - 1] = var_v1; if (var_v1 > 99) { var_v1 = 99; @@ -1405,15 +1405,15 @@ void func_EBFBE0_80194BD0(void) { switch (D_EBFBE0_801B9288 - 1) { case 0: - gSaveFile.save.data.unk_15 = var_v1; + gSaveFile.save.data.musicVolume = var_v1; break; case 1: - gSaveFile.save.data.unk_16 = var_v1; + gSaveFile.save.data.voiceVolume = var_v1; break; case 2: - gSaveFile.save.data.unk_17 = var_v1; + gSaveFile.save.data.sfxVolume = var_v1; break; } func_8001D8A8(D_EBFBE0_801B924C, var_v1); @@ -1475,7 +1475,7 @@ void func_EBFBE0_80194CE4(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255); - switch (D_80177C74) { + switch (gSoundMode) { case 0: TextureRect_8bIA(&gMasterDisp, D_800CD90, 56, 13, D_EBFBE0_801AEFA8[8], D_EBFBE0_801AEFD4[8], 1.0f, 1.0f); break; @@ -1639,7 +1639,7 @@ void func_EBFBE0_80195944(void) { if (gChangedInput[D_80177AF8].button & B_BUTTON) { if (!D_EBFBE0_801B9320) { func_80019218(0x49000021, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_8001D444(0, 0x24, 0, 0xFF); + func_8001D444(0, 36, 0, 255); D_80177898 = 0; D_EBFBE0_801B9124 = 1000; D_EBFBE0_801B912C = 0; @@ -1796,7 +1796,7 @@ void func_EBFBE0_801962A4(void) { break; } D_80177898 = 0; - D_EBFBE0_801B9124 = 0x3E8; + D_EBFBE0_801B9124 = 1000; D_EBFBE0_801B912C = 0; D_EBFBE0_801B9244 = 1; break; @@ -1943,13 +1943,13 @@ void func_EBFBE0_80196894(void) { } } - if (D_80177DB0 & sp74[1]) { + if (gFrameCount & sp74[1]) { sp7C[1] = D_EBFBE0_801AED20[1]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, sp7C[1], sp7C[1], 255); TextureRect_8bIA(&gMasterDisp, D_8009980, 32, 12, D_EBFBE0_801AF094[1], D_EBFBE0_801AF0AC[1], 1.0f, 1.0f); } - if (D_80177DB0 & sp74[0]) { + if (gFrameCount & sp74[0]) { sp7C[0] = D_EBFBE0_801AED20[0]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, sp7C[0], sp7C[0], 255); TextureRect_8bIA(&gMasterDisp, D_8009B00, 40, 12, D_EBFBE0_801AF094[2], D_EBFBE0_801AF0AC[2], 1.0f, 1.0f); @@ -2779,7 +2779,7 @@ void func_EBFBE0_80199820(s32 arg0) { D_EBFBE0_801B9348[arg0]--; } - if (D_80177DB0 & var_v0) { + if (gFrameCount & var_v0) { colorGB = D_EBFBE0_801B9358[arg0]; gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); @@ -2958,7 +2958,7 @@ void func_EBFBE0_8019A214(void) { void func_EBFBE0_8019A298(void) { if (D_EBFBE0_801B91EC == 0.0f) { - D_80177834 = 6; + gGameState = GSTATE_VS_INIT; D_8017783C = 2; D_8017784C = 0; D_80177898 = 0; @@ -2984,7 +2984,7 @@ void func_EBFBE0_8019A2E0(void) { } if (func_EBFBE0_8019C418(&D_EBFBE0_801B93D4, 4, 0, 0, 20, 2, 4, i, &D_EBFBE0_801B9380[i])) { - func_80019218(0x49000002U, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); D_801778A4 = D_EBFBE0_801B93D4 + 1; } @@ -3190,7 +3190,7 @@ void func_EBFBE0_8019AB30(void) { } } - if (D_80177DB0 & var_v0) { + if (gFrameCount & var_v0) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); @@ -3250,7 +3250,7 @@ void func_EBFBE0_8019AD84(void) { } } - if (D_80177DB0 & var_v0) { + if (gFrameCount & var_v0) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); @@ -3308,7 +3308,7 @@ void func_EBFBE0_8019AFFC(void) { D_EBFBE0_801B91F0 = 1; } - if (D_80177DB0 & var_v0) { + if (gFrameCount & var_v0) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); @@ -3429,7 +3429,7 @@ void func_EBFBE0_8019B5AC(void) { } } - if (D_80177DB0 & var_v0) { + if (gFrameCount & var_v0) { RCP_SetupDL(&gMasterDisp, 0x53); gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255); TextureRect_8bIA(&gMasterDisp, D_7003650, 40, 12, 143.0f, 210.0f, 1.0f, 1.0f); @@ -3852,10 +3852,10 @@ s32 func_EBFBE0_8019C8C4(void) { break; } - if (temp[j] <= D_80161AA0[D_801778A0]) { - if (temp[j] == D_80161AA0[D_801778A0]) { + if (temp[j] <= gLifeCount[D_801778A0]) { + if (temp[j] == gLifeCount[D_801778A0]) { for (k = j; k < 10; k++) { - if ((temp[k] != D_80161AA0[D_801778A0]) || (D_EBFBE0_801B8220[k] != D_80161714)) { + if ((temp[k] != gLifeCount[D_801778A0]) || (D_EBFBE0_801B8220[k] != D_80161714)) { ret = k; break; } @@ -3905,7 +3905,7 @@ void func_EBFBE0_8019CAE0(void) { case 3: if (D_EBFBE0_801B917C == 0) { - D_80161A38 = 255; + gBlurAlpha = 255; D_80177898 = 0; D_EBFBE0_801B912C = 0; D_EBFBE0_801B9124 = 300; @@ -3920,7 +3920,7 @@ void func_EBFBE0_8019CBC0(void) { func_8001D444(0, 36, 0, 255); - D_80161A38 = 0xD0; + gBlurAlpha = 0xD0; D_80178410 = 800; D_EBFBE0_801B9130 = 1; @@ -3963,7 +3963,7 @@ void func_EBFBE0_8019CD54(void) { if (D_EBFBE0_801B9138 == 0) { if (func_EBFBE0_8019C418(&D_EBFBE0_801B90A0[D_EBFBE0_801B9098], 36, 0, 0, 50, 5, 10, D_80177AF8, &D_EBFBE0_801B9160[D_EBFBE0_801B9098]) != 0) { - func_80019218(0x49000002U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_80019218(0x49000002, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); D_EBFBE0_801B9150[D_EBFBE0_801B9098][0] = D_EBFBE0_801AEF5C[D_EBFBE0_801B90A0[D_EBFBE0_801B9098]]; D_EBFBE0_801B90D0[D_EBFBE0_801B9098] = 0.0f; D_EBFBE0_801B9100[D_EBFBE0_801B9098] = 0.0f; @@ -3973,7 +3973,7 @@ void func_EBFBE0_8019CD54(void) { if (gChangedInput[D_80177AF8].button & A_BUTTON) { D_EBFBE0_801B90D0[D_EBFBE0_801B9098] = 0.0f; if (D_EBFBE0_801B9138 != 0) { - func_80019218(0x49000003U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); D_EBFBE0_801B9140[0] = 10; D_EBFBE0_801B9140[1] = 10; D_EBFBE0_801B9140[2] = 10; @@ -3983,7 +3983,7 @@ void func_EBFBE0_8019CD54(void) { } else { if (D_EBFBE0_801B9098 < 3) { - func_80019218(0x49000003U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_80019218(0x49000003, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); D_EBFBE0_801B90D0[D_EBFBE0_801B9098] = 0.0f; D_EBFBE0_801B9140[D_EBFBE0_801B9098] = 15; D_EBFBE0_801B9128 = 1; @@ -3993,7 +3993,7 @@ void func_EBFBE0_8019CD54(void) { } if ((gChangedInput[D_80177AF8].button & B_BUTTON) && (D_EBFBE0_801B9098 != 0)) { - func_80019218(0x4900101DU, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C); + func_80019218(0x4900101D, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C); if (D_EBFBE0_801B9138 != 0) { D_EBFBE0_801B9138 = 0; } @@ -4073,7 +4073,7 @@ void func_EBFBE0_8019D118(void) { Graphics_DisplaySmallText(D_EBFBE0_801AF30C[2], D_EBFBE0_801AF324[2], 1.0f, 1.0f, "TOTAL HITS"); (void) "p:%d x:%f y:%f\n"; if (D_EBFBE0_801B9138 == 1) { - if (D_80177DB0 & 0x10) { + if (gFrameCount & 0x10) { gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255); TextureRect_8bIA(&gMasterDisp, D_50021F0, 32, 8, D_EBFBE0_801AF30C[5], D_EBFBE0_801AF324[5], 1.0f, 1.0f); } @@ -4118,7 +4118,7 @@ void func_EBFBE0_8019D118(void) { Matrix_SetGfxMtx(&gMasterDisp); for (i = 0; i < 3; i++) { - if (D_80177DB0 & mask[i]) { + if (gFrameCount & mask[i]) { func_EBFBE0_8019DB20(D_EBFBE0_801B9150[i][0], D_EBFBE0_801AF300[i], 18.0f, -455.0f, 1.0f, D_EBFBE0_801B90C0[i] + D_EBFBE0_801B90F0[i], D_EBFBE0_801B90D0[i] + D_EBFBE0_801B9100[i], @@ -4147,7 +4147,7 @@ void func_EBFBE0_8019D624(void) { sp122[10] = D_80177B48 + 1; - sp116[10] = D_80161AA0[0]; + sp116[10] = gLifeCount[0]; sp10A[10] = 0; @@ -4343,8 +4343,8 @@ void func_EBFBE0_8019DE74(void) { if (D_80161A34 == 5) { D_80178410 = 0; - D_80177834 = 1; - D_80161AA0[0] = 2; + gGameState = GSTATE_INIT; + gLifeCount[0] = 2; D_80161714 = 0; } else if (D_80161A34 == 8) { func_800182F4(0x100100FF); @@ -4366,7 +4366,7 @@ void func_EBFBE0_8019E030(void) { switch (D_EBFBE0_801B912C) { case 0: D_80178410 = 0; - D_80161A36 = 0; + gBgColor = 0; D_80178348 = 0; D_80178350 = 0; D_80178354 = 0; @@ -4401,9 +4401,9 @@ void func_EBFBE0_8019E030(void) { case 3: if (D_EBFBE0_801B9178 == 0) { D_80178410 = 0; - D_80177834 = 1; + gGameState = GSTATE_INIT; D_80177898 = 0; - *D_80161AA0 = 2; + *gLifeCount = 2; D_80161714 = 0; } break; diff --git a/src/overlays/ovl_EBFBE0/fox_title.c b/src/overlays/ovl_EBFBE0/fox_title.c index 3a7008ac..31126959 100644 --- a/src/overlays/ovl_EBFBE0/fox_title.c +++ b/src/overlays/ovl_EBFBE0/fox_title.c @@ -32,7 +32,7 @@ u16* D_EBFBE0_801ADA30[5] = { void func_EBFBE0_801875E0(void) { D_80137E78 = 2; - D_80177DB0 = 0; + gFrameCount = 0; D_80177AE0 = 2; @@ -46,11 +46,11 @@ void func_EBFBE0_801875E0(void) { D_80178354 = 0; D_80178340 = 0; - D_80178320 = 0; - D_80178328 = 0; - D_80178330 = 0; + gFogRed = 0; + gFogGreen = 0; + gFogBlue = 0; - D_80161A36 = 0; + gBgColor = 0; D_EBFBE0_801B8284 = 0; D_EBFBE0_801B82A8 = 0; @@ -102,7 +102,7 @@ void func_EBFBE0_80187754(void) { func_EBFBE0_801877F0(); break; } - D_80177DB0++; + gFrameCount++; } void func_EBFBE0_801877F0(void) { @@ -257,7 +257,7 @@ void func_EBFBE0_80187B00(void) { break; } - if ((D_EBFBE0_801B82A8 == 0) && ((D_80177DB0 & 7) == 7) && (D_EBFBE0_801B8288 < 10)) { + if ((D_EBFBE0_801B82A8 == 0) && ((gFrameCount & 7) == 7) && (D_EBFBE0_801B8288 < 10)) { D_EBFBE0_801B8288++; } } @@ -662,7 +662,7 @@ void func_EBFBE0_801888E8(void) { } if (D_EBFBE0_801B82B0 == 0) { - if (D_80177DB0 & 0x80) { + if (gFrameCount & 0x80) { if (D_EBFBE0_801B8350[1].unk_20 + D_EBFBE0_801B8350[1].unk_24 < -20.0f) { D_EBFBE0_801B8350[1].unk_24 = 4.0f; } @@ -739,12 +739,12 @@ void func_EBFBE0_80189208(void) { s32 i; static s32 D_EBFBE0_801ADA84[4] = { 0, 1, 3, 2 }; - D_80178548 = D_EBFBE0_801B82F8; - D_8017854C = D_EBFBE0_801B82FC; - D_80178550 = D_EBFBE0_801B8300; - D_80178554 = D_EBFBE0_801B8304; - D_80178558 = D_EBFBE0_801B8308; - D_8017855C = D_EBFBE0_801B830C; + gLight1R = D_EBFBE0_801B82F8; + gLight1G = D_EBFBE0_801B82FC; + gLight1B = D_EBFBE0_801B8300; + gAmbientR = D_EBFBE0_801B8304; + gAmbientG = D_EBFBE0_801B8308; + gAmbientB = D_EBFBE0_801B830C; if ((D_EBFBE0_801B86A4 < 2) && (D_EBFBE0_801B9040 != 0)) { D_EBFBE0_801B86D8 = Math_Atan2F(-D_EBFBE0_801B9060, sqrtf((-D_EBFBE0_801B905C * -D_EBFBE0_801B905C) + @@ -764,13 +764,13 @@ void func_EBFBE0_80189208(void) { D_EBFBE0_801B8350[D_EBFBE0_801ADA84[i]].unk_58 += D_EBFBE0_801B8350[D_EBFBE0_801ADA84[i]].unk_5C; } - D_80178548 = D_EBFBE0_801B8310; - D_8017854C = D_EBFBE0_801B8314; - D_80178550 = D_EBFBE0_801B8318; + gLight1R = D_EBFBE0_801B8310; + gLight1G = D_EBFBE0_801B8314; + gLight1B = D_EBFBE0_801B8318; - D_80178554 = D_EBFBE0_801B831C; - D_80178558 = D_EBFBE0_801B8320; - D_8017855C = D_EBFBE0_801B8324; + gAmbientR = D_EBFBE0_801B831C; + gAmbientG = D_EBFBE0_801B8320; + gAmbientB = D_EBFBE0_801B8324; func_EBFBE0_80191674(D_EBFBE0_801B86D0, D_EBFBE0_801B86D4, 100.0f, &D_EBFBE0_801B82E0, &D_EBFBE0_801B82E4, &D_EBFBE0_801B82E8); @@ -821,12 +821,12 @@ void func_EBFBE0_801894E8(void) { D_EBFBE0_801B86C8 = 0.0f; D_EBFBE0_801B86CC = 162.0f; - D_80178548 = 101; - D_8017854C = 106; - D_80178550 = 92; - D_80178554 = 3; - D_80178558 = 4; - D_8017855C = 10; + gLight1R = 101; + gLight1G = 106; + gLight1B = 92; + gAmbientR = 3; + gAmbientG = 4; + gAmbientB = 10; D_EBFBE0_801B8688.pos.y = 0.0f; D_EBFBE0_801B8688.unk_0C = 0; @@ -880,7 +880,7 @@ void func_EBFBE0_8018994C(void) { D_8017829C = 0; D_80178300 = 0; - D_800D4A70 = 0; + sCurrentMsgPri = 0; break; case 100: @@ -978,11 +978,11 @@ void func_EBFBE0_8018994C(void) { if (D_EBFBE0_801B82B8 == 638) { func_80019218(0x11030010, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); func_80019218(0x31024059, &D_EBFBE0_801B867C, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); - func_800BA808(gMsg_ID_60, 300); + func_800BA808(gMsg_ID_60, RCID_ROB64_TITLE); } if (D_EBFBE0_801B82B8 == 838) { - func_EBFBE0_801919C4(D_EBFBE0_801ADA30, 310); + func_EBFBE0_801919C4(D_EBFBE0_801ADA30, RCID_PEPPER_TITLE); } if (D_EBFBE0_801B82A8 == 1) { @@ -1048,8 +1048,8 @@ void func_EBFBE0_8018994C(void) { } if (D_80178340 == 255) { - func_8001A55C((f32*) &D_EBFBE0_801B867C, 0x11030010); - func_8001A55C((f32*) &D_EBFBE0_801B867C, 0x31024059); + func_8001A55C(&D_EBFBE0_801B867C, 0x11030010); + func_8001A55C(&D_EBFBE0_801B867C, 0x31024059); D_EBFBE0_801B82C0 = 0; @@ -1249,7 +1249,7 @@ void func_EBFBE0_8018A644(void) { if (D_EBFBE0_801B7BEC == 795) { func_8001A838(0x49000014); - func_8001A55C(&D_EBFBE0_801B84D8.x, 0x0140001C); + func_8001A55C(&D_EBFBE0_801B84D8, 0x0140001C); D_EBFBE0_801B82C0 = 0; @@ -1285,7 +1285,7 @@ void func_EBFBE0_8018A990(void) { { 255.0f, 255.0f, 155.0f }, }; - if ((D_80177DB0 & 7) == 7) { + if ((gFrameCount & 7) == 7) { if (D_EBFBE0_801B8338 != 0) { D_EBFBE0_801B8334 = (D_EBFBE0_801B8334 + 1) & 3; D_EBFBE0_801B8328 = D_EBFBE0_801ADF54[D_EBFBE0_801B8334].unk_0; @@ -1299,25 +1299,25 @@ void func_EBFBE0_8018A990(void) { D_EBFBE0_801B8338 ^= 1; } - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { D_EBFBE0_801B86CC += 30.0f; if (D_EBFBE0_801B86CC > 90.0f) { D_EBFBE0_801B86CC = -90.0f; } } - D_80178554 = D_EBFBE0_801B8328; - D_80178558 = D_EBFBE0_801B832C; - D_8017855C = D_EBFBE0_801B8330; + gAmbientR = D_EBFBE0_801B8328; + gAmbientG = D_EBFBE0_801B832C; + gAmbientB = D_EBFBE0_801B8330; func_EBFBE0_8018F438(); - D_80178548 = D_EBFBE0_801B82F8; - D_8017854C = D_EBFBE0_801B82FC; - D_80178550 = D_EBFBE0_801B8300; - D_80178554 = D_EBFBE0_801B8304; - D_80178558 = D_EBFBE0_801B8308; - D_8017855C = D_EBFBE0_801B830C; + gLight1R = D_EBFBE0_801B82F8; + gLight1G = D_EBFBE0_801B82FC; + gLight1B = D_EBFBE0_801B8300; + gAmbientR = D_EBFBE0_801B8304; + gAmbientG = D_EBFBE0_801B8308; + gAmbientB = D_EBFBE0_801B830C; for (i = 0; i < 4; i++) { func_EBFBE0_8018E67C(i); @@ -1334,12 +1334,12 @@ void func_EBFBE0_8018ABC0(void) { D_80178348 = 0; D_80178350 = 0; D_80178354 = 0; - D_80178548 = 101; - D_8017854C = 106; - D_80178550 = 92; - D_80178554 = 3; - D_80178558 = 4; - D_8017855C = 10; + gLight1R = 101; + gLight1G = 106; + gLight1B = 92; + gAmbientR = 3; + gAmbientG = 4; + gAmbientB = 10; D_EBFBE0_801B86A8 = 10.0f; D_EBFBE0_801B86AC = -30.0f; @@ -1388,8 +1388,8 @@ void func_EBFBE0_8018ACEC(void) { } if (D_80178340 == 255) { - func_8001A55C(&D_EBFBE0_801B867C.x, 0x11030010); - func_8001A55C(&D_EBFBE0_801B867C.x, 0x31024059); + func_8001A55C(&D_EBFBE0_801B867C, 0x11030010); + func_8001A55C(&D_EBFBE0_801B867C, 0x31024059); D_80177898 = 0; @@ -1457,12 +1457,12 @@ void func_EBFBE0_8018B058(void) { D_EBFBE0_801B86C8 = -360.0f; D_EBFBE0_801B86CC = 131.0f; - D_80178548 = 90; - D_8017854C = 75; - D_80178550 = 90; - D_80178554 = 45; - D_80178558 = 34; - D_8017855C = 56; + gLight1R = 90; + gLight1G = 75; + gLight1B = 90; + gAmbientR = 45; + gAmbientG = 34; + gAmbientB = 56; D_EBFBE0_801B8688.pos.x = 0.0f; D_EBFBE0_801B8688.pos.y = 0.0f; @@ -1583,7 +1583,7 @@ void func_EBFBE0_8018B5C4(void) { 100.0f, 0.01f); D_EBFBE0_801B84E8[i].unk_10 *= 1.04f; if (temp[i] == 0.0f) { - func_8001A55C((f32*) &D_EBFBE0_801B84E8[i].unk_50, 0x1950107A); + func_8001A55C(&D_EBFBE0_801B84E8[i].unk_50, 0x1950107A); } } } @@ -1633,13 +1633,13 @@ void func_EBFBE0_8018B5C4(void) { D_EBFBE0_801B82F0 = 45.0f; D_EBFBE0_801B82F4 = 60.0f; - D_80178548 = D_EBFBE0_801B82EC; - D_8017854C = D_EBFBE0_801B82F0; - D_80178550 = D_EBFBE0_801B82F4; + gLight1R = D_EBFBE0_801B82EC; + gLight1G = D_EBFBE0_801B82F0; + gLight1B = D_EBFBE0_801B82F4; - D_80178554 = 35; - D_80178558 = 24; - D_8017855C = 46; + gAmbientR = 35; + gAmbientG = 24; + gAmbientB = 46; D_EBFBE0_801B82C0++; } @@ -1666,9 +1666,9 @@ void func_EBFBE0_8018B5C4(void) { Math_SmoothStepToF(&D_EBFBE0_801B82F0, 240.0f, 0.06f, 2.0f, 0.01f); Math_SmoothStepToF(&D_EBFBE0_801B82F4, 255.0f, 0.06f, 2.0f, 0.01f); - D_80178548 = D_EBFBE0_801B82EC; - D_8017854C = D_EBFBE0_801B82F0; - D_80178550 = D_EBFBE0_801B82F4; + gLight1R = D_EBFBE0_801B82EC; + gLight1G = D_EBFBE0_801B82F0; + gLight1B = D_EBFBE0_801B82F4; } if ((D_EBFBE0_801B82B4 > 60) && (D_80178340 < 255)) { @@ -1702,7 +1702,7 @@ void func_EBFBE0_8018B5C4(void) { case 3: if (D_EBFBE0_801B82A8 == 0) { - func_8001A55C((f32*) &D_EBFBE0_801B84E8[3].unk_50, 0x0100001E); + func_8001A55C(&D_EBFBE0_801B84E8[3].unk_50, 0x0100001E); func_80019218(0x09000002, &D_EBFBE0_801B84E8[3].unk_50, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C); D_EBFBE0_801B82A8 = 4; @@ -1823,12 +1823,12 @@ void func_EBFBE0_8018C1C0(void) { D_EBFBE0_801B86C8 = 0.0f; D_EBFBE0_801B86CC = 0.0f; - D_80178548 = 101; - D_8017854C = 106; - D_80178550 = 92; - D_80178554 = 3; - D_80178558 = 4; - D_8017855C = 10; + gLight1R = 101; + gLight1G = 106; + gLight1B = 92; + gAmbientR = 3; + gAmbientG = 4; + gAmbientB = 10; for (i = 0; i < 4; i++) { D_EBFBE0_801B84E8[i].unk_00.x = 0.0f; @@ -1958,8 +1958,8 @@ void func_EBFBE0_8018C644(void) { } if (D_80178340 == 0xFF) { - func_8001A55C(&D_EBFBE0_801B867C.x, 0x11030010); - func_8001A55C(&D_EBFBE0_801B867C.x, 0x31024059); + func_8001A55C(&D_EBFBE0_801B867C, 0x11030010); + func_8001A55C(&D_EBFBE0_801B867C, 0x31024059); D_EBFBE0_801B82C0++; } func_EBFBE0_801912A0(); @@ -2116,10 +2116,10 @@ void func_EBFBE0_8018CD9C(Vec3f* pos, UnkStruct_D_EBFBE0_801B8294* arg1, f32 arg } void func_EBFBE0_8018D2B8(s32 arg0) { - UnkStruct_D_80161630 temp; + WingInfo temp; - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, D_80178548, D_8017854C, - D_80178550, D_80178554, D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, gLight1R, gLight1G, + gLight1B, gAmbientR, gAmbientG, gAmbientB); RCP_SetupDL(&gMasterDisp, 0x17); @@ -2137,7 +2137,7 @@ void func_EBFBE0_8018D2B8(s32 arg0) { Matrix_SetGfxMtx(&gMasterDisp); - temp.unk_00 = temp.unk_01 = 2; + temp.rightState = temp.leftState = 2; temp.unk_18 = temp.unk_1C = temp.unk_20 = temp.unk_24 = temp.unk_04 = temp.unk_08 = temp.unk_0C = temp.unk_10 = temp.unk_28 = 0.0f; @@ -2189,7 +2189,7 @@ void func_EBFBE0_8018D510(s32 arg0) { var_fv0 = D_EBFBE0_801B84E8[arg0].unk_44; - if (D_80177DB0 & 1) { + if (gFrameCount & 1) { var_fv0 += var_fv1; } @@ -2332,8 +2332,8 @@ void func_EBFBE0_8018DF0C(f32 arg0) { } void func_EBFBE0_8018E058(void) { - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, D_80178548, D_8017854C, - D_80178550, D_80178554, D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, gLight1R, gLight1G, + gLight1B, gAmbientR, gAmbientG, gAmbientB); Matrix_Push(&gGfxMatrix); @@ -2432,12 +2432,12 @@ void func_EBFBE0_8018E67C(s32 arg0) { s32 sp5C; f32 temp_fv1; - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, D_80178548, D_8017854C, - D_80178550, D_80178554, D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, gLight1R, gLight1G, + gLight1B, gAmbientR, gAmbientG, gAmbientB); sp5C = D_EBFBE0_801B8350[arg0].unk_58 % Animation_GetFrameCount(D_EBFBE0_801ADA00[arg0].unk_0); - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, 255, 995, 1000); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, 255, 995, 1000); Matrix_Push(&gGfxMatrix); @@ -2499,8 +2499,8 @@ void func_EBFBE0_8018EA78(s32 arg0) { RCP_SetupDL(&gMasterDisp, 0x17); - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, D_80178548, D_8017854C, - D_80178550, D_80178554, D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, gLight1R, gLight1G, + gLight1B, gAmbientR, gAmbientG, gAmbientB); Matrix_Push(&gGfxMatrix); @@ -2662,7 +2662,7 @@ s32 func_EBFBE0_8018EDC8(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a void func_EBFBE0_8018F438(void) { f32 sp54; - Lights_SetOneLight(&gMasterDisp, 0, 0, 0, 0, 0, 0, D_80178554, D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, 0, 0, 0, 0, 0, 0, gAmbientR, gAmbientG, gAmbientB); if (D_801779C0 < D_80177988) { sp54 = 1.0f; @@ -2673,7 +2673,7 @@ void func_EBFBE0_8018F438(void) { D_EBFBE0_801B82C8 += 70.0f; D_EBFBE0_801B82C8 = Math_ModF(D_EBFBE0_801B82C8, 4101.6f); - RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, 255, 995, 1000); + RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, 255, 995, 1000); Matrix_Push(&gGfxMatrix); @@ -3000,8 +3000,8 @@ void func_EBFBE0_801906A0(void) { } void func_EBFBE0_80190950(void) { - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, 0, 0, 0, D_80178554, - D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, 0, 0, 0, gAmbientR, + gAmbientG, gAmbientB); RCP_SetupDL(&gMasterDisp, 0x17); Matrix_Push(&gGfxMatrix); @@ -3026,8 +3026,8 @@ void func_EBFBE0_80190A98(void) { } void func_EBFBE0_80190B30(s32 arg0) { - Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, D_80178548, D_8017854C, - D_80178550, D_80178554, D_80178558, D_8017855C); + Lights_SetOneLight(&gMasterDisp, D_EBFBE0_801B82E0, D_EBFBE0_801B82E4, D_EBFBE0_801B82E8, gLight1R, gLight1G, + gLight1B, gAmbientR, gAmbientG, gAmbientB); RCP_SetupDL(&gMasterDisp, 0x17); Matrix_Push(&gGfxMatrix); @@ -3126,7 +3126,7 @@ void func_EBFBE0_80190FD0(void) { if (D_EBFBE0_801B8284 < 120) { D_EBFBE0_801B8284 += 18; } else { - D_80177834 = 3; + gGameState = GSTATE_MENU; D_8017783C = 2; D_8017784C = 0; D_80177898 = 0; @@ -3356,8 +3356,8 @@ void func_EBFBE0_801919C4(u16** arg0, s32 arg1) { D_80177D68 = arg1; D_8017829C = 100; - switch (D_80177834) { - case 2: + switch (gGameState) { + case GSTATE_TITLE: D_8017872C = 176; D_80178728 = 85; D_80178730 = 80.0f; @@ -3367,7 +3367,7 @@ void func_EBFBE0_801919C4(u16** arg0, s32 arg1) { D_80178740 = 174.0f; break; - case 7: + case GSTATE_PLAY: D_8017872C = 179; D_80178728 = 79; D_80178730 = 74.0f; diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml index 70a8c627..266bbae4 100644 --- a/yamls/us/main.yaml +++ b/yamls/us/main.yaml @@ -32,7 +32,7 @@ # Audio block - [0x08CC0, c, 8CC0] - [0x0C870, c, C870] - - [0x0F0A0, c, F0A0] + - [0x0F0A0, c, F0A0] # audio_load - [0x12490, c, 12490] - [0x14AA0, c, 14AA0] - [0x17650, c, 17650] # Sound related @@ -172,7 +172,7 @@ # Game engine - [0x2EFE0, c, sf_2EFE0] - [0x36930, c, sf_36930] - - [0x43AC0, c, sf_43AC0] + - [0x43AC0, c, fox_43AC0] - [0x43E80, c, sf_43E80] - [0x496C0, c, sf_496C0] - [0x52730, c, fox_52730] @@ -180,7 +180,7 @@ - [0x5A0F0, c, fox_edata] - [0x5A2C0, c, fox_edisplay] - [0x61B30, c, fox_enmy1] - - [0x6B3B0, c, sf_6B3B0] + - [0x6B3B0, c, fox_6B3B0] - [0x77E40, c, sf_77E40] - [0x84F70, c, fox_84F70] - [0x85530, c, sf_hud] @@ -264,7 +264,7 @@ - [0xCA690, data, sf_2EFE0] - [0xCA7C0, data, sf_36930] - - [0xCAA90, data, sf_43AC0] + - [0xCAA90, .data, fox_43AC0] - [0xCAB00, data, sf_43E80] - [0xCAB60, data, sf_496C0] - [0xCAE20, .data, fox_52730] @@ -272,7 +272,7 @@ - [0xCCA70, .data, fox_edata] - [0xD0570, .data, fox_edisplay] - [0xD09A0, .data, fox_enmy1] - - [0xD0B80, data, sf_6B3B0] + - [0xD0B80, .data, fox_6B3B0] - [0xD20E0, data, sf_77E40] - [0xD2570, data, sf_hud] - [0xD31D0, .data, fox_display] @@ -288,14 +288,14 @@ # RODATA - game engine - [0xD5A10, .rodata, sf_2EFE0] - [0xD5CF0, .rodata, sf_36930] - - [0xD61D0, .rodata, sf_43AC0] + - [0xD61D0, .rodata, fox_43AC0] - [0xD61F0, .rodata, sf_43E80] - [0xD6350, .rodata, sf_496C0] - [0xD69A0, .rodata, fox_52730] - [0xD6BA0, .rodata, fox_load] - [0xD6C20, .rodata, fox_edisplay] - [0xD6FD0, .rodata, fox_enmy1] - - [0xD7650, .rodata, sf_6B3B0] + - [0xD7650, .rodata, fox_6B3B0] - [0xD7E30, .rodata, sf_77E40] - [0xD82F0, .rodata, fox_84F70] - [0xD8320, .rodata, sf_hud] @@ -356,11 +356,11 @@ # Game engine bss - { start: 0xDE480, type: bss, vram: 0x8015F900, name: sf_2EFE0 } - { start: 0xDE480, type: bss, vram: 0x8015F950, name: sf_36930 } - - { start: 0xDE480, type: bss, vram: 0x801613A0, name: sf_43AC0 } + - { start: 0xDE480, type: .bss, vram: 0x801613A0, name: fox_43AC0 } - { start: 0xDE480, type: .bss, vram: 0x801613B0, name: fox_52730 } - { start: 0xDE480, type: .bss, vram: 0x801615D0, name: fox_edisplay } - - { start: 0xDE480, type: .bss, vram: 0x80161680, name: fox_enmy1 } - - { start: 0xDE480, type: bss, vram: 0x80161690, name: sf_6B3B0 } + - { start: 0xDE480, type: .bss, vram: 0x80161670, name: fox_enmy1 } + - { start: 0xDE480, type: .bss, vram: 0x80161690, name: fox_6B3B0 } - { start: 0xDE480, type: bss, vram: 0x801616A0, name: sf_hud } - { start: 0xDE480, type: .bss, vram: 0x80161950, name: fox_97F80 } - { start: 0xDE480, type: .bss, vram: 0x801619A0, name: fox_display }