Even more progress with object_functions

include/structs.h

@@ -702,7 +702,11 @@ typedef struct Object {
   /* 0x0070 */ u32 unk70;
 
   /* 0x0074 */ u32 unk74;
+
+  union {
   /* 0x0078 */ s32 unk78;
+  /* 0x0078 */ f32 unk78f;
+  };
 
   union {
       struct {

lib/src/os/osMotor.c

@@ -10,7 +10,6 @@
 #define MOTOR_DEFAULT_BANK 128
 
 static void _MakeMotorData(int channel, u16 address, u8 *buffer, OSPifRam *mdata);
-//TODO: These should really be declared here instead of somewhere else
 OSPifRam _MotorStopData[MAXCONTROLLERS];
 OSPifRam _MotorStartData[MAXCONTROLLERS];
 u8 _motorstopbuf[BLOCKSIZE];

src/object_functions.h

@@ -481,114 +481,114 @@ void obj_init_lasergun(Object *obj, LevelObjectEntry_Lasergun *entry);
 void obj_init_laserbolt(Object *obj, LevelObjectEntry_Laserbolt *entry);
 void obj_init_torch_mist(Object *obj, LevelObjectEntry_Torch_Mist *entry);
 void obj_loop_torch_mist(Object *obj, s32 speed);
-void obj_init_effectbox(s32 arg0, s32 arg1);
-void obj_init_trophycab(Object *arg0, u8 *arg1);
-void obj_init_collectegg(Object *arg0, s32 arg1);
-void obj_init_eggcreator(s32 arg0, s32 arg1);
-void obj_loop_eggcreator(Object *arg0, s32 arg1);
-void obj_init_lighthouse_rocketsignpost(Object *arg0, LevelObjectEntry8003572C *arg1);
-void obj_loop_rocketsignpost(Object *obj, s32 arg1);
-void obj_init_airzippers_waterzippers(Object *arg0, LevelObjectEntry8003588C *arg1);
-void obj_init_unknown58(unk80035E20 *arg0, s32 arg1);
-void obj_loop_unknown58(Object *obj, s32 arg1);
-void obj_init_characterflag(Object *arg0, unk80035EF8 *arg1);
+void obj_init_effectbox(Object *obj, s32 entry);
+void obj_init_trophycab(Object *obj, LevelObjectEntry_TrophyCab *entry);
+void obj_init_collectegg(Object *obj, s32 entry);
+void obj_init_eggcreator(Object *obj, s32 entry);
+void obj_loop_eggcreator(Object *obj, s32 speed);
+void obj_init_lighthouse_rocketsignpost(Object *obj, LevelObjectEntry8003572C *entry);
+void obj_loop_rocketsignpost(Object *obj, s32 speed);
+void obj_init_airzippers_waterzippers(Object *obj, LevelObjectEntry8003588C *entry);
+void obj_init_unknown58(Object *obj, s32 entry);
+void obj_loop_unknown58(Object *obj, s32 speed);
+void obj_init_characterflag(Object *obj, unk80035EF8 *entry);
 void obj_loop_characterflag(Object *obj, s32 speed);
-void obj_init_stopwatchman(Object *arg0, s32 arg1);
+void obj_init_stopwatchman(Object *obj, s32 entry);
 void func_80036BCC(u16 arg0, s32 arg1);
-void obj_init_lavaspurt(unk80037578 *arg0, u8 *arg1);
-void obj_init_posarrow(unk80037624 *arg0, s32 arg1);
-void obj_init_animator(Object *arg0, LevelObjectEntry800376E0 *arg1, s32 arg2);
-void obj_loop_animobject(s32 arg0, s32 speed);
-void obj_loop_dooropener(unk80037D08_arg0 *arg0, s32 speed);
-void obj_init_overridepos(s32 arg0, s32 arg1);
+void obj_init_lavaspurt(Object *obj, u8 *entry);
+void obj_init_posarrow(Object *obj, s32 entry);
+void obj_init_animator(Object *obj, LevelObjectEntry800376E0 *entry, s32 arg2);
+void obj_loop_animobject(Object *obj, s32 speed);
+void obj_loop_dooropener(Object *obj, s32 speed);
+void obj_init_overridepos(Object *obj, s32 entry);
 void func_80037D60(s32 arg0, s32 arg1);
-void obj_init_wizpigship(s32 arg0, s32 arg1);
-void obj_init_hittester(Object *arg0, s32 arg1);
-void obj_loop_hittester(s32 arg0, s32 arg1);
-void obj_init_dynamic_lighting_object(Object *arg0, s32 arg1);
-void obj_init_unknown96(Object *arg0, s32 arg1);
-void obj_init_snowball(Object *arg0, s32 arg1);
-void func_80038330(Object *obj, s32 arg1);
-void obj_loop_animcamera(Object *obj, s32 arg1);
-void func_800387C0(Object *obj, s32 arg1);
-void obj_loop_animcar(Object *obj, s32 arg1);
-void obj_init_infopoint(Object *arg0, u8 *arg1);
-void obj_loop_infopoint(Object *arg0, s32 arg1);
-void obj_init_smoke(s32 arg0, s32 arg1);
-void obj_loop_smoke(Object *obj, s32 arg1);
-void obj_init_unknown25(s32 arg0, s32 arg1);
-void obj_loop_unknown25(Object *arg0, s32 arg1);
-void obj_init_wardensmoke(s32 arg0, s32 arg1);
-void obj_loop_wardensmoke(Object *arg0, s32 arg1);
-void obj_init_teleport(Object *arg0, s32 arg1);
-void obj_loop_teleport(Object *arg0, s32 arg1);
-void obj_init_exit(Object *obj, LevelObjectEntry80038E3C *arg1);
-void obj_init_cameracontrol(unk80039160 *arg0, s8 *arg1);
-void obj_loop_cameracontrol(s32 arg0, s32 arg1);
-void obj_init_setuppoint(unk80039190 *arg0, u8 *arg1);
-void obj_loop_setuppoint(s32 arg0, s32 arg1);
-void obj_init_dino_whale(Object *arg0, s32 arg1);
-void obj_loop_dino_whale(Object *obj, s32 arg1);
-void obj_init_parkwarden(Object *arg0, s32 arg1);
+void obj_init_wizpigship(Object *obj, s32 entry);
+void obj_init_hittester(Object *obj, s32 entry);
+void obj_loop_hittester(Object *obj, s32 speed);
+void obj_init_dynamic_lighting_object(Object *obj, s32 entry);
+void obj_init_unknown96(Object *obj, s32 entry);
+void obj_init_snowball(Object *obj, s32 entry);
+void func_80038330(s32 arg0, s32 arg1);
+void obj_loop_animcamera(Object *obj, s32 speed);
+void func_800387C0(s32 arg0, s32 arg1);
+void obj_loop_animcar(Object *obj, s32 speed);
+void obj_init_infopoint(Object *obj, u8 *entry);
+void obj_loop_infopoint(Object *obj, s32 speed);
+void obj_init_smoke(Object *obj, s32 entry);
+void obj_loop_smoke(Object *obj, s32 speed);
+void obj_init_unknown25(Object *obj, s32 entry);
+void obj_loop_unknown25(Object *obj, s32 speed);
+void obj_init_wardensmoke(Object *obj, s32 entry);
+void obj_loop_wardensmoke(Object *obj, s32 speed);
+void obj_init_teleport(Object *obj, s32 entry);
+void obj_loop_teleport(Object *obj, s32 speed);
+void obj_init_exit(Object *obj, LevelObjectEntry80038E3C *entry);
+void obj_init_cameracontrol(Object *obj, s8 *entry);
+void obj_loop_cameracontrol(Object *obj, s32 speed);
+void obj_init_setuppoint(Object *obj, u8 *entry);
+void obj_loop_setuppoint(Object *obj, s32 speed);
+void obj_init_dino_whale(Object *obj, s32 entry);
+void obj_loop_dino_whale(Object *obj, s32 speed);
+void obj_init_parkwarden(Object *obj, s32 entry);
 void func_80039320(s16 arg0);
 void func_8003AC3C(u16 arg0, s32 arg1);
-void obj_loop_gbparkwarden(s32 arg0, s32 arg1);
+void obj_loop_gbparkwarden(Object *obj, s32 speed);
 f32 func_8003ACAC(void);
-void obj_init_checkpoint(Object *arg0, u8 *arg1, s32 arg2);
-void obj_loop_checkpoint(s32 arg0, s32 speed);
-void obj_init_modechange(Object *obj, LevelObjectEntry8003AD34 *arg1);
-void obj_init_bonus(Object *obj, LevelObjectEntry8003AD34 *arg1);
-void obj_init_ttdoor(Object *obj, LevelObjectEntry8003C1E0 *arg1);
-void obj_init_bridge_whaleramp(Object *arg0, u8 *arg1);
-void obj_init_rampswitch(Object *arg0, u8 *arg1);
-void obj_loop_rampswitch(Object *arg0, s32 speed);
-void obj_init_seamonster(s32 arg0, s32 arg1);
-void obj_loop_seamonster(s32 arg0, s32 speed);
-void obj_init_fogchanger(unk8003CF18 *arg0, u8 *arg1);
-void obj_init_skycontrol(Object *arg0, u8 *arg1);
-void obj_loop_skycontrol(Object *arg0, s32 speed);
-void obj_init_ainode(s32 arg0, u8 *arg1);
-void obj_loop_ainode(s32 arg0, s32 speed);
-void obj_init_treasuresucker(unk8003D038 *arg0, s8 *arg1);
-void obj_init_flycoin(s32 arg0, s32 arg1);
-void obj_init_coincreator(unk8003D3EC *arg0, s32 arg1);
-void obj_init_coin(Object *arg0, s32 arg1);
-void obj_init_silvercoin_adv2(Object *obj, s32 arg1);
-void obj_init_silvercoin(Object *obj, s32 arg1);
-void obj_init_worldkey(Object *obj, unk8003DE74 *arg1);
+void obj_init_checkpoint(Object *obj, u8 *entry, s32 arg2);
+void obj_loop_checkpoint(Object *obj, s32 speed);
+void obj_init_modechange(Object *obj, LevelObjectEntry8003AD34 *entry);
+void obj_init_bonus(Object *obj, LevelObjectEntry8003AD34 *entry);
+void obj_init_ttdoor(Object *obj, LevelObjectEntry8003C1E0 *entry);
+void obj_init_bridge_whaleramp(Object *obj, u8 *entry);
+void obj_init_rampswitch(Object *obj, u8 *entry);
+void obj_loop_rampswitch(Object *obj, s32 speed);
+void obj_init_seamonster(Object *obj, s32 entry);
+void obj_loop_seamonster(Object *obj, s32 speed);
+void obj_init_fogchanger(Object *obj, u8 *entry);
+void obj_init_skycontrol(Object *obj, u8 *entry);
+void obj_loop_skycontrol(Object *obj, s32 speed);
+void obj_init_ainode(Object *obj, u8 *entry);
+void obj_loop_ainode(Object *obj, s32 speed);
+void obj_init_treasuresucker(Object *obj, s8 *entry);
+void obj_init_flycoin(Object *obj, s32 entry);
+void obj_init_coincreator(Object *obj, s32 entry);
+void obj_init_coin(Object *obj, s32 entry);
+void obj_init_silvercoin_adv2(Object *obj, s32 entry);
+void obj_init_silvercoin(Object *obj, s32 entry);
+void obj_init_worldkey(Object *obj, unk8003DE74 *entry);
 void obj_loop_worldkey(Object *worldKeyObj, s32 speed);
-void obj_init_wballoonpop(s32 arg0, s32 arg1);
-void obj_loop_wballoonpop(s32 arg0, s32 speed);
-void obj_init_weapon(Object *arg0, s32 arg1);
+void obj_init_wballoonpop(Object *obj, s32 entry);
+void obj_loop_wballoonpop(Object *obj, s32 speed);
+void obj_init_weapon(Object *obj, s32 entry);
 void obj_loop_weapon(Object *obj);
 void func_8003F0D0(void);
 void func_8003F0DC(void);
-void obj_init_audioline(Object *arg0, LevelObjectEntry8003FEF4 *arg1);
-void obj_init_audioreverb(Object *arg0, LevelObjectEntry8004001C *entry);
-void obj_init_texscroll(Object *obj, LevelObjectEntry800400A4 *arg1, s32 arg2);
-void obj_init_rgbalight(Object *arg0, s32 arg1, s32 arg2);
-void obj_init_buoy_pirateship(Object *arg0, s32 arg1, s32 arg2);
-void obj_loop_buoy_pirateship(Object *arg0, s32 speed);
-void obj_init_log(Object *arg0, LevelObjectEntry8004049C *arg1, s32 arg2);
-void obj_init_wavegenerator(s32 arg0, s32 arg1, s32 arg2);
-void obj_init_midichset(unk80042014_arg0 *arg0, unk80042014_arg1 *arg1);
-void obj_init_bubbler(Object *arg0, unk8004203C_arg1 *arg1);
-void obj_loop_bubbler(Object *arg0, s32 speed);
-void obj_init_boost(unk8004210C *arg0, s8 *arg1);
-void obj_init_unknown94(s32 arg0, s32 arg1, s32 arg2);
-void obj_loop_unknown94(s32 arg0, s32 speed);
-void obj_init_rangetrigger(s32 arg0, s32 arg1);
+void obj_init_audioline(Object *obj, LevelObjectEntry8003FEF4 *entry);
+void obj_init_audioreverb(Object *obj, LevelObjectEntry8004001C *entry);
+void obj_init_texscroll(Object *obj, LevelObjectEntry800400A4 *entry, s32 arg2);
+void obj_init_rgbalight(Object *obj, s32 entry, s32 arg2);
+void obj_init_buoy_pirateship(Object *obj, s32 entry, s32 arg2);
+void obj_loop_buoy_pirateship(Object *obj, s32 speed);
+void obj_init_log(Object *obj, LevelObjectEntry8004049C *entry, s32 arg2);
+void obj_init_wavegenerator(Object *obj, s32 entry, s32 arg2);
+void obj_init_midichset(Object *obj, unk80042014_arg1 *entry);
+void obj_init_bubbler(Object *obj, unk8004203C_arg1 *entry);
+void obj_loop_bubbler(Object *obj, s32 speed);
+void obj_init_boost(Object *obj, s8 *entry);
+void obj_init_unknown94(Object *obj, s32 entry, s32 arg2);
+void obj_loop_unknown94(Object *obj, s32 speed);
+void obj_init_rangetrigger(Object *obj, s32 entry);
 void obj_loop_rangetrigger(Object *obj, s32 speed);
-void obj_init_frog(Object *obj, LevelObjectEntry80042210 *arg1);
-void obj_loop_pigrocketeer(s32 arg0, s32 speed);
-void obj_init_levelname(unk80042A1C *arg0, s8 *arg1);
-void obj_init_wizghosts(unk80042CD0 *arg0, s32 arg1);
+void obj_init_frog(Object *obj, LevelObjectEntry80042210 *entry);
+void obj_loop_pigrocketeer(Object *obj, s32 speed);
+void obj_init_levelname(Object *obj, s8 *entry);
+void obj_init_wizghosts(Object *obj, s32 entry);
 
 //Non Matching
 void obj_loop_lavaspurt(Object *obj, s32 speed);
 void obj_loop_animator(Object *obj, s32 speed);
 void obj_loop_vehicleanim(Object *obj, s32 speed);
 void obj_loop_snowball(Object *obj, s32 speed);
-void obj_loop_goldenballoon(s32 arg0, s32 speed);
+void obj_loop_goldenballoon(Object *obj, s32 speed);
 
 #endif