izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

fox_co decomp, Object_2F4 rename to Actor with work buffers (#79)

Browse Source 
* first few functions

* funcs so far - messy

* only large funcs left

* func_DF4260_8018F880 and func_DF4260_80191160

* func_DF4260_8018C19C

* func_DF4260_8018F880 player

* build post merge

* first cleanup pass

* add work buffers to Object_2F4

* halfway through data import

* finish data import

* cleanup and add non_matching

* bss complete

* actor rename

* post merge cleanup

* file rename

* arg rename

* other object variables rename

* hex cleanup for func_DF4260_80189058

* format

* revert note_data

* suggestions

* format suggestions
This commit is contained in:
inspectredc
2024-01-13 19:45:37 -03:00
committed by GitHub
parent 262a0bede2
commit 31bfc1ecdd
32 changed files with 8044 additions and 4948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+187 -183
View File
File diff suppressed because it is too large Load Diff
include/hud.h
+2 -2
View File
@@ -33,8 +33,8 @@ void func_8008D7F4(void);
void func_8008D984(void);
void func_8008DC34(void);
void func_8008E5E8(void);
s32 func_80090E8C(Object_2F4*);
s32 func_800910C0(Object_2F4*);
s32 func_80090E8C(Actor*);
s32 func_800910C0(Actor*);
// Weird addresses, assets maybe?
extern u16 D_1000E80[];
include/sf64object.h
+128 -175
View File
@@ -43,7 +43,7 @@ typedef struct {
} CollisionHeader2; // size = 0x24
typedef enum {
/* 0 */ COL1_0, // OBJ_2F4_180
/* 0 */ COL1_0, // OBJ_ACTOR_180
/* 1 */ COL1_1, // OBJ_80_39
/* 2 */ COL1_2,
/* 3 */ COL1_3, // OBJ_UNK_1000
@@ -207,7 +207,9 @@ typedef struct {
/* 0x000 */ Object obj;
/* 0x01C */ ObjectInfo info;
/* 0x040 */ s32 index;
/* 0x044 */ char unk_44[0xA];
/* 0x044 */ s16 unk_044;
/* 0x046 */ char unk_46[0x6];
/* 0x04C */ s16 unk_04C;
/* 0x04E */ s16 unk_04E;
/* 0x050 */ s16 timer_050;
/* 0x052 */ s16 timer_052;
@@ -244,44 +246,24 @@ typedef struct {
/* 0x04A */ s16 unk_04A;
/* 0x04C */ s16 timer_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;
/* 0x050 */ s32 iwork[25];
/* 0x0B4 */ s16 unk_0B4;
/* 0x0B6 */ s16 unk_0B6;
/* 0x0B8 */ s16 unk_0B8;
/* 0x0BA */ char pad0BA[0x2];
/* 0x0BC */ u16 timer_0BC;
/* 0x0BC */ u16 timer_0BE;
/* 0x0BE */ u16 timer_0BE;
/* 0x0C0 */ u16 timer_0C0;
/* 0x0C2 */ u16 timer_0C2;
/* 0x0C4 */ u16 timer_0C4;
/* 0x0C6 */ u16 timer_0C6;
/* 0x0C8 */ u8 unk_0C8;
/* 0x0C9 */ u8 unk_0C9;
/* 0x0C9 */ u8 timer_0CA[4];
/* 0x0CA */ u8 timer_0CA[4];
/* 0x0CE */ s16 unk_0CE;
/* 0x0D0 */ s8 unk_0D0;
/* 0x0D1 */ s16 unk_0D2;
/* 0x0D1 */ char pad0D1[0x1];
/* 0x0D2 */ s16 unk_0D2;
/* 0x0D4 */ s16 unk_0D4;
/* 0x0D6 */ u16 unk_0D6;
/* 0x0D8 */ Vec3f unk_0D8;
@@ -292,38 +274,9 @@ typedef struct {
/* 0x100 */ Vec3f sfxPos;
/* 0x10C */ f32 gravity;
/* 0x110 */ f32 scale;
/* 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
/* 0x114 */ f32 fwork[30];
/* 0x18C */ Vec3f vwork[30];
} Actor; // size = 0x2F4
typedef enum{
/* -1 */ OBJ_INVALID=-1,
@@ -503,122 +456,122 @@ typedef enum{
/* 173 */ OBJ_4C_173,
/* 174 */ OBJ_4C_174,
/* 175 */ OBJ_4C_175,
/* 176 */ OBJ_2F4_176,
/* 177 */ OBJ_2F4_177,
/* 178 */ OBJ_2F4_178,
/* 179 */ OBJ_2F4_179,
/* 180 */ OBJ_2F4_180,
/* 181 */ OBJ_2F4_181,
/* 182 */ OBJ_2F4_182,
/* 183 */ OBJ_2F4_183,
/* 184 */ OBJ_2F4_184,
/* 185 */ OBJ_2F4_185,
/* 186 */ OBJ_2F4_186,
/* 187 */ OBJ_2F4_187,
/* 188 */ OBJ_2F4_188,
/* 189 */ OBJ_2F4_189,
/* 190 */ OBJ_2F4_190,
/* 191 */ OBJ_2F4_191,
/* 192 */ OBJ_2F4_192,
/* 193 */ OBJ_2F4_193,
/* 194 */ OBJ_2F4_194,
/* 195 */ OBJ_2F4_195,
/* 196 */ OBJ_2F4_196,
/* 197 */ OBJ_2F4_197,
/* 198 */ OBJ_2F4_198,
/* 199 */ OBJ_2F4_199,
/* 200 */ OBJ_2F4_200,
/* 201 */ OBJ_2F4_201,
/* 202 */ OBJ_2F4_202,
/* 203 */ OBJ_2F4_203,
/* 204 */ OBJ_2F4_204,
/* 205 */ OBJ_2F4_205,
/* 206 */ OBJ_2F4_206,
/* 207 */ OBJ_2F4_207,
/* 208 */ OBJ_2F4_208,
/* 209 */ OBJ_2F4_209,
/* 210 */ OBJ_2F4_210,
/* 211 */ OBJ_2F4_211,
/* 212 */ OBJ_2F4_212,
/* 213 */ OBJ_2F4_213,
/* 214 */ OBJ_2F4_214,
/* 215 */ OBJ_2F4_215,
/* 216 */ OBJ_2F4_216,
/* 217 */ OBJ_2F4_217,
/* 218 */ OBJ_2F4_218,
/* 219 */ OBJ_2F4_219,
/* 220 */ OBJ_2F4_220,
/* 221 */ OBJ_2F4_221,
/* 222 */ OBJ_2F4_222,
/* 223 */ OBJ_2F4_223,
/* 224 */ OBJ_2F4_224,
/* 225 */ OBJ_2F4_225,
/* 226 */ OBJ_2F4_226,
/* 227 */ OBJ_2F4_227,
/* 228 */ OBJ_2F4_228,
/* 229 */ OBJ_2F4_229,
/* 230 */ OBJ_2F4_230,
/* 231 */ OBJ_2F4_231,
/* 232 */ OBJ_2F4_232,
/* 233 */ OBJ_2F4_233,
/* 234 */ OBJ_2F4_234,
/* 235 */ OBJ_2F4_235,
/* 236 */ OBJ_2F4_236,
/* 237 */ OBJ_2F4_237,
/* 238 */ OBJ_2F4_238,
/* 239 */ OBJ_2F4_239,
/* 240 */ OBJ_2F4_240,
/* 241 */ OBJ_2F4_241,
/* 242 */ OBJ_2F4_242,
/* 243 */ OBJ_2F4_243,
/* 244 */ OBJ_2F4_244,
/* 245 */ OBJ_2F4_245,
/* 246 */ OBJ_2F4_246,
/* 247 */ OBJ_2F4_247,
/* 248 */ OBJ_2F4_248,
/* 249 */ OBJ_2F4_249,
/* 250 */ OBJ_2F4_250,
/* 251 */ OBJ_2F4_251,
/* 252 */ OBJ_2F4_252,
/* 253 */ OBJ_2F4_253,
/* 254 */ OBJ_2F4_254,
/* 255 */ OBJ_2F4_255,
/* 256 */ OBJ_2F4_256,
/* 257 */ OBJ_2F4_257,
/* 258 */ OBJ_2F4_258,
/* 259 */ OBJ_2F4_259,
/* 260 */ OBJ_2F4_260,
/* 261 */ OBJ_2F4_261,
/* 262 */ OBJ_2F4_262,
/* 263 */ OBJ_2F4_263,
/* 264 */ OBJ_2F4_264,
/* 265 */ OBJ_2F4_265,
/* 266 */ OBJ_2F4_266,
/* 267 */ OBJ_2F4_267,
/* 268 */ OBJ_2F4_268,
/* 269 */ OBJ_2F4_269,
/* 270 */ OBJ_2F4_270,
/* 271 */ OBJ_2F4_271,
/* 272 */ OBJ_2F4_272,
/* 273 */ OBJ_2F4_273,
/* 274 */ OBJ_2F4_274,
/* 275 */ OBJ_2F4_275,
/* 276 */ OBJ_2F4_276,
/* 277 */ OBJ_2F4_277,
/* 278 */ OBJ_2F4_278,
/* 279 */ OBJ_2F4_279,
/* 280 */ OBJ_2F4_280,
/* 281 */ OBJ_2F4_281,
/* 282 */ OBJ_2F4_282,
/* 283 */ OBJ_2F4_283,
/* 284 */ OBJ_2F4_284,
/* 285 */ OBJ_2F4_285,
/* 286 */ OBJ_2F4_286,
/* 287 */ OBJ_2F4_287,
/* 288 */ OBJ_2F4_288,
/* 289 */ OBJ_2F4_289,
/* 290 */ OBJ_2F4_290,
/* 291 */ OBJ_2F4_291,
/* 176 */ OBJ_ACTOR_176,
/* 177 */ OBJ_ACTOR_177,
/* 178 */ OBJ_ACTOR_178,
/* 179 */ OBJ_ACTOR_179,
/* 180 */ OBJ_ACTOR_180,
/* 181 */ OBJ_ACTOR_181,
/* 182 */ OBJ_ACTOR_182,
/* 183 */ OBJ_ACTOR_183,
/* 184 */ OBJ_ACTOR_184,
/* 185 */ OBJ_ACTOR_185,
/* 186 */ OBJ_ACTOR_186,
/* 187 */ OBJ_ACTOR_187,
/* 188 */ OBJ_ACTOR_188,
/* 189 */ OBJ_ACTOR_189,
/* 190 */ OBJ_ACTOR_190,
/* 191 */ OBJ_ACTOR_191,
/* 192 */ OBJ_ACTOR_192,
/* 193 */ OBJ_ACTOR_193,
/* 194 */ OBJ_ACTOR_194,
/* 195 */ OBJ_ACTOR_195,
/* 196 */ OBJ_ACTOR_196,
/* 197 */ OBJ_ACTOR_197,
/* 198 */ OBJ_ACTOR_198,
/* 199 */ OBJ_ACTOR_199,
/* 200 */ OBJ_ACTOR_200,
/* 201 */ OBJ_ACTOR_201,
/* 202 */ OBJ_ACTOR_202,
/* 203 */ OBJ_ACTOR_203,
/* 204 */ OBJ_ACTOR_204,
/* 205 */ OBJ_ACTOR_205,
/* 206 */ OBJ_ACTOR_206,
/* 207 */ OBJ_ACTOR_207,
/* 208 */ OBJ_ACTOR_208,
/* 209 */ OBJ_ACTOR_209,
/* 210 */ OBJ_ACTOR_210,
/* 211 */ OBJ_ACTOR_211,
/* 212 */ OBJ_ACTOR_212,
/* 213 */ OBJ_ACTOR_213,
/* 214 */ OBJ_ACTOR_214,
/* 215 */ OBJ_ACTOR_215,
/* 216 */ OBJ_ACTOR_216,
/* 217 */ OBJ_ACTOR_217,
/* 218 */ OBJ_ACTOR_218,
/* 219 */ OBJ_ACTOR_219,
/* 220 */ OBJ_ACTOR_220,
/* 221 */ OBJ_ACTOR_221,
/* 222 */ OBJ_ACTOR_222,
/* 223 */ OBJ_ACTOR_223,
/* 224 */ OBJ_ACTOR_224,
/* 225 */ OBJ_ACTOR_225,
/* 226 */ OBJ_ACTOR_226,
/* 227 */ OBJ_ACTOR_227,
/* 228 */ OBJ_ACTOR_228,
/* 229 */ OBJ_ACTOR_229,
/* 230 */ OBJ_ACTOR_230,
/* 231 */ OBJ_ACTOR_231,
/* 232 */ OBJ_ACTOR_232,
/* 233 */ OBJ_ACTOR_233,
/* 234 */ OBJ_ACTOR_234,
/* 235 */ OBJ_ACTOR_235,
/* 236 */ OBJ_ACTOR_236,
/* 237 */ OBJ_ACTOR_237,
/* 238 */ OBJ_ACTOR_238,
/* 239 */ OBJ_ACTOR_239,
/* 240 */ OBJ_ACTOR_240,
/* 241 */ OBJ_ACTOR_241,
/* 242 */ OBJ_ACTOR_242,
/* 243 */ OBJ_ACTOR_243,
/* 244 */ OBJ_ACTOR_244,
/* 245 */ OBJ_ACTOR_245,
/* 246 */ OBJ_ACTOR_246,
/* 247 */ OBJ_ACTOR_247,
/* 248 */ OBJ_ACTOR_248,
/* 249 */ OBJ_ACTOR_249,
/* 250 */ OBJ_ACTOR_250,
/* 251 */ OBJ_ACTOR_251,
/* 252 */ OBJ_ACTOR_252,
/* 253 */ OBJ_ACTOR_253,
/* 254 */ OBJ_ACTOR_254,
/* 255 */ OBJ_ACTOR_255,
/* 256 */ OBJ_ACTOR_256,
/* 257 */ OBJ_ACTOR_257,
/* 258 */ OBJ_ACTOR_258,
/* 259 */ OBJ_ACTOR_259,
/* 260 */ OBJ_ACTOR_260,
/* 261 */ OBJ_ACTOR_261,
/* 262 */ OBJ_ACTOR_262,
/* 263 */ OBJ_ACTOR_263,
/* 264 */ OBJ_ACTOR_264,
/* 265 */ OBJ_ACTOR_265,
/* 266 */ OBJ_ACTOR_266,
/* 267 */ OBJ_ACTOR_267,
/* 268 */ OBJ_ACTOR_268,
/* 269 */ OBJ_ACTOR_269,
/* 270 */ OBJ_ACTOR_270,
/* 271 */ OBJ_ACTOR_271,
/* 272 */ OBJ_ACTOR_272,
/* 273 */ OBJ_ACTOR_273,
/* 274 */ OBJ_ACTOR_274,
/* 275 */ OBJ_ACTOR_275,
/* 276 */ OBJ_ACTOR_276,
/* 277 */ OBJ_ACTOR_277,
/* 278 */ OBJ_ACTOR_278,
/* 279 */ OBJ_ACTOR_279,
/* 280 */ OBJ_ACTOR_280,
/* 281 */ OBJ_ACTOR_281,
/* 282 */ OBJ_ACTOR_282,
/* 283 */ OBJ_ACTOR_283,
/* 284 */ OBJ_ACTOR_284,
/* 285 */ OBJ_ACTOR_285,
/* 286 */ OBJ_ACTOR_286,
/* 287 */ OBJ_ACTOR_287,
/* 288 */ OBJ_ACTOR_288,
/* 289 */ OBJ_ACTOR_289,
/* 290 */ OBJ_ACTOR_290,
/* 291 */ OBJ_ACTOR_291,
/* 292 */ OBJ_BOSS_292,
/* 293 */ OBJ_BOSS_293,
/* 294 */ OBJ_BOSS_294,
include/variables.h
+2 -2
View File
@@ -141,7 +141,7 @@ extern Vec3f D_800C9F2C;
// fox_display
extern s32 D_800CA220;
extern f32 D_800CA230;
extern Object_2F4* D_800CA234;
extern Actor* D_800CA234;
extern s32 D_Timer_800CA238;
// fox_edata
@@ -387,7 +387,7 @@ extern s32 D_80161AB8;
// 0x44
extern Object_80 gObjects80[50];
extern Object_4C gObjects4C[40];
extern Object_2F4 gObjects2F4[60];
extern Actor gActors[60];
extern Boss gBosses[4];
extern Effect gEffects[100];
extern Item gItems[20];
linker_scripts/us/symbol_addrs.txt
+1
View File
@@ -86,6 +86,7 @@ D_800D8594 = 0x800D8594; // force_migration:True
D_800C93EC = 0x800C93EC; // force_migration:True
D_DF4260_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_DF4260
D_DF4260_8019B6D8 = 0x8019B6D8; // size:0x110 segment:ovl_DF4260
D_E16C50_801C171C = 0x801C171C; // force_migration:True segment:ovl_E16C50
D_E16C50_801C1728 = 0x801C1728; // force_migration:True segment:ovl_E16C50
D_E16C50_801C1730 = 0x801C1730; // force_migration:True segment:ovl_E16C50
linker_scripts/us/symbol_addrs_engine.txt
+6 -6
View File
@@ -201,8 +201,8 @@ func_8005D1F0 = 0x8005D1F0;
func_8005D3CC = 0x8005D3CC;
Object_80_Draw = 0x8005D654;
Object_4C_Draw = 0x8005D8B8;
Object_2F4_Draw2 = 0x8005D954;
Object_2F4_Draw1 = 0x8005DBC0;
Actor_Draw2 = 0x8005D954;
Actor_Draw1 = 0x8005DBC0;
Boss_Draw = 0x8005E1B8;
Effect_Draw1 = 0x8005E454;
Effect_Draw2 = 0x8005E538;
@@ -231,13 +231,13 @@ func_80061148 = 0x80061148;
Object_SetInfo = 0x800612B8;
Object_80_Initialize = 0x80061364;
Object_4C_Initialize = 0x80061394;
Object_2F4_Initialize = 0x800613C4;
Actor_Initialize = 0x800613C4;
Boss_Initialize = 0x80061404;
Item_Initialize = 0x80061444;
Effect_Initialize = 0x80061474;
Object_80_Load = 0x800614B4;
Object_4C_Load = 0x800615A0;
Object_2F4_Load = 0x8006168C;
Actor_Load = 0x8006168C;
Boss_Load = 0x80061778;
Item_Load = 0x80061864;
func_80061958 = 0x80061958;
@@ -309,7 +309,7 @@ func_800696F8 = 0x800696F8;
func_80069858 = 0x80069858;
func_80069924 = 0x80069924;
func_80069A10 = 0x80069A10;
Object_2F4_Update = 0x80069AAC;
Actor_Update = 0x80069AAC;
Boss_Update = 0x80069CBC;
Object_80_Update = 0x80069DF4;
Object_4C_Update = 0x80069E88;
@@ -385,7 +385,7 @@ gLaserStrength = 0x80161AA8;//size:0x10
D_80161AB8 = 0x80161AB8;
gObjects80 = 0x80161B00; //size:0x1900
gObjects4C = 0x80163400; //size:0xBE0
gObjects2F4 = 0x80163FE0; //size:0xB130
gActors = 0x80163FE0; //size:0xB130
gBosses = 0x8016F110; //size:0x1020
gEffects = 0x80170130; //size:0x36B0
gItems = 0x801737E0; //size:0x870
src/main/fox_360.c
+411 -414
View File
File diff suppressed because it is too large Load Diff
src/main/fox_43AC0.c
+23 -23
View File
@@ -55,27 +55,27 @@ void func_80042FDC(Boss* boss) {
void func_80042FE8(Boss* boss) {
}
void func_80042FF4(Object_2F4* obj2F4, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
void func_80042FF4(Actor* actor, 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(obj2F4);
obj2F4->obj.status = 1;
obj2F4->obj.id = OBJ_2F4_189;
obj2F4->unk_0B8 = argB;
obj2F4->obj.pos.x = arg1;
obj2F4->obj.pos.y = arg2;
obj2F4->obj.pos.z = arg3;
obj2F4->obj.rot.x = arg4;
obj2F4->obj.rot.y = arg5;
obj2F4->obj.rot.z = arg6;
obj2F4->vel.x = arg7;
obj2F4->vel.y = arg8;
obj2F4->vel.z = arg9;
obj2F4->scale = argA;
obj2F4->timer_0BC = argC;
obj2F4->timer_0BE = 20;
Object_SetInfo(&obj2F4->info, obj2F4->obj.id);
Actor_Initialize(actor);
actor->obj.status = 1;
actor->obj.id = OBJ_ACTOR_189;
actor->unk_0B8 = argB;
actor->obj.pos.x = arg1;
actor->obj.pos.y = arg2;
actor->obj.pos.z = arg3;
actor->obj.rot.x = arg4;
actor->obj.rot.y = arg5;
actor->obj.rot.z = arg6;
actor->vel.x = arg7;
actor->vel.y = arg8;
actor->vel.z = arg9;
actor->scale = argA;
actor->timer_0BC = argC;
actor->timer_0BE = 20;
Object_SetInfo(&actor->info, actor->obj.id);
if (gLevelType == LEVELTYPE_PLANET) {
obj2F4->gravity = 0.5f;
actor->gravity = 0.5f;
}
}
@@ -84,15 +84,15 @@ void func_800430DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f
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);
if (gActors[i].obj.status == 0) {
func_80042FF4(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, argA, argB);
return;
}
}
}
void func_80043188(Object_2F4* obj2F4) {
obj2F4->info.unk_10 = 30000.0f;
void func_80043188(Actor* actor) {
actor->info.unk_10 = 30000.0f;
}
void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3) {
src/main/fox_beam.c
+165 -164
View File
File diff suppressed because it is too large Load Diff
src/main/fox_demo.c
+420 -420
View File
File diff suppressed because it is too large Load Diff
src/main/fox_display.c
+1 -1
View File
@@ -16,7 +16,7 @@ u8 D_800CA224[] = { 0, 0, 0, 0 };
s32 D_800CA228 = 0;
s32 D_800CA22C = 0;
f32 D_800CA230 = 0.0f;
Object_2F4* D_800CA234 = NULL;
Actor* D_800CA234 = NULL;
s32 D_Timer_800CA238 = 0;
f32 D_800CA23C[3] = { 0.5f, 0.25f, 0.25f };
f32 D_800CA248[3] = { 2.0f, 1.0f, 0.5f };
src/main/fox_edata.c
+1 -1
View File
@@ -20,5 +20,5 @@ void func_800595D0(Object_80* obj80) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
void func_800596B0(Object_2F4* obj2F4) {
void func_800596B0(Actor* actor) {
}
src/main/fox_edata_1C.c
+116 -116
View File
@@ -600,122 +600,122 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_4C_173 */ {(void*) NULL, 1, (ObjectFunc) func_801923C0, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_174 */ {(void*) NULL, 1, (ObjectFunc) func_8019243C, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_175 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_2F4_176 */ {(void*) func_8018BAAC, 2, (ObjectFunc) func_8018AED0, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_2F4_177 */ {(void*) func_8018BBA4, 2, (ObjectFunc) func_8018B15C, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_2F4_178 */ {(void*) func_8018BBF8, 2, (ObjectFunc) func_8018B418, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_2F4_179 */ {(void*) func_8018BD7C, 2, (ObjectFunc) func_8018B58C, D_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_2F4_180 */ {(void*) func_8005B6A4, 1, (ObjectFunc) func_80066A80, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 1 },
/* OBJ_2F4_181 */ {(void*) D_6018C00, 0, (ObjectFunc) func_8018756C, D_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_2F4_182 */ {(void*) func_8005B71C, 1, (ObjectFunc) func_80187650, D_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_2F4_183 */ {(void*) func_8018DA6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_2F4_184 */ {(void*) func_8018DAEC, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_2F4_185 */ {(void*) func_8018DB6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_2F4_186 */ {(void*) func_8005B7CC, 1, (ObjectFunc) func_8018795C, D_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_2F4_187 */ {(void*) D_6018450, 0, (ObjectFunc) func_801877C4, D_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_2F4_188 */ {(void*) func_E16C50_801BEC74, 1, (ObjectFunc) func_E16C50_801BEC68, D_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_2F4_189 */ {(void*) func_8005A094, 1, (ObjectFunc) func_8006C008, D_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_2F4_190 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_2F4_191 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_2F4_192 */ {(void*) func_8005B9A4, 1, (ObjectFunc) func_8006654C, D_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
/* OBJ_2F4_193 */ {(void*) func_8005BA30, 1, (ObjectFunc) func_800669A0, D_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_2F4_194 */ {(void*) func_8006B74C, 1, (ObjectFunc) func_8006B094, D_800CC000, 200.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_2F4_195 */ {(void*) func_8004FEC0, 1, (ObjectFunc) func_8004F8AC, D_800CBF34, 20000.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_2F4_196 */ {(void*) func_80059BF0, 1, (ObjectFunc) func_8006BB78, D_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_2F4_197 */ {(void*) func_80035448, 1, (ObjectFunc) func_800319AC, D_800CC038, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
/* OBJ_2F4_198 */ {(void*) func_80035448, 1, (ObjectFunc) func_80092EC0, D_800CC01C, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_2F4_199 */ {(void*) func_80188448, 1, (ObjectFunc) func_801880E4, D_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_2F4_200 */ {(void*) func_80074FF0, 1, (ObjectFunc) func_80072594, D_800CBF34, 2000.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_2F4_201 */ {(void*) func_800598E8, 1, (ObjectFunc) func_8006AC08, D_602F684, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_2F4_202 */ {(void*) func_80059A24, 1, (ObjectFunc) func_8006AD18, D_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 },
/* OBJ_2F4_203 */ {(void*) func_8018F884, 1, (ObjectFunc) func_8018F330, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_2F4_204 */ {(void*) func_E9F1D0_801A4CB0, 1, (ObjectFunc) func_E9F1D0_801A3BD4, D_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_2F4_205 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019C778, D_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_206 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_801AC438, D_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_207 */ {(void*) func_801AC294, 2, (ObjectFunc) func_801A7E7C, D_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_208 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019EA60, D_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_209 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019D700, D_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_210 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019CE88, D_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_211 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019E410, D_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_212 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019FF9C, D_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_213 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019EE68, D_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_214 */ {(void*) func_801A43BC, 1, (ObjectFunc) func_801A3E98, D_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_215 */ {(void*) func_801A4A64, 1, (ObjectFunc) func_801A46A0, D_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 },
/* OBJ_2F4_216 */ {(void*) func_801A5F90, 1, (ObjectFunc) func_801A5E54, D_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_217 */ {(void*) func_801A6100, 1, (ObjectFunc) func_801A5FD0, D_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_218 */ {(void*) func_801A6540, 1, (ObjectFunc) func_801A6144, D_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_219 */ {(void*) func_801A68EC, 1, (ObjectFunc) func_801A67C8, D_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_220 */ {(void*) func_801ADAC8, 1, (ObjectFunc) func_801AD6F0, D_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_221 */ {(void*) func_801AE2C0, 1, (ObjectFunc) func_801ADD68, D_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_2F4_222 */ {(void*) func_801AEEFC, 1, (ObjectFunc) func_801AEC04, D_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_2F4_223 */ {(void*) func_801A54E8, 1, (ObjectFunc) func_801A4B24, D_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_224 */ {(void*) NULL, 1, (ObjectFunc) func_80189194, D_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_2F4_225 */ {(void*) D_700AB70, 0, (ObjectFunc) func_8018AB44, D_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
/* OBJ_2F4_226 */ {(void*) func_80189AFC, 1, (ObjectFunc) func_801895B8, D_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 },
/* OBJ_2F4_227 */ {(void*) func_8018E5B4, 1, (ObjectFunc) func_8018E54C, D_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_2F4_228 */ {(void*) func_8018EF14, 1, (ObjectFunc) func_8018E5F8, D_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_2F4_229 */ {(void*) func_8018E2D8, 1, (ObjectFunc) func_8018C8A8, D_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 },
/* OBJ_2F4_230 */ {(void*) func_8018AABC, 1, (ObjectFunc) func_8018A544, D_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 },
/* OBJ_2F4_231 */ {(void*) func_8018BE84, 1, (ObjectFunc) func_8018B9D0, D_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_2F4_232 */ {(void*) func_8018B6AC, 1, (ObjectFunc) func_8018B268, D_6006890_f32, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
/* OBJ_2F4_233 */ {(void*) func_8018A1C0, 1, (ObjectFunc) func_80189CC8, D_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_2F4_234 */ {(void*) func_80077218, 1, (ObjectFunc) func_800771CC, D_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 },
/* OBJ_2F4_235 */ {(void*) func_E16C50_80190430, 2, (ObjectFunc) func_E16C50_801904CC, D_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_2F4_236 */ {(void*) func_E16C50_80190F08, 1, (ObjectFunc) func_E16C50_80190A00, D_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_237 */ {(void*) func_8006A978, 1, (ObjectFunc) func_8006A96C, D_800CBF34, 200.0f, 0, 0, 40, 0, 0.0f, 2 },
/* OBJ_2F4_238 */ {(void*) func_E16C50_801914C4, 2, (ObjectFunc) func_E16C50_80191010, D_800CBE8C, 200.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_2F4_239 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_2F4_240 */ {(void*) func_E16C50_80191B4C, 1, (ObjectFunc) func_E16C50_80191680, D_800CBE8C, 1500.0f, 0, 1, 40, 0, 20.0f, 0 },
/* OBJ_2F4_241 */ {(void*) func_E16C50_80191DB0, 1, (ObjectFunc) func_E16C50_80191BC4, D_800CBE70, 1500.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_2F4_242 */ {(void*) func_E16C50_80191FFC, 2, (ObjectFunc) func_E16C50_80192094, D_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_2F4_243 */ {(void*) func_E16C50_80192C18, 2, (ObjectFunc) func_E16C50_80192834, D_800CBE8C, 0.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_2F4_244 */ {(void*) func_E16C50_80193240, 2, (ObjectFunc) func_E16C50_80192E64, D_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 },
/* OBJ_2F4_245 */ {(void*) func_E16C50_8019983C, 1, (ObjectFunc) func_E16C50_8019969C, D_800CBE8C, 200.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_2F4_246 */ {(void*) func_E16C50_80199E24, 1, (ObjectFunc) func_E16C50_80199A28, D_800CBE8C, 2000.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_2F4_247 */ {(void*) func_E16C50_8019D3C4, 1, (ObjectFunc) func_E16C50_8019D15C, D_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_248 */ {(void*) func_E16C50_8019A1FC, 1, (ObjectFunc) func_E16C50_80199F10, D_800CBEA8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_249 */ {(void*) func_E16C50_8019ACCC, 1, (ObjectFunc) func_E16C50_8019A5D4, D_800CBEC4, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_250 */ {(void*) func_E16C50_8019B7DC, 1, (ObjectFunc) func_E16C50_8019B548, D_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_251 */ {(void*) func_E16C50_8019BDE0, 2, (ObjectFunc) func_E16C50_8019B854, D_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 },
/* OBJ_2F4_252 */ {(void*) func_E16C50_8019C1CC, 1, (ObjectFunc) func_E16C50_8019BE48, D_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 },
/* OBJ_2F4_253 */ {(void*) func_E16C50_8019C83C, 1, (ObjectFunc) func_E16C50_8019C454, D_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_254 */ {(void*) func_E16C50_8019CE58, 1, (ObjectFunc) func_E16C50_8019CBEC, D_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_2F4_255 */ {(void*) func_E16C50_801AE168, 1, (ObjectFunc) func_E16C50_801AD6C0, D_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_256 */ {(void*) func_E16C50_801AEB44, 1, (ObjectFunc) func_E16C50_801AE3D8, D_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_257 */ {(void*) func_E16C50_801B099C, 1, (ObjectFunc) func_E16C50_801AFA5C, D_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_258 */ {(void*) func_E16C50_801B0EC0, 1, (ObjectFunc) func_E16C50_801B0B60, D_800CBE8C, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_259 */ {(void*) func_E16C50_801B619C, 2, (ObjectFunc) func_E16C50_801B638C, D_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_260 */ {(void*) func_E16C50_801B90DC, 2, (ObjectFunc) func_E16C50_801B7C78, D_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_261 */ {(void*) func_E16C50_801B504C, 2, (ObjectFunc) func_E16C50_801B50E8, D_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_2F4_262 */ {(void*) func_E16C50_801B7A24, 2, (ObjectFunc) func_E16C50_801B6FF8, D_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_263 */ {(void*) func_E16C50_801BA108, 2, (ObjectFunc) func_E16C50_801B91A4, D_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_2F4_264 */ {(void*) func_E16C50_801BA4E4, 1, (ObjectFunc) func_E16C50_801BA26C, D_800CBE8C, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_2F4_265 */ {(void*) func_E16C50_801BAD7C, 1, (ObjectFunc) func_E16C50_801BA6A4, D_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_2F4_266 */ {(void*) func_E16C50_801BB204, 2, (ObjectFunc) func_E16C50_801BADF8, D_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_2F4_267 */ {(void*) func_E16C50_801BC930, 2, (ObjectFunc) func_E16C50_801BB79C, D_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_268 */ {(void*) func_E16C50_801BDE6C, 1, (ObjectFunc) func_E16C50_801BD54C, D_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_2F4_269 */ {(void*) func_E16C50_801BD264, 1, (ObjectFunc) func_E16C50_801BC9A0, D_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_270 */ {(void*) func_E16C50_801BEB1C, 1, (ObjectFunc) func_E16C50_801BE3F8, D_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_271 */ {(void*) func_8002E694, 2, (ObjectFunc) func_8002E670, D_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 },
/* OBJ_2F4_272 */ {(void*) func_8002E6DC, 1, (ObjectFunc) func_8002E6B8, D_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 },
/* OBJ_2F4_273 */ {(void*) func_80188FE4, 2, (ObjectFunc) func_80188AD0, D_600FF30, 0.0f, 0, 0, 39, 0, 220.0f, 1 },
/* OBJ_2F4_274 */ {(void*) func_8019E3A8, 1, (ObjectFunc) func_8019E234, D_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 },
/* OBJ_2F4_275 */ {(void*) func_E16C50_8019F7AC, 1, (ObjectFunc) func_E16C50_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_2F4_276 */ {(void*) func_E16C50_8019F7AC, 1, (ObjectFunc) func_E16C50_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_2F4_277 */ {(void*) func_E16C50_8019F7AC, 1, (ObjectFunc) func_E16C50_8019F20C, D_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_2F4_278 */ {(void*) NULL, 1, (ObjectFunc) func_E16C50_8019EA7C, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_2F4_279 */ {(void*) NULL, 1, (ObjectFunc) func_E16C50_801A003C, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_2F4_280 */ {(void*) D_900DD20, 0, (ObjectFunc) func_80192518, D_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_281 */ {(void*) func_80192E2C, 1, (ObjectFunc) func_80192CD4, D_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_282 */ {(void*) D_901DA50, 0, (ObjectFunc) func_80192CD4, D_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_283 */ {(void*) D_9023AD0, 0, (ObjectFunc) func_80192EB0, D_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_284 */ {(void*) func_801934D0, 1, (ObjectFunc) func_801933DC, D_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_2F4_285 */ {(void*) func_80193244, 1, (ObjectFunc) func_80192E94, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 },
/* OBJ_2F4_286 */ {(void*) func_80188660, 1, (ObjectFunc) func_80188528, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_2F4_287 */ {(void*) NULL, 1, (ObjectFunc) func_80189724, D_800CBF34, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_2F4_288 */ {(void*) NULL, 1, (ObjectFunc) func_801893B8, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_2F4_289 */ {(void*) func_800596B0, 1, (ObjectFunc) func_80189470, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_2F4_290 */ {(void*) NULL, 1, (ObjectFunc) func_8018933C, D_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_2F4_291 */ {(void*) func_80067874, 1, (ObjectFunc) func_8006753C, D_800CBEA8, 1000.0f, 0, 0, 0, 0, 1.0f, 0 },
/* OBJ_ACTOR_176 */ {(void*) func_8018BAAC, 2, (ObjectFunc) func_8018AED0, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_177 */ {(void*) func_8018BBA4, 2, (ObjectFunc) func_8018B15C, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_178 */ {(void*) func_8018BBF8, 2, (ObjectFunc) func_8018B418, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_179 */ {(void*) func_8018BD7C, 2, (ObjectFunc) func_8018B58C, D_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_180 */ {(void*) func_8005B6A4, 1, (ObjectFunc) func_80066A80, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_181 */ {(void*) D_6018C00, 0, (ObjectFunc) func_8018756C, D_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_182 */ {(void*) func_8005B71C, 1, (ObjectFunc) func_80187650, D_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_183 */ {(void*) func_8018DA6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_184 */ {(void*) func_8018DAEC, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_185 */ {(void*) func_8018DB6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_186 */ {(void*) func_8005B7CC, 1, (ObjectFunc) func_8018795C, D_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_187 */ {(void*) D_6018450, 0, (ObjectFunc) func_801877C4, D_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_188 */ {(void*) func_E16C50_801BEC74, 1, (ObjectFunc) func_E16C50_801BEC68, D_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_189 */ {(void*) func_8005A094, 1, (ObjectFunc) func_8006C008, D_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_190 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_191 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_192 */ {(void*) func_8005B9A4, 1, (ObjectFunc) func_8006654C, D_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
/* OBJ_ACTOR_193 */ {(void*) func_8005BA30, 1, (ObjectFunc) func_800669A0, D_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_194 */ {(void*) func_8006B74C, 1, (ObjectFunc) func_8006B094, D_800CC000, 200.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_195 */ {(void*) func_8004FEC0, 1, (ObjectFunc) func_8004F8AC, D_800CBF34, 20000.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_196 */ {(void*) func_80059BF0, 1, (ObjectFunc) func_8006BB78, D_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_197 */ {(void*) func_80035448, 1, (ObjectFunc) func_800319AC, D_800CC038, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_198 */ {(void*) func_80035448, 1, (ObjectFunc) func_80092EC0, D_800CC01C, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_199 */ {(void*) func_80188448, 1, (ObjectFunc) func_801880E4, D_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_200 */ {(void*) func_80074FF0, 1, (ObjectFunc) func_80072594, D_800CBF34, 2000.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_201 */ {(void*) func_800598E8, 1, (ObjectFunc) func_8006AC08, D_602F684, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_202 */ {(void*) func_80059A24, 1, (ObjectFunc) func_8006AD18, D_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 },
/* OBJ_ACTOR_203 */ {(void*) func_8018F884, 1, (ObjectFunc) func_8018F330, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_204 */ {(void*) func_E9F1D0_801A4CB0, 1, (ObjectFunc) func_E9F1D0_801A3BD4, D_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_205 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019C778, D_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_206 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_801AC438, D_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_207 */ {(void*) func_801AC294, 2, (ObjectFunc) func_801A7E7C, D_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_208 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019EA60, D_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_209 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019D700, D_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_210 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019CE88, D_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_211 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019E410, D_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_212 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019FF9C, D_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_213 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019EE68, D_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_214 */ {(void*) func_801A43BC, 1, (ObjectFunc) func_801A3E98, D_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_215 */ {(void*) func_801A4A64, 1, (ObjectFunc) func_801A46A0, D_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 },
/* OBJ_ACTOR_216 */ {(void*) func_801A5F90, 1, (ObjectFunc) func_801A5E54, D_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_217 */ {(void*) func_801A6100, 1, (ObjectFunc) func_801A5FD0, D_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_218 */ {(void*) func_801A6540, 1, (ObjectFunc) func_801A6144, D_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_219 */ {(void*) func_801A68EC, 1, (ObjectFunc) func_801A67C8, D_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_220 */ {(void*) func_801ADAC8, 1, (ObjectFunc) func_801AD6F0, D_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_221 */ {(void*) func_801AE2C0, 1, (ObjectFunc) func_801ADD68, D_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_222 */ {(void*) func_801AEEFC, 1, (ObjectFunc) func_801AEC04, D_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_223 */ {(void*) func_801A54E8, 1, (ObjectFunc) func_801A4B24, D_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) func_80189194, D_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_225 */ {(void*) D_700AB70, 0, (ObjectFunc) func_8018AB44, D_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
/* OBJ_ACTOR_226 */ {(void*) func_80189AFC, 1, (ObjectFunc) func_801895B8, D_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 },
/* OBJ_ACTOR_227 */ {(void*) func_8018E5B4, 1, (ObjectFunc) func_8018E54C, D_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_228 */ {(void*) func_8018EF14, 1, (ObjectFunc) func_8018E5F8, D_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_229 */ {(void*) func_8018E2D8, 1, (ObjectFunc) func_8018C8A8, D_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 },
/* OBJ_ACTOR_230 */ {(void*) func_8018AABC, 1, (ObjectFunc) func_8018A544, D_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_231 */ {(void*) func_8018BE84, 1, (ObjectFunc) func_8018B9D0, D_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_232 */ {(void*) func_8018B6AC, 1, (ObjectFunc) func_8018B268, D_6006890_f32, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
/* OBJ_ACTOR_233 */ {(void*) func_8018A1C0, 1, (ObjectFunc) func_80189CC8, D_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_234 */ {(void*) func_80077218, 1, (ObjectFunc) func_800771CC, D_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 },
/* OBJ_ACTOR_235 */ {(void*) func_E16C50_80190430, 2, (ObjectFunc) func_E16C50_801904CC, D_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_236 */ {(void*) func_E16C50_80190F08, 1, (ObjectFunc) func_E16C50_80190A00, D_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_237 */ {(void*) func_8006A978, 1, (ObjectFunc) func_8006A96C, D_800CBF34, 200.0f, 0, 0, 40, 0, 0.0f, 2 },
/* OBJ_ACTOR_238 */ {(void*) func_E16C50_801914C4, 2, (ObjectFunc) func_E16C50_80191010, D_800CBE8C, 200.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_239 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_240 */ {(void*) func_E16C50_80191B4C, 1, (ObjectFunc) func_E16C50_80191680, D_800CBE8C, 1500.0f, 0, 1, 40, 0, 20.0f, 0 },
/* OBJ_ACTOR_241 */ {(void*) func_E16C50_80191DB0, 1, (ObjectFunc) func_E16C50_80191BC4, D_800CBE70, 1500.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_242 */ {(void*) func_E16C50_80191FFC, 2, (ObjectFunc) func_E16C50_80192094, D_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_243 */ {(void*) func_E16C50_80192C18, 2, (ObjectFunc) func_E16C50_80192834, D_800CBE8C, 0.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_244 */ {(void*) func_E16C50_80193240, 2, (ObjectFunc) func_E16C50_80192E64, D_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 },
/* OBJ_ACTOR_245 */ {(void*) func_E16C50_8019983C, 1, (ObjectFunc) func_E16C50_8019969C, D_800CBE8C, 200.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_246 */ {(void*) func_E16C50_80199E24, 1, (ObjectFunc) func_E16C50_80199A28, D_800CBE8C, 2000.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_247 */ {(void*) func_E16C50_8019D3C4, 1, (ObjectFunc) func_E16C50_8019D15C, D_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_248 */ {(void*) func_E16C50_8019A1FC, 1, (ObjectFunc) func_E16C50_80199F10, D_800CBEA8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_249 */ {(void*) func_E16C50_8019ACCC, 1, (ObjectFunc) func_E16C50_8019A5D4, D_800CBEC4, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_250 */ {(void*) func_E16C50_8019B7DC, 1, (ObjectFunc) func_E16C50_8019B548, D_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_251 */ {(void*) func_E16C50_8019BDE0, 2, (ObjectFunc) func_E16C50_8019B854, D_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_252 */ {(void*) func_E16C50_8019C1CC, 1, (ObjectFunc) func_E16C50_8019BE48, D_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 },
/* OBJ_ACTOR_253 */ {(void*) func_E16C50_8019C83C, 1, (ObjectFunc) func_E16C50_8019C454, D_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_254 */ {(void*) func_E16C50_8019CE58, 1, (ObjectFunc) func_E16C50_8019CBEC, D_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_255 */ {(void*) func_E16C50_801AE168, 1, (ObjectFunc) func_E16C50_801AD6C0, D_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_256 */ {(void*) func_E16C50_801AEB44, 1, (ObjectFunc) func_E16C50_801AE3D8, D_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_257 */ {(void*) func_E16C50_801B099C, 1, (ObjectFunc) func_E16C50_801AFA5C, D_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_258 */ {(void*) func_E16C50_801B0EC0, 1, (ObjectFunc) func_E16C50_801B0B60, D_800CBE8C, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_259 */ {(void*) func_E16C50_801B619C, 2, (ObjectFunc) func_E16C50_801B638C, D_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_260 */ {(void*) func_E16C50_801B90DC, 2, (ObjectFunc) func_E16C50_801B7C78, D_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_261 */ {(void*) func_E16C50_801B504C, 2, (ObjectFunc) func_E16C50_801B50E8, D_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_262 */ {(void*) func_E16C50_801B7A24, 2, (ObjectFunc) func_E16C50_801B6FF8, D_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_263 */ {(void*) func_E16C50_801BA108, 2, (ObjectFunc) func_E16C50_801B91A4, D_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_264 */ {(void*) func_E16C50_801BA4E4, 1, (ObjectFunc) func_E16C50_801BA26C, D_800CBE8C, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_265 */ {(void*) func_E16C50_801BAD7C, 1, (ObjectFunc) func_E16C50_801BA6A4, D_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_266 */ {(void*) func_E16C50_801BB204, 2, (ObjectFunc) func_E16C50_801BADF8, D_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_267 */ {(void*) func_E16C50_801BC930, 2, (ObjectFunc) func_E16C50_801BB79C, D_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_268 */ {(void*) func_E16C50_801BDE6C, 1, (ObjectFunc) func_E16C50_801BD54C, D_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_269 */ {(void*) func_E16C50_801BD264, 1, (ObjectFunc) func_E16C50_801BC9A0, D_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_270 */ {(void*) func_E16C50_801BEB1C, 1, (ObjectFunc) func_E16C50_801BE3F8, D_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_271 */ {(void*) func_8002E694, 2, (ObjectFunc) func_8002E670, D_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 },
/* OBJ_ACTOR_272 */ {(void*) func_8002E6DC, 1, (ObjectFunc) func_8002E6B8, D_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 },
/* OBJ_ACTOR_273 */ {(void*) func_80188FE4, 2, (ObjectFunc) func_80188AD0, D_600FF30, 0.0f, 0, 0, 39, 0, 220.0f, 1 },
/* OBJ_ACTOR_274 */ {(void*) func_8019E3A8, 1, (ObjectFunc) func_8019E234, D_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_275 */ {(void*) func_E16C50_8019F7AC, 1, (ObjectFunc) func_E16C50_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_276 */ {(void*) func_E16C50_8019F7AC, 1, (ObjectFunc) func_E16C50_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_277 */ {(void*) func_E16C50_8019F7AC, 1, (ObjectFunc) func_E16C50_8019F20C, D_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) func_E16C50_8019EA7C, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) func_E16C50_801A003C, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_280 */ {(void*) D_900DD20, 0, (ObjectFunc) func_80192518, D_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_281 */ {(void*) func_80192E2C, 1, (ObjectFunc) func_80192CD4, D_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_282 */ {(void*) D_901DA50, 0, (ObjectFunc) func_80192CD4, D_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_283 */ {(void*) D_9023AD0, 0, (ObjectFunc) func_80192EB0, D_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_284 */ {(void*) func_801934D0, 1, (ObjectFunc) func_801933DC, D_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_285 */ {(void*) func_80193244, 1, (ObjectFunc) func_80192E94, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 },
/* OBJ_ACTOR_286 */ {(void*) func_80188660, 1, (ObjectFunc) func_80188528, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_287 */ {(void*) NULL, 1, (ObjectFunc) func_80189724, D_800CBF34, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_288 */ {(void*) NULL, 1, (ObjectFunc) func_801893B8, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_289 */ {(void*) func_800596B0, 1, (ObjectFunc) func_80189470, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_290 */ {(void*) NULL, 1, (ObjectFunc) func_8018933C, D_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_291 */ {(void*) func_80067874, 1, (ObjectFunc) func_8006753C, D_800CBEA8, 1000.0f, 0, 0, 0, 0, 1.0f, 0 },
/* OBJ_BOSS_292 */ {(void*) func_8018AA74, 2, (ObjectFunc) func_80189058, D_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_293 */ {(void*) func_8018ECAC, 1, (ObjectFunc) func_8018C19C, D_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_294 */ {(void*) func_8018ED78, 1, (ObjectFunc) func_8018DDAC, D_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
src/main/fox_edisplay.c
+210 -209
View File
File diff suppressed because it is too large Load Diff
src/main/fox_effect.c
+15 -15
View File
@@ -532,9 +532,9 @@ void func_80078D60(Effect* effect, f32 posX, f32 posY, f32 posZ, f32 scale2) {
effect->scale2 = scale2;
if (scale2 == 3.1f) {
effect->vel.x = gObjects2F4[8].vel.x;
effect->vel.y = gObjects2F4[8].vel.y;
effect->vel.z = gObjects2F4[8].vel.z;
effect->vel.x = gActors[8].vel.x;
effect->vel.y = gActors[8].vel.y;
effect->vel.z = gActors[8].vel.z;
}
if (scale2 != 30.0f) {
effect->unk_4E = 1;
@@ -2842,22 +2842,22 @@ void func_8007FBE0(Effect* effect) {
bool func_8007FD84(Effect* effect) {
s32 i;
Object_2F4* obj2F4;
Actor* actor;
for (i = 1; i < ARRAY_COUNT(D_800CFF80); i++) {
obj2F4 = &gObjects2F4[D_800CFF80[i]];
if (obj2F4->obj.status == 2) {
if ((obj2F4->unk_080 > 0) && (obj2F4->unk_080 < 6) &&
(fabsf(obj2F4->obj.pos.z - effect->obj.pos.z) < 100.0f) &&
(fabsf(obj2F4->obj.pos.x - effect->obj.pos.x) < 100.0f) &&
(fabsf(obj2F4->obj.pos.y - effect->obj.pos.y) < 100.0f)) {
obj2F4->unk_0D0 = 1;
obj2F4->unk_0D2 = 0;
obj2F4->unk_0D6 = 10;
actor = &gActors[D_800CFF80[i]];
if (actor->obj.status == 2) {
if ((actor->iwork[12] > 0) && (actor->iwork[12] < 6) &&
(fabsf(actor->obj.pos.z - effect->obj.pos.z) < 100.0f) &&
(fabsf(actor->obj.pos.x - effect->obj.pos.x) < 100.0f) &&
(fabsf(actor->obj.pos.y - effect->obj.pos.y) < 100.0f)) {
actor->unk_0D0 = 1;
actor->unk_0D2 = 0;
actor->unk_0D6 = 10;
if (effect->obj.id == OBJ_EFFECT_354) {
obj2F4->unk_0D6 = 30;
actor->unk_0D6 = 30;
}
obj2F4->unk_0D4 = 100;
actor->unk_0D4 = 100;
return true;
}
}
src/main/fox_enmy.c
+567 -571
View File
File diff suppressed because it is too large Load Diff
src/main/fox_enmy2.c
+1610 -1635
View File
File diff suppressed because it is too large Load Diff
src/main/fox_game.c
+11 -11
View File
@@ -539,21 +539,21 @@ void func_800A26C0(void) {
}
}
Object_2F4* func_800A3608(s32 arg0) {
Object_2F4* obj2F4 = gObjects2F4;
Actor* func_800A3608(s32 arg0) {
Actor* actor = gActors;
s32 i;
for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++, obj2F4++) {
if (obj2F4->obj.status == 0) {
Object_2F4_Initialize(obj2F4);
obj2F4->obj.status = 1;
obj2F4->obj.id = arg0;
Object_SetInfo(&obj2F4->info, obj2F4->obj.id);
for (i = 0; i < ARRAY_COUNT(gActors); i++, actor++) {
if (actor->obj.status == 0) {
Actor_Initialize(actor);
actor->obj.status = 1;
actor->obj.id = arg0;
Object_SetInfo(&actor->info, actor->obj.id);
break;
}
}
if (i == ARRAY_COUNT(gObjects2F4)) {
obj2F4 = NULL;
if (i == ARRAY_COUNT(gActors)) {
actor = NULL;
}
return obj2F4;
return actor;
}
src/main/fox_play.c
+96 -98
View File
@@ -609,9 +609,9 @@ void func_800A6148(void) {
for (i = 0; i < ARRAY_COUNT(gObjects4C); i++) {
Object_4C_Initialize(&gObjects4C[i]);
}
for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) {
Object_Kill(&gObjects2F4[i].obj, &gObjects2F4[i].sfxPos);
Object_2F4_Initialize(&gObjects2F4[i]);
for (i = 0; i < ARRAY_COUNT(gActors); i++) {
Object_Kill(&gActors[i].obj, &gActors[i].sfxPos);
Actor_Initialize(&gActors[i]);
}
for (i = 0; i < ARRAY_COUNT(gBosses); i++) {
Object_Kill(&gBosses[i].obj, &gBosses[i].sfxPos);
@@ -688,57 +688,57 @@ void func_800A668C(f32 xPos, f32 yPos, f32 zPos) {
}
}
void func_800A670C(Object_2F4* obj2F4, s32 arg1, f32 arg2, f32 arg3, f32 arg4) {
Object_2F4_Initialize(obj2F4);
obj2F4->obj.status = 1;
obj2F4->obj.id = OBJ_2F4_189;
obj2F4->unk_0B8 = arg1;
obj2F4->obj.pos.x = arg2;
obj2F4->obj.pos.y = arg3;
obj2F4->obj.pos.z = arg4;
obj2F4->gravity = 0.5f;
void func_800A670C(Actor* actor, s32 arg1, f32 arg2, f32 arg3, f32 arg4) {
Actor_Initialize(actor);
actor->obj.status = 1;
actor->obj.id = OBJ_ACTOR_189;
actor->unk_0B8 = arg1;
actor->obj.pos.x = arg2;
actor->obj.pos.y = arg3;
actor->obj.pos.z = arg4;
actor->gravity = 0.5f;
if ((arg1 == 0) || (arg1 == 1)) {
obj2F4->vel.y = (Rand_ZeroOne() * 5.0f) + 10.0f;
obj2F4->vel.x = 10.0f;
actor->vel.y = (Rand_ZeroOne() * 5.0f) + 10.0f;
actor->vel.x = 10.0f;
if (arg1 == 0) {
obj2F4->vel.x = -10.0f;
actor->vel.x = -10.0f;
}
obj2F4->timer_0BC = 15;
actor->timer_0BC = 15;
} else {
if (gLevelType == LEVELTYPE_PLANET) {
obj2F4->vel.y = (Rand_ZeroOne() * 7.0f) + 7.0f;
obj2F4->vel.x = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->vel.z = (Rand_ZeroOne() * 5.0f) + 5.0f;
actor->vel.y = (Rand_ZeroOne() * 7.0f) + 7.0f;
actor->vel.x = (Rand_ZeroOne() - 0.5f) * 10.0f;
actor->vel.z = (Rand_ZeroOne() * 5.0f) + 5.0f;
if (gLevelMode == LEVELMODE_ALL_RANGE) {
obj2F4->vel.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
actor->vel.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
}
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 10.0f) + 10;
actor->timer_0BC = (s32) (Rand_ZeroOne() * 10.0f) + 10;
} else {
obj2F4->vel.x = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->vel.y = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->vel.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 25.0f) + 25;
obj2F4->gravity = 0.0f;
actor->vel.x = (Rand_ZeroOne() - 0.5f) * 10.0f;
actor->vel.y = (Rand_ZeroOne() - 0.5f) * 10.0f;
actor->vel.z = (Rand_ZeroOne() - 0.5f) * 10.0f;
actor->timer_0BC = (s32) (Rand_ZeroOne() * 25.0f) + 25;
actor->gravity = 0.0f;
}
if (arg1 == 2) {
obj2F4->scale = (Rand_ZeroOne() * 1.5f) + 0.75f;
actor->scale = (Rand_ZeroOne() * 1.5f) + 0.75f;
} else if (arg1 == 4) {
obj2F4->scale = (Rand_ZeroOne() * 0.8f) + 0.3f;
obj2F4->timer_0BC = (s32) (Rand_ZeroOne() * 50.0f) + 70;
actor->scale = (Rand_ZeroOne() * 0.8f) + 0.3f;
actor->timer_0BC = (s32) (Rand_ZeroOne() * 50.0f) + 70;
}
obj2F4->obj.rot.x = Rand_ZeroOne() * 360.0f;
actor->obj.rot.x = Rand_ZeroOne() * 360.0f;
}
Object_SetInfo(&obj2F4->info, obj2F4->obj.id);
Object_SetInfo(&actor->info, actor->obj.id);
}
void func_800A69F8(s32 arg0, f32 arg1, f32 arg2, f32 arg3) {
s32 i;
if (!gVersusMode) {
for (i = ARRAY_COUNT(gObjects2F4) - 1; i >= 10; i--) {
if (gObjects2F4[i].obj.status == 0) {
func_800A670C(&gObjects2F4[i], arg0, arg1, arg2, arg3);
for (i = ARRAY_COUNT(gActors) - 1; i >= 10; i--) {
if (gActors[i].obj.status == 0) {
func_800A670C(&gActors[i], arg0, arg1, arg2, arg3);
break;
}
}
@@ -1177,7 +1177,7 @@ bool func_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 a
useCol2 = false;
switch (objId) {
case OBJ_2F4_180:
case OBJ_ACTOR_180:
colId = COL1_0;
break;
case OBJ_80_4:
@@ -1512,14 +1512,14 @@ void func_800A8BA4(Player* player) {
Vec3f spfD4;
Vec3f spC8;
Vec3f spBC;
f32 padB8; // B8
Object_2F4* obj2F4; // B4
f32 padB0; // B0
Boss* boss; // AC
Object_4C* obj4C; // A8
s32 pad; // A4
Object_80* obj80; // A0
Player* opponent; // 9C
f32 padB8; // B8
Actor* actor; // B4
f32 padB0; // B0
Boss* boss; // AC
Object_4C* obj4C; // A8
s32 pad; // A4
Object_80* obj80; // A0
Player* opponent; // 9C
s32 sp98;
f32 sp94;
s32 sp90;
@@ -1841,40 +1841,39 @@ void func_800A8BA4(Player* player) {
}
}
}
for (i = 0, obj2F4 = gObjects2F4; i < ARRAY_COUNT(gObjects2F4); i++, obj2F4++) {
if ((obj2F4->obj.status == 2) && (obj2F4->timer_0C2 == 0)) {
if (obj2F4->obj.id == OBJ_2F4_180) {
temp_v0 = func_800A8304(player, obj2F4->obj.id, obj2F4->obj.pos.x, obj2F4->obj.pos.y,
obj2F4->obj.pos.z, obj2F4->obj.rot.x, obj2F4->obj.rot.y, obj2F4->obj.rot.z);
for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) {
if ((actor->obj.status == 2) && (actor->timer_0C2 == 0)) {
if (actor->obj.id == OBJ_ACTOR_180) {
temp_v0 = func_800A8304(player, actor->obj.id, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z,
actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z);
if (temp_v0 != 0) {
Player_ApplyDamage(player, temp_v0, obj2F4->info.damage);
Player_ApplyDamage(player, temp_v0, actor->info.damage);
}
} else if (obj2F4->obj.id == OBJ_2F4_200) {
if (obj2F4->unk_0B4 == 42) {
temp_v0 =
func_800A8304(player, OBJ_UNK_1000, obj2F4->obj.pos.x, obj2F4->obj.pos.y, obj2F4->obj.pos.z,
obj2F4->obj.rot.x, obj2F4->obj.rot.y, obj2F4->obj.rot.z);
} else if (actor->obj.id == OBJ_ACTOR_200) {
if (actor->unk_0B4 == 42) {
temp_v0 = func_800A8304(player, OBJ_UNK_1000, actor->obj.pos.x, actor->obj.pos.y,
actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z);
if (temp_v0 != 0) {
Player_ApplyDamage(player, temp_v0, obj2F4->info.damage);
Player_ApplyDamage(player, temp_v0, actor->info.damage);
}
} else if (obj2F4->unk_0B4 == 63) {
spfD4.x = fabsf(obj2F4->obj.pos.x - player->pos.x);
spfD4.y = fabsf(obj2F4->obj.pos.y - player->pos.y);
spfD4.z = fabsf(obj2F4->obj.pos.z - player->unk_138);
} else if (actor->unk_0B4 == 63) {
spfD4.x = fabsf(actor->obj.pos.x - player->pos.x);
spfD4.y = fabsf(actor->obj.pos.y - player->pos.y);
spfD4.z = fabsf(actor->obj.pos.z - player->unk_138);
if (sqrtf(VEC3F_SQ(spfD4)) < 900.0f) {
Player_ApplyDamage(player, 0, obj2F4->info.damage);
obj2F4->unk_0D0 = 3;
Player_ApplyDamage(player, 0, actor->info.damage);
actor->unk_0D0 = 3;
}
} else {
temp_v0 =
func_800A7974(player, obj2F4->info.hitbox, &sp98, obj2F4->obj.pos.x, obj2F4->obj.pos.y,
obj2F4->obj.pos.z, obj2F4->obj.rot.x, obj2F4->obj.rot.y, obj2F4->obj.rot.z,
obj2F4->unk_2E8.x, obj2F4->unk_2E8.y, obj2F4->unk_2E8.z + obj2F4->unk_0F4.z);
temp_v0 = func_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y,
actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z,
actor->vwork[29].x, actor->vwork[29].y,
actor->vwork[29].z + actor->unk_0F4.z);
if (temp_v0 != 0) {
if ((temp_v0 < 0) && (obj2F4->unk_0B4 == 38)) {
obj2F4->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032328);
if ((temp_v0 < 0) && (actor->unk_0B4 == 38)) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032328);
if (D_80177E80 >= 0) {
obj2F4->unk_046 = 2;
actor->unk_046 = 2;
D_80177E80++;
if (D_80177E80 == 3) {
func_800BA808(gMsg_ID_5504, RCID_FALCO);
@@ -1885,57 +1884,56 @@ void func_800A8BA4(Player* player) {
}
} else if (temp_v0 < 0) {
if (player->unk_22C == 0) {
Audio_PlaySfx(0x19000001, &obj2F4->sfxPos, 0, &D_800C5D34, &D_800C5D34,
&D_800C5D3C);
Audio_PlaySfx(0x19000001, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
player->unk_22C += 2;
if (player->unk_22C >= 4) {
player->unk_22C = 4;
}
} else {
Player_ApplyDamage(player, temp_v0, obj2F4->info.damage);
obj2F4->unk_0D0 = 3;
obj2F4->unk_0D4 = player->num + 1;
Player_ApplyDamage(player, temp_v0, actor->info.damage);
actor->unk_0D0 = 3;
actor->unk_0D4 = player->num + 1;
}
}
}
} else if ((obj2F4->obj.id >= OBJ_2F4_205) && (obj2F4->obj.id < OBJ_2F4_214)) {
temp_v0 = func_800A7974(player, obj2F4->info.hitbox, &sp98, obj2F4->unk_178 + obj2F4->obj.pos.x,
obj2F4->unk_134 + obj2F4->obj.pos.y + 25.0f, obj2F4->obj.pos.z,
obj2F4->unk_188, obj2F4->unk_17C, obj2F4->obj.rot.z, 0.0f, 0.0f, 0.0f);
} else if ((actor->obj.id >= OBJ_ACTOR_205) && (actor->obj.id < OBJ_ACTOR_214)) {
temp_v0 = func_800A7974(player, actor->info.hitbox, &sp98, actor->fwork[25] + actor->obj.pos.x,
actor->fwork[8] + actor->obj.pos.y + 25.0f, actor->obj.pos.z,
actor->fwork[29], actor->fwork[26], actor->obj.rot.z, 0.0f, 0.0f, 0.0f);
if (temp_v0 != 0) {
obj2F4->unk_0D0 = 3;
if (obj2F4->info.damage) {
Player_ApplyDamage(player, temp_v0, obj2F4->info.damage);
actor->unk_0D0 = 3;
if (actor->info.damage) {
Player_ApplyDamage(player, temp_v0, actor->info.damage);
} else {
obj2F4->unk_0D0 = -1;
actor->unk_0D0 = -1;
}
}
} else {
temp_v0 = func_800A7974(player, obj2F4->info.hitbox, &sp98, obj2F4->obj.pos.x, obj2F4->obj.pos.y,
obj2F4->obj.pos.z, obj2F4->obj.rot.x, obj2F4->obj.rot.y, obj2F4->obj.rot.z,
temp_v0 = func_800A7974(player, actor->info.hitbox, &sp98, actor->obj.pos.x, actor->obj.pos.y,
actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z,
0.0f, 0.0f, 0.0f);
if (temp_v0 != 0) {
if (temp_v0 < 0) {
if (player->unk_22C == 0) {
Audio_PlaySfx(0x19000001, &obj2F4->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
Audio_PlaySfx(0x19000001, &actor->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
player->unk_22C += 2;
if (player->unk_22C >= 4) {
player->unk_22C = 4;
}
} else {
obj2F4->unk_0D0 = 3;
if (obj2F4->obj.id == OBJ_2F4_190) {
obj2F4->unk_0D0 = -1;
actor->unk_0D0 = 3;
if (actor->obj.id == OBJ_ACTOR_190) {
actor->unk_0D0 = -1;
}
if (obj2F4->info.damage) {
Player_ApplyDamage(player, temp_v0, obj2F4->info.damage);
if (obj2F4->obj.id == OBJ_2F4_225) {
if (actor->info.damage) {
Player_ApplyDamage(player, temp_v0, actor->info.damage);
if (actor->obj.id == OBJ_ACTOR_225) {
player->unk_0D8.y = 0.0f;
}
} else {
obj2F4->unk_0D0 = -1;
actor->unk_0D0 = -1;
}
}
}
@@ -2886,11 +2884,11 @@ void func_800AD094(Player* player) {
}
bool func_800AD118(s32 playerNum) {
Object_2F4* obj2F4;
Actor* actor;
s32 i;
for (i = 0, obj2F4 = gObjects2F4; i < ARRAY_COUNT(gObjects2F4); i++, obj2F4++) {
if ((obj2F4->obj.status == 2) && (obj2F4->timer_0CA[playerNum] != 0)) {
for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) {
if ((actor->obj.status == 2) && (actor->timer_0CA[playerNum] != 0)) {
return false;
}
}
@@ -2941,8 +2939,8 @@ bool func_800AD1F4(Player* player) {
}
if (gInputPress->button & A_BUTTON) {
for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) {
if ((gObjects2F4[i].obj.status == 2) && (gObjects2F4[i].timer_0CA[player->num] != 0)) {
for (i = 0; i < ARRAY_COUNT(gActors); i++) {
if ((gActors[i].obj.status == 2) && (gActors[i].timer_0CA[player->num] != 0)) {
if ((gPlayerShots[14 - player->num].obj.status == 0) ||
(gPlayerShots[14 - player->num].obj.id != PLAYERSHOT_8) ||
((gPlayerShots[14 - player->num].obj.id == PLAYERSHOT_8) &&
@@ -2979,8 +2977,8 @@ bool func_800AD1F4(Player* player) {
}
if (gInputPress->button & B_BUTTON) {
var_a2 = false;
for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++) {
if ((gObjects2F4[i].obj.status == 2) && (gObjects2F4[i].timer_0CA[player->num] != 0)) {
for (i = 0; i < ARRAY_COUNT(gActors); i++) {
if ((gActors[i].obj.status == 2) && (gActors[i].timer_0CA[player->num] != 0)) {
var_a2 = true;
break;
}
src/main/fox_radio.c
+3 -4
View File
@@ -718,15 +718,14 @@ void func_800BB5D0(void) {
break;
}
if ((gObjects2F4[var_v1].obj.status != 2) && (gFrameCount & 4) &&
(gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (D_801782A4 != 2) && (D_801782A4 != 3) &&
(D_801782A4 != 1000)) {
if ((gActors[var_v1].obj.status != 2) && (gFrameCount & 4) && (gPlayer[0].state_1C8 == PLAYERSTATE_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(31, 167, 1.0f, 1.0f, "DOWN");
}
if (((D_801782A4 != 2) && (D_801782A4 != 3)) && (D_801782A4 != 1000)) {
func_80086110(22.0f, 165.0f, gObjects2F4[var_v1].unk_0CE * 2.55f);
func_80086110(22.0f, 165.0f, gActors[var_v1].unk_0CE * 2.55f);
}
}
if (((D_801782A4 != 2) && (D_801782A4 != 3)) && (D_801782A4 != 1000)) {

Some files were not shown because too many files have changed in this diff Show More