From f412795c0a94c39987fe636a402f8170a499e995 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 31 Aug 2024 21:10:44 +1000 Subject: [PATCH] Remove headers for private functions --- src/game/bg.c | 19 +++ src/game/bondbike.c | 2 + src/game/bondgrab.c | 2 + src/game/bondgun.c | 9 ++ src/game/bondwalk.c | 3 + src/game/bossfile.c | 3 + src/game/botinv.c | 2 + src/game/camdraw.c | 28 +++++ src/game/challenge.c | 2 + src/game/chr.c | 4 + src/game/chraction.c | 16 ++- src/game/dlights.c | 10 ++ src/game/endscreen.c | 5 + src/game/explosions.c | 2 + src/game/filelist.c | 2 + src/game/filemgr.c | 3 + src/game/game_1531a0.c | 2 + src/game/hudmsg.c | 5 + src/game/lv.c | 3 + src/game/mainmenu.c | 2 + src/game/menu.c | 4 + src/game/mplayer/mplayer.c | 2 + src/game/mplayer/setup.c | 7 ++ src/game/music.c | 3 + src/game/pak.c | 44 +++++++ src/game/player.c | 11 ++ src/game/playermgr.c | 2 + src/game/prop.c | 3 + src/game/propobj.c | 18 +++ src/game/propsnd.c | 4 + src/game/radar.c | 2 + src/game/setup.c | 3 + src/game/sky.c | 4 + src/game/splat.c | 4 + src/game/texdecompress.c | 6 + src/game/title.c | 2 + src/game/training.c | 3 + src/game/wallhit.c | 2 + src/game/weather.c | 3 + src/game/zbuf.c | 2 + src/include/game/activemenu.h | 11 -- src/include/game/bg.h | 60 ---------- src/include/game/body.h | 1 - src/include/game/bondbike.h | 11 -- src/include/game/bondeyespy.h | 5 - src/include/game/bondgrab.h | 16 --- src/include/game/bondgun.h | 94 --------------- src/include/game/bondhead.h | 3 - src/include/game/bondmove.h | 14 --- src/include/game/bondwalk.h | 18 --- src/include/game/bossfile.h | 3 - src/include/game/bot.h | 26 ----- src/include/game/botinv.h | 4 - src/include/game/camdraw.h | 69 ----------- src/include/game/casing.h | 1 - src/include/game/challenge.h | 6 - src/include/game/cheats.h | 6 - src/include/game/chr.h | 25 ---- src/include/game/chraction.h | 146 ----------------------- src/include/game/crc.h | 1 - src/include/game/dlights.h | 16 --- src/include/game/endscreen.h | 30 ----- src/include/game/env.h | 2 - src/include/game/explosions.h | 7 -- src/include/game/filelist.h | 1 - src/include/game/filemgr.h | 61 ---------- src/include/game/fmb.h | 5 - src/include/game/game_097aa0.h | 1 - src/include/game/game_0b0fd0.h | 1 - src/include/game/game_13c510.h | 3 - src/include/game/game_1531a0.h | 9 -- src/include/game/gamefile.h | 1 - src/include/game/getitle.h | 2 - src/include/game/gfxreplace.h | 1 - src/include/game/gunfx.h | 4 - src/include/game/hudmsg.h | 13 --- src/include/game/inv.h | 10 -- src/include/game/lv.h | 14 --- src/include/game/mainmenu.h | 57 --------- src/include/game/menu.h | 43 ------- src/include/game/menugfx.h | 2 - src/include/game/menuitem.h | 52 --------- src/include/game/modelmgr.h | 1 - src/include/game/mplayer/ingame.h | 15 --- src/include/game/mplayer/mplayer.h | 27 ----- src/include/game/mplayer/setup.h | 109 ------------------ src/include/game/mpstats.h | 3 - src/include/game/music.h | 7 -- src/include/game/nbomb.h | 8 -- src/include/game/objectives.h | 4 - src/include/game/padhalllv.h | 17 --- src/include/game/pak.h | 86 -------------- src/include/game/player.h | 39 ------- src/include/game/playermgr.h | 1 - src/include/game/portal.h | 1 - src/include/game/prop.h | 15 --- src/include/game/propobj.h | 166 --------------------------- src/include/game/propsnd.h | 8 -- src/include/game/race.h | 5 - src/include/game/radar.h | 2 - src/include/game/room.h | 4 - src/include/game/savebuffer.h | 3 - src/include/game/setup.h | 20 ---- src/include/game/setuputils.h | 1 - src/include/game/sight.h | 18 --- src/include/game/sky.h | 18 --- src/include/game/smoke.h | 3 - src/include/game/sparks.h | 2 - src/include/game/splat.h | 1 - src/include/game/stars.h | 2 - src/include/game/stubs/game_175f50.h | 2 - src/include/game/tex.h | 8 -- src/include/game/texdecompress.h | 24 ---- src/include/game/timing.h | 1 - src/include/game/title.h | 34 ------ src/include/game/training.h | 50 -------- src/include/game/trainingmenus.h | 52 --------- src/include/game/utils.h | 4 - src/include/game/vtxstore.h | 1 - src/include/game/wallhit.h | 5 - src/include/game/weather.h | 7 -- src/include/game/zbuf.h | 1 - src/include/lib/anim.h | 5 - src/include/lib/args.h | 1 - src/include/lib/boot.h | 1 - src/include/lib/collision.h | 4 - src/include/lib/crash.h | 11 -- src/include/lib/debughud.h | 2 - src/include/lib/dma.h | 2 - src/include/lib/joy.h | 6 - src/include/lib/lib_317f0.h | 5 - src/include/lib/lib_34240.h | 2 - src/include/lib/lib_3e8c0.h | 6 - src/include/lib/main.h | 2 - src/include/lib/mema.h | 1 - src/include/lib/model.h | 30 ----- src/include/lib/mp3.h | 3 - src/include/lib/mtx.h | 5 - src/include/lib/music.h | 5 - src/include/lib/reset.h | 1 - src/include/lib/sched.h | 3 - src/include/lib/segments.h | 5 - src/include/lib/snd.h | 13 --- src/include/lib/str.h | 2 - src/include/lib/vi.h | 1 - src/lib/anim.c | 2 + src/lib/boot.c | 2 + src/lib/collision.c | 2 + src/lib/crash.c | 1 + src/lib/joy.c | 4 + src/lib/main.c | 3 + src/lib/mp3.c | 4 + src/lib/mtx.c | 5 + src/lib/naudio/n_sndplayer.c | 3 + src/lib/sched.c | 3 + src/lib/snd.c | 4 + 156 files changed, 285 insertions(+), 1747 deletions(-) diff --git a/src/game/bg.c b/src/game/bg.c index 7433717d7..def8fee21 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -130,6 +130,25 @@ s32 g_BgNumRoomLoadCandidates = 0; u16 g_BgFrameCount = 0xfffe; s32 g_BgNumPortalCameraCacheItems = 0; +Gfx *bg_scissor_within_viewport_f(Gfx *gdl, f32 viewleft, f32 viewtop, f32 viewright, f32 viewbottom); +Gfx *bg_render_room_opaque(Gfx *gdl, s32 roomnum); +void bg_set_stage_translation_thing(f32 arg0); +Gfx *bg_render_room_xlu(Gfx *gdl, s32 roomnum); +Gfx *bg_render_scene_and_load_candidate(Gfx *gdl); +void bg_clear_portal_camera_cache(void); +void bg_expand_box(struct screenbox *a, struct screenbox *b); +u32 bg_inflate(u8 *src, u8 *dst, u32 len); +void bg_load_room(s32 roomnum); +void bg_unload_all_rooms(void); +void bg_tick_rooms(void); +void bg_find_room_vtx_batches(s32 roomnum); +void bg_choose_rooms_to_load(void); +void bg_tick_portals(void); +void bg_calculate_screen_properties(void); +void bg_expand_room_to_portals(s32 roomnum); +void bg_init_portal(s32 portalnum); +void bg_init_room(s32 roomnum); + void bg_unpause_props_in_room(u32 roomnum, bool tintedglassonly) { struct prop *prop; diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 239b139d1..e4db7049f 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -25,6 +25,8 @@ #include "data.h" #include "types.h" +void bbike_update_vehicle_offset(void); + void bbike_init(void) { struct hoverbikeobj *hoverbike = (struct hoverbikeobj *)g_Vars.currentplayer->hoverbike->obj; diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 5efeae947..580f222f8 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -27,6 +27,8 @@ u32 var8009de8c; bool var80070e80 = false; +void bgrab0f0ce0bc(struct coord *arg0); + void bgrab_init(void) { s32 prevmode = g_Vars.currentplayer->bondmovemode; diff --git a/src/game/bondgun.c b/src/game/bondgun.c index 606b631fb..638d782c9 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -186,6 +186,15 @@ char var800700bc[][10] = { { 'x','x','x' }, // "xxx" }; +void bgun_free_held_rocket(s32 handnum); +void bgun_free_weapon(s32 handnum); +void bgun_tick_switch2(void); +void bgun_switch_to_previous(void); +void bgun_auto_switch_weapon(void); +void bgun_start_slide(s32 handnum); +void bgun_set_aim_pos(struct coord *coord); +void bgun0f0abd30(s32 handnum); + #if !MATCHING || VERSION >= VERSION_NTSC_1_0 void bgun_rumble(s32 handnum, s32 weaponnum) { diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index b764f9f12..59ef1b986 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -27,6 +27,9 @@ #include "data.h" #include "types.h" +bool bwalk_calculate_new_position_with_push(struct coord *delta, f32 rotateamount, bool apply, f32 extrawidth, s32 types); +void bwalk_update_crouch_offset_real(void); + void bwalk_init(void) { u32 prevmode = g_Vars.currentplayer->bondmovemode; diff --git a/src/game/bossfile.c b/src/game/bossfile.c index b355ec5eb..a13cdf8af 100644 --- a/src/game/bossfile.c +++ b/src/game/bossfile.c @@ -25,6 +25,9 @@ u8 var800a22d0[0x5b]; u8 g_AltTitleUnlocked; u8 g_AltTitleEnabled; +void bossfile_load(void); +void bossfile_set_defaults(void); + void bossfile_set_defaults2(void) { bossfile_set_defaults(); diff --git a/src/game/botinv.c b/src/game/botinv.c index f0c5ff244..ee10ed49a 100644 --- a/src/game/botinv.c +++ b/src/game/botinv.c @@ -132,6 +132,8 @@ struct botweaponconfig g_BotWeaponConfigs[] = { /*WEAPON_SUICIDEPILL */ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, }; +void botinv_score_weapon_by_itself(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2); + /** * Remove all items from the bot's inventory. */ diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 2368d172e..1d7fac8a2 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -231,6 +231,34 @@ u16 var8007f904[] = { u32 var8007f9d0 = 0x00000000; +struct var8007f8e0 *func0f14a06c(s32 index); +struct var8007f8dc *func0f14a20c(void); +void func0f14ad58(s32 index); +void func0f14b178(void); +void func0f14b394(struct var8007f8e0 *arg0); +void func0f14bc04(void); +void func0f14c50c(struct var8007f8e0 *dst, struct var8007f8e0 *src, u32 line, char *file); +void func0f14c75c(struct textureconfig *arg0, struct textureconfig *arg1); +void func0f14c7dc(struct textureconfig *tconfig); +u32 func0f14c814(struct textureconfig *tconfig); +void func0f14d064(s32 index, u8 *arg1); +void func0f14d2c8(u8 *arg0, u8 *arg1); +void func0f14d4f0(u8 *src, u8 *dst); +void func0f14d714(u8 *arg0, u8 *arg1); +void func0f14d84c(f32 *arg0, s32 arg1); +void func0f14d8d8(f32 *arg0, f32 *arg1, s32 arg2, f32 *arg3, s32 arg4); +void phead0f14dac0(u8 *arg0, struct textureconfig *arg1); +void func0f14def0(s32 index, u32 line, char *file); +void func0f14e1c4(struct var8007f8e0 *arg0); +f32 func0f14e4ac(s32 arg0, s32 *arg1, s32 *arg2); +void func0f14e790(u8 *arg0); +void func0f14e7e0(u8 *arg0); +void func0f14e884(struct textureconfig *tconfig, s32 numrows, s32 arg2, u64 arg3); +void func0f14ecd8(s32 *arg0, s32 *arg1, s32 *arg2, s32 *arg3); +void func0f14eeb0(f32 arg0[7]); +void func0f14ef50(f32 *arg0); +void func0f14ff94(struct var8007f8e0 *arg0); + /** * Fill the texture buffer with a linear gradient: black (left) to white (right). */ diff --git a/src/game/challenge.c b/src/game/challenge.c index 250bd9884..a82d48494 100644 --- a/src/game/challenge.c +++ b/src/game/challenge.c @@ -59,6 +59,8 @@ struct challenge g_MpChallenges[] = { { L_OPTIONS_435, MPCONFIG_CHALLENGE30 }, // "Challenge 30" }; +void challenge_apply(void); + bool challenge_is_available(s32 challengeindex) { return (g_MpChallenges[challengeindex].availability & 1) != 0; diff --git a/src/game/chr.c b/src/game/chr.c index d3004dd30..7d129b7a3 100644 --- a/src/game/chr.c +++ b/src/game/chr.c @@ -71,6 +71,10 @@ struct chrdata *g_ChrSlots = NULL; s32 g_NumChrSlots = 0; +Gfx *chr_render_cloak(Gfx *gdl, struct prop *chrprop, struct prop *thisprop); +Gfx *chr_render_shield(Gfx *gdl, struct chrdata *chr, u32 alpha); +void chr_set_drcaroll_images(struct chrdata *drcaroll, s32 imageleft, s32 imageright); + s32 chrs_get_num_slots(void) { return g_NumChrSlots; diff --git a/src/game/chraction.c b/src/game/chraction.c index b83f8b905..f64c81d6e 100644 --- a/src/game/chraction.c +++ b/src/game/chraction.c @@ -1060,7 +1060,6 @@ struct attackanimgroup *g_StandLightAttackAnims[][32] = { }, }; - struct attackanimconfig var800663d8[] = { { ANIM_007A, 26, 0, 0, 7, 92, 28, 68, -1, -1, 11, 73, RAD(50, 0.87252569198608), RAD(-40, -0.69802057743073), RAD(40, 0.69802057743073), RAD(-40, -0.69802057743073), 0, 0 }, { 0, 0, 0, 0, 0, -1 }, @@ -1400,6 +1399,21 @@ struct animdist *g_ChrAvgAnimMoveDists[] = { g_ChrAvgAnimMoveDistsRobot, }; +void chr_attack(struct chrdata *chr, struct attackanimgroup **animgroups, bool flip, bool *firing, u32 attackflags, s32 entityid, bool standing); + +void chr_damage(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, + struct prop *aprop, s32 hitpart, bool damageshield, struct prop *prop2, + struct modelnode *node, struct model *model, s32 side, s16 *hitpos, + bool explosion, struct coord *explosionpos); + +void chr_fade_corpse(struct chrdata *chr); +s32 chr_turn(struct chrdata *chr, s32 turning, f32 endanimframe, f32 speed, f32 toleranceangle); +void robot_attack(struct chrdata *chr); +s32 chr_start_sk_jump(struct chrdata *chr, u8 pouncebits, u8 arg2, s32 arg3, u8 arg4); +void chr_get_attack_entity_pos(struct chrdata *chr, u32 attackflags, s32 entityid, struct coord *pos, RoomNum *rooms); +f32 prop_get_distance_to_prop(struct prop *a, struct prop *b); +s32 chr_set_chr_preset_to_chr_near_pos(u8 checktype, struct chrdata *chr, f32 distance, struct coord *pos, RoomNum *rooms); + f32 chr_get_anim_movedist_per_frame(s16 animnum) { s32 i; diff --git a/src/game/dlights.c b/src/game/dlights.c index 30f33e749..906f41ee2 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -87,6 +87,16 @@ u32 var80061454 = 0xffffffff; s32 g_LightsPrevTickMode = 0; #endif +void func0f00215c(u8 *arg0); +void lights_calculate_room_dimensions(void); +void func0f00259c(s32 roomnum); +void func0f002844(s32 roomnum, f32 arg1, s32 arg2, s32 portalnum); +void rooms_tick_lighting(void); +void room_flash_local_lighting(s32 roomnum, s32 increment, s32 limit); +void func0f004c6c(void); +void func0f00505c(void); +void func0f005bb0(void); + u32 func0f000920(s32 portalnum1, s32 portalnum2) { if (portalnum1 != portalnum2) { diff --git a/src/game/endscreen.c b/src/game/endscreen.c index d837e2860..e58d522fb 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -42,6 +42,11 @@ #define CHEATINFO_SET_TIMED_CHEATNUM(cheatnum) (cheatnum) #define CHEATINFO_SET_COMPL_CHEATNUM(cheatnum) ((cheatnum) << 16) +void endscreen_continue(s32 context); +char *endscreen_menu_text_target_time(struct menuitem *item); +char *endscreen_menu_text_timed_cheat_name(struct menuitem *item); +char *endscreen_menu_text_completion_cheat_name(struct menuitem *item); + MenuItemHandlerResult endscreen_handle_decline_mission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { diff --git a/src/game/explosions.c b/src/game/explosions.c index 039f5565e..b4ba2f2ce 100644 --- a/src/game/explosions.c +++ b/src/game/explosions.c @@ -81,6 +81,8 @@ struct explosiontype g_ExplosionTypes[] = { /*25*/ { 640, 480, 32, 11.2, 1600, 1000, 1000, 180, 2, 5, SMOKETYPE_NONE, SFX_80A4, 4 }, }; +Gfx *explosion_render_part(struct explosion *exp, struct explosionpart *part, Gfx *gdl, struct coord *coord, s32 arg4); + bool explosion_create_simple(struct prop *prop, struct coord *pos, RoomNum *rooms, s16 type, s32 playernum) { return explosion_create(prop, pos, rooms, type, playernum, false, NULL, 0, NULL); diff --git a/src/game/filelist.c b/src/game/filelist.c index feeb5f420..eee839988 100644 --- a/src/game/filelist.c +++ b/src/game/filelist.c @@ -29,6 +29,8 @@ bool var80075bd0[] = { true, true, true, true }; bool var80075be0[] = { false, false, false, false }; u32 var80075bf0 = false; +void filelist_update(struct filelist *list); + void func0f110bf0(void) { // empty diff --git a/src/game/filemgr.c b/src/game/filemgr.c index 62c1d277d..d9e7abdb9 100644 --- a/src/game/filemgr.c +++ b/src/game/filemgr.c @@ -61,6 +61,9 @@ struct menudialogdef g_FilemgrDuplicateNameMenuDialog; struct menudialogdef g_FilemgrRenameMenuDialog; #endif +void filemgr_retry_save(s32 context); +void filemgr_push_delete_file_dialog(s32 listnum); + #if PAL MenuItemHandlerResult filemgr_handle_set_language(s32 operation, struct menuitem *item, union handlerdata *data) { diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 003bca224..8ff4807fb 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -141,6 +141,8 @@ u32 var8007fbbc = 0x0000003c; u32 var8007fbc0 = 0x44444400; u32 var8007fbc4 = 0xffffff00; +Gfx *text0f156a24(Gfx *gdl, s32 x, s32 y, struct fontchar *char1, s32 arg4, s32 arg5, s32 arg6, s32 arg7); + void text_init(void) { // empty diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c index 9bcb528ad..f2ef69fa5 100644 --- a/src/game/hudmsg.c +++ b/src/game/hudmsg.c @@ -78,6 +78,11 @@ struct hudmsgtype g_HudmsgTypes[] = { #endif }; +void hudmsg_create_from_args(char *text, s32 type, s32 conf00, s32 conf01, s32 conf02, + struct fontchar **conf04, struct font **conf08, + u32 textcolour, u32 glowcolour, + u32 alignh, s32 conf16, u32 alignv, s32 conf18, s32 arg14, u32 flags); + u8 hudmsgs_are_active(void) { return g_HudmsgsActive; diff --git a/src/game/lv.c b/src/game/lv.c index 3cff842d9..3125f6ba3 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -131,6 +131,9 @@ u32 g_FadePrevColour = 0; u32 g_FadeColour = 0; s16 g_FadeDelay = 0; +void lv_fade_reset(void); +void lv_check_pause_state_changed(void); + u32 get_var80084040(void) { return var80084040; diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c index 25ea22e13..cdfe102cd 100644 --- a/src/game/mainmenu.c +++ b/src/game/mainmenu.c @@ -39,6 +39,8 @@ struct menudialogdef g_2PMissionControlStyleMenuDialog; struct menudialogdef g_CiControlPlayer2MenuDialog; struct menudialogdef g_CinemaMenuDialog; +MenuItemHandlerResult menuhandler_fr_inventory_list(s32 operation, struct menuitem *item, union handlerdata *data); + char *menu_text_current_stage_name(struct menuitem *item) { sprintf(g_StringPointer, "%s\n", lang_get(g_SoloStages[g_MissionConfig.stageindex].name3)); diff --git a/src/game/menu.c b/src/game/menu.c index 641ca4f79..4c9be9f2f 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -130,6 +130,10 @@ char *g_StringPointer2 = &g_CheatMarqueeString[VERSION >= VERSION_PAL_FINAL ? 15 s32 g_MpPlayerNum = 0; +void dialog_calculate_position(struct menudialog *dialog); +void menu_close(void); +void dialog_init_items(struct menudialog *dialog); + void menu_play_sound(s32 menusound) { s32 sound = -1; diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index ec55ff4de..4ab913465 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -99,6 +99,8 @@ struct mpweapon g_MpWeapons[NUM_MPWEAPONS] = { /*0x26*/ { WEAPON_DISABLED }, }; +void mp_calculate_player_title(struct mpplayerconfig *mpplayer); + /** * Converts the given value into a float on a curved scale from 0.1 to 10. * diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index 8741751ad..6602bff43 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -31,6 +31,13 @@ struct menudialogdef g_MpChangeTeamNameMenuDialog; struct menudialogdef g_MpEditSimulantMenuDialog; struct menudialogdef g_MpSaveSetupNameMenuDialog; +void func0f17b8f0(void); +MenuItemHandlerResult menuhandler0017e9d8(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler_mp_start_challenge(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler_mp_abort_challenge(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler0017ec64(s32 operation, struct menuitem *item, union handlerdata *data); +void mp_close_dialogs_for_new_setup(void); + MenuItemHandlerResult menuhandler_mp_drop_out(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { diff --git a/src/game/music.c b/src/game/music.c index c5a127a6d..3eae2b486 100644 --- a/src/game/music.c +++ b/src/game/music.c @@ -81,6 +81,9 @@ u32 var8008465cpf = 0; const char var7f1b7918[] = "MUSIC : activedeath=%d\n"; +void music_save_interval(void); +void music_restore_interval(void); + u16 music_get_volume(void) { #if VERSION >= VERSION_NTSC_1_0 diff --git a/src/game/pak.c b/src/game/pak.c index 345969b78..5dce07b4c 100644 --- a/src/game/pak.c +++ b/src/game/pak.c @@ -329,6 +329,50 @@ u8 g_PaksPlugged = 0; bool var80075d14 = true; #endif +void pak0f116bdc(s8 device, u8 *arg1, u8 *arg2); +u16 _pak_get_serial(s8 device); +u32 _pak_get_type(s8 device); +PakErr1 pak0f116df0(s8 device, struct pakdata **pakdata); +PakErr1 _pak_delete_game_note(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name); +s32 _pak_delete_file(s8 device, s32 fileid); +s32 _pak_save_at_guid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfileid, u8 *olddataptr); +PakErr1 pak_delete_game_note3(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name); +u32 pak_get_pd_num_bytes(s8 device); +s32 _pak_create_camera_file(s8 device, s32 *outfileid); +s32 pak_resize_note(s8 device, s32 numpages); +void pak0f1185e0(s8 device, s32 arg1, s32 arg2); +u32 pak0f118674(s8 device, u32 filetype, s32 *outfileid); +void pak_calculate_checksum(u8 *start, u8 *end, u16 *checksum); +s32 _pak_read_body_at_guid(s8 device, s32 fileid, u8 *body, s32 arg3); +s32 _pak_get_file_ids_by_type(s8 device, u32 filetype, u32 *fileids); +s32 pak_check_file_can_fit_in_note(s8 device, s32 filetype, s32 *numspaces); +u32 pak0f119298(s8 device); +bool pak_repair_as_blank(s8 device, u32 *offsetptr, struct pakfileheader *header); +void pak_merge_blanks(s8 device); +void pak_set_features(s8 device, u8 features, u32 line, char *file); +void pak_set_defaults(s8 device); +PakErr1 pak_read_write_block(s8 device, OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer); +s32 pak_query_total_usage(s8 device); +void pak_save_header_to_cache(s8 device, s32 blocknum, struct pakfileheader *header); +s32 pak_retrieve_header_from_cache(s8 device, s32 blocknum, struct pakfileheader *dst); +s32 pak_create_filesystem(s8 device); +s32 pak_get_filesystem_length(s8 device, u32 *outlen); +s32 pak0f11b86c(s8 device, u32 offset, u8 *data, struct pakfileheader *header, s32 bodylen); +s32 pak_replace_file_at_offset_with_blank(s8 device, u32 offset); +s32 pak_write_file_at_offset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 bodylenarg, s32 *outfileid, u8 *olddata, u32 fileid, u32 generation); +s32 pak_handle_result(s32 err1, s8 device, s32 arg2, u32 line); +void pak_check_plugged(void); +void pak0f11d118(u8 *arg0, u8 arg1, u32 arg2); +void pak0f11d174(s8 device, u8 *arg1); +void pak0f11d214(u8 *arg0, u32 arg1); +void pak_dump_pak(void); +void pak_tick_state(s8 device); +void pak_probe_eeprom(void); +PakErr1 pak_read_eeprom(u8 address, u8 *buffer, u32 len); +PakErr1 pak_write_eeprom(u8 address, u8 *buffer, u32 len); +s32 gbpak_identify_game(s8 device); +void pak_wipe(s8 device, u32 blocknumstart, u32 blocknumend); + u32 pak_get_block_size(s8 device) { return device == SAVEDEVICE_GAMEPAK ? 0x10 : 0x20; diff --git a/src/game/player.c b/src/game/player.c index 28c3349ec..18646fce9 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -198,6 +198,17 @@ s16 g_DeathAnimations[] = { s32 g_NumDeathAnimations = 0; +void player_tick_chr_body(void); +void player_start_chr_fade(f32 duration60, f32 targetfrac); +void player_set_camera_mode(s32 mode); +void player_move_camera_from_pos_rooms(struct coord *pos, struct coord *up, struct coord *look, struct coord *prevgoodpos, RoomNum *prevgoodrooms); +void player_move_camera_from_pos_room(struct coord *pos, struct coord *up, struct coord *look, struct coord *frompos, s32 fromroom); +void player_move_camera(struct coord *pos, struct coord *up, struct coord *look); +void player_set_cam_properties_out_of_bounds(struct coord *pos, struct coord *up, struct coord *look, s32 room); +void player_set_cam_properties(struct coord *pos, struct coord *up, struct coord *look, s32 room); +void player_clear_mem_cam_room(void); +void players_clear_mem_cam_room(void); + /** * Choose which location to spawn into from the given pads. Write the position * and rooms to the dstpos and dstrooms pointers and return the angle that the diff --git a/src/game/playermgr.c b/src/game/playermgr.c index caaf46d6d..547ecb8fd 100644 --- a/src/game/playermgr.c +++ b/src/game/playermgr.c @@ -11,6 +11,8 @@ #include "data.h" #include "types.h" +void playermgr_allocate_player(s32 index); + void playermgr_init(void) { s32 i; diff --git a/src/game/prop.c b/src/game/prop.c index 1fc9478cd..f15bc6a78 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -54,6 +54,9 @@ u32 var8009cdbc; f32 g_AutoAimScale = 1; +void prop_find_for_uplink(void); +void props_defrag_room_props(void); + /** * Populate g_Vars.onscreenprops. This is an array of prop pointers, filtered by * props that are on screen and sorted by distance descending (furthest first). diff --git a/src/game/propobj.c b/src/game/propobj.c index ca318af87..d6cc94c21 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -135,6 +135,24 @@ struct autogunobj *g_ThrownLaptops = NULL; struct beam *g_ThrownLaptopBeams = NULL; s32 g_MaxThrownLaptops = 0; +f32 obj_get_rotated_local_min(struct modelrodata_bbox *bbox, f32 arg1, f32 arg2, f32 arg3); +f32 obj_get_rotated_local_max(struct modelrodata_bbox *bbox, f32 arg1, f32 arg2, f32 arg3); +void obj_create_one_debris(struct defaultobj *obj, s32 partindex, struct prop *prop); +struct defaultobj *debris_allocate(void); +void obj_create_debris(struct defaultobj *obj, struct prop *prop); +void obj_populate_geotile(struct defaultobj *obj, struct geotilef *tile, u32 flags, struct modelrodata_bbox *bbox, struct modelrodata_geo *georodata); +void obj_deform(struct defaultobj *obj, s32 level); +struct hatobj *hat_create(bool musthaveprop, bool musthavemodel, struct modeldef *modeldef); +struct ammocrateobj *ammocrate_allocate(void); +void weapon_register_proxy(struct weaponobj *weapon); +void weapon_unregister_proxy(struct weaponobj *weapon); +void door_get_mtx(struct doorobj *door, Mtxf *matrix); +void door_play_opening_sound(s32 soundtype, struct prop *prop); +void door_play_opened_sound(s32 soundtype, struct prop *prop); +bool door_test_interact_angle(struct doorobj *door, bool altcoordsystem); +void doors_calc_frac(struct doorobj *door); +void gas_release_from_pos(struct coord *pos); + /** * Attempt to call a lift from the given door. * diff --git a/src/game/propsnd.c b/src/game/propsnd.c index dfb246420..429bce7a8 100644 --- a/src/game/propsnd.c +++ b/src/game/propsnd.c @@ -45,6 +45,10 @@ u32 var8006ae54 = 999; #define CHANNEL_IS_AI(channel) (channel >= 0 && channel <= 7) #define CHANNEL_HEAP_FIRST CHANNEL_8 +void ps_stop_channel(s32 channelnum); +s32 ps_calculate_vol(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, RoomNum *rooms, s16 soundnum, s32 arg6, f32 *playerdistptr); +s32 ps_calculate_pan(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, f32 playerdist, bool arg5, struct pschannel *channel); + bool ps_prop_has_sound_with_context(struct prop *prop, s32 type) { s32 i; diff --git a/src/game/radar.c b/src/game/radar.c index 171fd2f7a..e45be77be 100644 --- a/src/game/radar.c +++ b/src/game/radar.c @@ -44,6 +44,8 @@ u32 var80087ce4[] = { 0x8a158a15, }; +Gfx *radar_render_r_tracked_props(Gfx *gdl); + void radar_set_y_indicators_enabled(bool enable) { g_RadarYIndicatorsEnabled = enable; diff --git a/src/game/setup.c b/src/game/setup.c index b88b22a10..e2ed87376 100644 --- a/src/game/setup.c +++ b/src/game/setup.c @@ -171,6 +171,9 @@ u32 var80061be4 = 0x00000000; u32 var80061be8 = 0x00000000; u32 var80061bec = 0x00000000; +void setup_reset_0f00cc8c(void); +void setup_reset_proxy_mines(void); + void props_reset(void) { s32 i; diff --git a/src/game/sky.c b/src/game/sky.c index d31f58ad5..abf53b17f 100644 --- a/src/game/sky.c +++ b/src/game/sky.c @@ -45,6 +45,10 @@ f32 g_SkyWindSpeed = 1; f32 g_SunAlphaFracs[3] = {0}; s32 g_SunFlareTimers240[3] = {0}; +void sky_convert_vertex(struct skyvtx3d *srcvtx, Mtxf *mtx, u16 arg2, f32 arg3, f32 arg4, struct skyvtx2d *dstvtx); +Gfx *sky_render_tri(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struct skyvtx2d *vtx2, f32 arg4, bool textured); +Gfx *sky_render_full(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struct skyvtx2d *vtx2, struct skyvtx2d *vtx3, f32 arg5); + void sky_get_world_pos_from_screen_pos(f32 left, f32 top, struct coord *dst) { Mtxf *mtx = cam_get_projection_mtxf(); diff --git a/src/game/splat.c b/src/game/splat.c index 9dcf8edbd..cb805bdb9 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -53,6 +53,10 @@ bool splat0f149274(f32 arg0, struct prop *prop, struct shotdata *shotdata, f32 a void splat0f14986c(struct splatdata *splatdata); #endif +s32 splats_create(s32 qty, f32 arg1, struct prop *prop, struct shotdata *shotdataarg, + struct coord *arg4, struct coord *arg5, bool isskedar, s32 splattype, + s32 timermax, struct chrdata *chr, s32 timerspeed); + void splat_tick_chr(struct prop *prop) { struct chrdata *chr = prop->chr; diff --git a/src/game/texdecompress.c b/src/game/texdecompress.c index 5f9b79b60..173055be7 100644 --- a/src/game/texdecompress.c +++ b/src/game/texdecompress.c @@ -111,6 +111,12 @@ s32 g_TexFormatLutModes[] = { G_TT_IA16, }; +void tex_inflate_huffman(u8 *dst, s32 numiterations, s32 chansize); +void tex_inflate_rle(u8 *dst, s32 blockstotal); +void tex_read_alpha_bits(u8 *dst, s32 count); +void tex_swizzle(u8 *dst, s32 width, s32 height, s32 format); +void tex_blur(u8 *pixels, s32 width, s32 height, s32 method, s32 chansize); + void func0f16e810(u32 arg0) { // empty diff --git a/src/game/title.c b/src/game/title.c index 6c1187b6b..e7ce76e63 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -103,6 +103,8 @@ Lights1 var800624f8jf = gdSPDefLights1(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, Lights1 var80062510jf = gdSPDefLights1(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f); #endif +void title_skip_to_pd_title(void); + char *mp_player_get_weapon_of_choice_name(u32 playernum, u32 slot) { char *name; diff --git a/src/game/training.c b/src/game/training.c index 7bbbd1c01..c0218125b 100644 --- a/src/game/training.c +++ b/src/game/training.c @@ -61,6 +61,9 @@ u16 g_FrPads[] = { 0x00f2, 0x00f1, 0x00f0, 0x00ef, 0x00ee, 0x00ed, 0x00ec, }; +u32 func0f1a25c0(s32 index); +u32 ci_get_stage_flag_by_device_index(u32 deviceindex); + bool ci_is_tour_done(void) { return gamefile_has_flag(GAMEFILEFLAG_CI_TOUR_DONE); diff --git a/src/game/wallhit.c b/src/game/wallhit.c index 0839a7501..20ff9ede6 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -67,6 +67,8 @@ struct wallhittex g_WallhitTexes[] = { /*0x11*/ { 6, 6, WALLHITTYPE_BULLET }, // WALLHITTEX_METAL }; +void wallhit_fade(struct wallhit *wallhit, u32 arg1); + s16 wallhit_finalise_axis(f32 value) { if (value > var8007f754) { diff --git a/src/game/weather.c b/src/game/weather.c index b733bcf93..e5c5e23a1 100644 --- a/src/game/weather.c +++ b/src/game/weather.c @@ -24,6 +24,9 @@ struct weatherdata *g_WeatherData = NULL; +Gfx *weather_render_rain(Gfx *gdl, struct weatherdata *weather, s32 arg2); +Gfx *weather_render_snow(Gfx *gdl, struct weatherdata *weather, s32 arg2); + Gfx *weather_render(Gfx *gdl) { struct weatherdata *weather; diff --git a/src/game/zbuf.c b/src/game/zbuf.c index 446066ed1..af162440d 100644 --- a/src/game/zbuf.c +++ b/src/game/zbuf.c @@ -20,6 +20,8 @@ u16 g_ArtifactsCfb2[0x180]; u16 *g_ZbufPtr1 = NULL; u16 *g_ZbufPtr2 = NULL; +void zbuf_allocate(void); + void *zbuf_get_allocation(void) { return g_ZbufPtr1; diff --git a/src/include/game/activemenu.h b/src/include/game/activemenu.h index 5f72484b7..1af83e3b4 100644 --- a/src/include/game/activemenu.h +++ b/src/include/game/activemenu.h @@ -7,24 +7,13 @@ void am_tick(void); void am_open_pick_target(void); -MenuDialogHandlerResult menudialog000fcd48(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult am_pick_target_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -void am_set_ai_buddy_temperament(bool aggressive); -void am_set_ai_buddy_stealth(void); -s32 am_get_first_buddy_index(void); void am_apply(s32 slot); void am_get_slot_details(s32 slot, u32 *flags, char *label); void am_reset(void); -s16 am_calculate_slot_width(void); void am_change_screen(s32 step); void am_assign_weapon_slots(void); void am_open(void); void am_close(void); -bool am_is_cramped(void); -void am_calculate_slot_position(s16 column, s16 row, s16 *x, s16 *y); -Gfx *am_render_text(Gfx *gdl, char *text, u32 colour, s16 left, s16 top); -Gfx *am_render_aibot_info(Gfx *gdl, s32 buddynum); -Gfx *am_render_slot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags); Gfx *am_render(Gfx *gdl); #endif diff --git a/src/include/game/bg.h b/src/include/game/bg.h index ef909f95f..d2e5ba1ed 100644 --- a/src/include/game/bg.h +++ b/src/include/game/bg.h @@ -4,99 +4,39 @@ #include "data.h" #include "types.h" -void bg_unpause_props_in_room(u32 roomnum, bool tintedglassonly); -void bg_set_room_onscreen(s32 room, s32 draworder, struct screenbox *arg2); void bg_get_room_brightness_range(s32 roomnum, u8 *min, u8 *max); struct drawslot *bg_get_room_draw_slot(s32 roomnum); -Gfx *bg_render_xray_data(Gfx *gdl, struct xraydata *xraydata); -Gfx *bg_add_xray_tri(Gfx *gdl, struct xraydata *xraydata, s16 vertices1[3], s16 vertices2[3], s16 vertices3[3], u32 colour1, u32 colour2, u32 colour3); -void bg_choose_xray_vtx_colour(bool *inrange, s16 vertex[3], u32 *colour, struct xraydata *xraydata); -Gfx *bg_process_xray_tri(Gfx *gdl, struct xraydata *xraydata, s16 arg2[3], s16 arg3[3], s16 arg4[3], s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 arg10); -Gfx *bg_render_gdl_in_xray(Gfx *gdl, s8 *readgdl, Vtx *vertices, s16 arg3[3]); -Gfx *bg_render_room_xray_pass(Gfx *gdl, s32 roomnum, struct roomblock *blocks, bool recurse, s16 arg4[3]); -Gfx *bg_render_room_in_xray(Gfx *gdl, s32 roomnum); -Gfx *bg_render_scene_in_xray(Gfx *gdl); -Gfx *bg_render_scene(Gfx *gdl); Gfx *bg_render_artifacts(Gfx *gdl); -void bg_load_file(void *memaddr, u32 offset, u32 len); s32 bg_get_stage_index(s32 stagenum); f32 bg_calculate_portal_surface_area(s32 portal); -u8 bg_calculate_portal_alpha(s32 portal); u32 not(u32 arg); -u32 bg_xor_babebabe(u32 value); void bg_reset(s32 stagenum); void bg_build_tables(s32 stagenum); void bg_stop(void); -void bg_set_stage_translation_thing(f32 arg0); f32 bg_get_stage_translation_thing(void); f32 bg_get_scale_bg2gfx(void); void bg_set_scale_bg2gfx(f32 arg0); -void bg_tick_counter(void); void bg_tick(void); Gfx *bg_render(Gfx *gdl); Gfx *bg_scissor_to_viewport(Gfx *gdl); -Gfx *bg_scissor_within_viewport_f(Gfx *gdl, f32 viewleft, f32 viewtop, f32 viewright, f32 viewbottom); Gfx *bg_scissor_within_viewport(Gfx *gdl, s32 viewleft, s32 viewtop, s32 viewright, s32 viewbottom); -void bg_clear_portal_camera_cache(void); -bool bg_room_intersects_screen_box(s32 room, struct screenbox *arg1); -bool bg_3d_pos_to_2d_pos(struct coord *cornerpos, struct coord *screenpos); -bool bg_get_portal_screen_bbox(s32 portal, struct screenbox *arg1); -Gfx *bg_draw_box_edge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2); -bool bg_get_box_intersection(struct screenbox *a, struct screenbox *b); -void bg_expand_box(struct screenbox *a, struct screenbox *b); -void bg_copy_box(struct screenbox *dst, struct screenbox *src); bool bg_room_is_onscreen(s32 room); bool bg_room_is_standby(s32 room); bool bg_room_is_on_player_screen(s32 room, u32 playernum); bool bg_room_is_on_player_standby(s32 room, u32 aibotindex); -s32 bg_find_portal_by_vertices(struct portalvertices *pvertices); -u32 bg_inflate(u8 *src, u8 *dst, u32 len); -Gfx *bg_get_next_gdl_in_block(struct roomblock *block, Gfx *start, Gfx *end); -Gfx *bg_get_next_gdl_in_layer(s32 roomnum, Gfx *start, u32 types); -Vtx *bg_find_vertices_for_gdl(s32 roomnum, Gfx *gdl); -void bg_load_room(s32 roomnum); -void bg_unload_room(s32 room); -void bg_unload_all_rooms(void); void bg_garbage_collect_rooms(s32 bytesneeded, bool desparate); -void bg_tick_rooms(void); -Gfx *bg_render_room_pass(Gfx *gdl, s32 roomnum, struct roomblock *blocks, bool arg3); -Gfx *bg_render_room_opaque(Gfx *gdl, s32 roomnum); -Gfx *bg_render_room_xlu(Gfx *gdl, s32 roomnum); -s32 bg_populate_vtx_batch_type(s32 roomnum, struct vtxbatch *batches, Gfx *gdl, s32 batchindex, Vtx *vertices, s32 arg5); -void bg_find_room_vtx_batches(s32 roomnum); bool bg_test_line_intersects_int_bbox(struct coord *arg0, struct coord *arg1, s32 *arg2, s32 *arg3); bool bg_test_line_intersects_bbox(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3); bool bg_test_hit_on_obj(struct coord *arg0, struct coord *arg1, struct coord *arg2, Gfx *gdl, Gfx *gdl2, Vtx *vertices, struct hitthing *hitthing); bool bg_test_hit_on_chr(struct model *model, struct coord *arg1, struct coord *arg2, struct coord *arg3, Gfx *arg4, Gfx *arg5, Vtx *vertices, f32 *arg7, struct hitthing *hitthing); -bool bg_test_hit_in_vtx_batch(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct vtxbatch *batches, s32 roomnum, struct hitthing *hitthing); -s32 bg0f1612e4(struct coord *bbmin, struct coord *bbmax, struct coord *frompos, struct coord *dist, struct coord *arg4, struct coord *arg5); bool bg_test_hit_in_room(struct coord *frompos, struct coord *topos, s32 roomnum, struct hitthing *hitthing); bool bg_room_is_loaded(s32 room); bool bg_room_contains_coord(struct coord *pos, RoomNum roomnum); -bool bg_test_pos_in_room_cheap(struct coord *pos, RoomNum roomnum); -bool bg_test_pos_in_room_expensive(struct coord *pos, RoomNum roomnum); bool bg_test_pos_in_room(struct coord *pos, RoomNum roomnum); void bg_find_rooms_by_pos(struct coord *pos, RoomNum *inrooms, RoomNum *aboverooms, s32 max, RoomNum *bestroom); -bool bg_cmd_push_value(bool value); -bool bg_cmd_pop_value(void); -bool bg_cmd_get_nth_value_from_end(s32 offset); -struct bgcmd *bg_cmd_execute_branch(struct bgcmd *cmd, bool s2); -struct bgcmd *bg_cmd_execute(struct bgcmd *cmd); -void bg_tick_portals_xray(void); -void bg_add_to_queue(RoomNum fromroomnum, RoomNum roomnum, s16 draworder, struct screenbox *box); -void bg_process_queue_item(struct bgqueueitem *arg0); -bool bg_try_process_queue(void); -void bg_choose_rooms_to_load(void); -void bg_tick_portals(void); -Gfx *bg_render_scene_and_load_candidate(Gfx *gdl); s32 bg_get_force_onscreen_rooms(RoomNum *rooms, s32 len); s32 bg_room_get_neighbours(s32 room, RoomNum *rooms, s32 len); bool bg_rooms_are_neighbours(s32 roomnum1, s32 roomnum2); -void bg_calculate_screen_properties(void); -void bg_expand_room_to_portals(s32 roomnum); -void bg_portal_swap_rooms(s32 portal); -void bg_init_portal(s32 portalnum); -void bg_init_room(s32 roomnum); void bg_set_portal_open_state(s32 portal, bool open); s32 bg_find_portal_between_positions(struct coord *pos1, struct coord *pos2); bool bg_is_bbox_overlapping(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3); diff --git a/src/include/game/body.h b/src/include/game/body.h index 5211973b6..e4c160ca9 100644 --- a/src/include/game/body.h +++ b/src/include/game/body.h @@ -12,7 +12,6 @@ u32 body_get_race(s32 bodynum); bool body_load_modeldef(s32 bodynum); struct model *body_instantiate_model_to_addr(s32 bodynum, s32 headnum, struct modeldef *bodymodeldef, struct modeldef *headmodeldef, bool sunglasses, struct model *model, bool isplayer, u8 varyheight); struct model *body_instantiate_model_with_spawnflags(s32 bodynum, s32 headnum, u32 spawnflags); -s32 body_get_tuxedo_bodynum(void); s32 body_choose_head(s32 bodynum); void body_instantiate_chr(s32 stagenum, struct packedchr *packed, s32 cmdindex); struct prop *body_instantiate_eyespy(struct pad *pad, RoomNum room); diff --git a/src/include/game/bondbike.h b/src/include/game/bondbike.h index 0976528a1..dd66f5ce1 100644 --- a/src/include/game/bondbike.h +++ b/src/include/game/bondbike.h @@ -6,19 +6,8 @@ void bbike_init(void); void bbike_exit(void); -void bbike_update_vehicle_offset(void); -void bbike_try_dismount_angle(f32 relativeangle, f32 distance); void bbike_handle_activate(void); void bbike_apply_move_data(struct movedata *data); -void bbike0f0d2b40(struct defaultobj *bike, struct coord *arg1, f32 arg2, struct defaultobj *obstacle); -s32 bbike_calculate_new_position(struct coord *arg0, f32 arg1); -s32 bbike_calculate_new_position_with_push(struct coord *arg0, f32 arg1); -void bbike_update_vertical(struct coord *pos); -s32 bbike0f0d3680(struct coord *arg0, struct coord *arg1, struct coord *arg2); -s32 bbike0f0d36d4(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3, struct coord *arg4); -s32 bbike0f0d3840(struct coord *arg0, struct coord *arg1, struct coord *arg2); -s32 bbike0f0d3940(struct coord *arg0, struct coord *arg1, struct coord *arg2); -void bbike0f0d3c60(struct coord *arg0); void bbike_tick(void); #endif diff --git a/src/include/game/bondeyespy.h b/src/include/game/bondeyespy.h index ed2362d26..6a90f17ef 100644 --- a/src/include/game/bondeyespy.h +++ b/src/include/game/bondeyespy.h @@ -4,11 +4,6 @@ #include "data.h" #include "types.h" -f32 eyespy_find_ground(RoomNum *floorroom); -s32 eyespy_try_move_upwards(f32 yvel); -s32 eyespy_calculate_new_position(struct coord *vel); -bool eyespy_calculate_new_position_with_push(struct coord *vel); -void eyespy_update_position(void); bool eyespy_try_launch(void); void eyespy_process_input(bool allowbuttons); diff --git a/src/include/game/bondgrab.h b/src/include/game/bondgrab.h index 0568b6c98..0c0144d49 100644 --- a/src/include/game/bondgrab.h +++ b/src/include/game/bondgrab.h @@ -6,25 +6,9 @@ void bgrab_init(void); void bgrab_exit(void); -void bgrab0f0ccbf0(struct coord *delta, f32 angle, struct defaultobj *obj); -bool bgrab_try_move_upwards(f32 y); -s32 bgrab_calculate_new_position(struct coord *delta, f32 angle, bool arg2); -bool bgrab_calculate_new_positiont_with_push(struct coord *delta, f32 angle, bool arg2); -bool bgrab0f0cdb04(f32 angle, bool arg2); -bool bgrab0f0cdb68(f32 angle); -void bgrab0f0cdef0(void); -bool bgrab0f0cdf64(struct coord *delta, struct coord *arg1, struct coord *arg2); -s32 bgrab0f0cdfbc(struct coord *delta, struct coord *arg1, struct coord *arg2); -void bgrab0f0ce0bc(struct coord *arg0); -void bgrab_update_prev_pos(void); -void bgrab_onmoved(void); -void bgrab_update_vertical(void); void bgrab_handle_activate(void); -void bgrab_update_speed_sideways(f32 targetspeed, f32 accelspeed, s32 mult); -void bgrab_update_speed_forwards(f32 target, f32 speed); void bgrab_apply_move_data(struct movedata *data); void bgrab_update_speed_theta(void); -void bgrab0f0ce924(void); void bgrab_tick(void); #endif diff --git a/src/include/game/bondgun.h b/src/include/game/bondgun.h index 7a8adb5ce..f418d4e9c 100644 --- a/src/include/game/bondgun.h +++ b/src/include/game/bondgun.h @@ -8,99 +8,38 @@ void bgun_reset(void); void bgun_stop(void); -void bgun_rumble(s32 handnum, s32 weaponnum); -s32 bgun_get_unequipped_reload_index(s32 weaponnum); -void bgun_tick_unequipped_reload(void); bool bgun_test_gun_vis_command(struct gunviscmd *cmd, struct hand *hand); -void bgun_set_part_visible(s16 partnum, bool visible, struct hand *hand, struct modeldef *modeldef); void bgun_execute_gun_vis_commands(struct hand *hand, struct modeldef *arg1, struct gunviscmd *command); -void bgun_update_ammo_visibility(struct hand *hand, struct modeldef *arg1); -f32 bgun_get_current_keyframe(struct hand *hand); -void bgun_tick_anim(struct hand *hand, struct modeldef *modeldef); -bool bgun_test_condition(struct guncmd *cmd, struct gset *gset); -void bgun_start_animation(struct guncmd *cmd, s32 handnum, struct hand *hand); -bool bgun_is_anim_busy(struct hand *hand); -void bgun_reset_anim(struct hand *hand); -void bgun_get_weapon_info(struct handweaponinfo *info, s32 handnum); -s32 bgun_get_ammo_state(s32 arg0, struct handweaponinfo *info, struct hand *hand); -void bgun0f098df8(s32 weaponfunc, struct handweaponinfo *info, struct hand *hand, u8 onebullet, u8 checkunequipped); -void bgun0f098f8c(struct handweaponinfo *info, struct hand *hand); -bool bgun_clip_has_ammo(s32 handnum); -bool bgun0f0990b0(struct weaponfunc *basefunc, struct weapon *weapon); -bool bgun0f099188(struct hand *hand, s32 gunfunc); -s32 bgun_tick_inc_idle(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -void bgun_set_arm_pitch(struct hand *hand, f32 angle); -s32 bgun_tick_inc_autoswitch(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -bool bgun_is_reloading(struct hand *hand); -s32 bgun_tick_inc_reload(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -s32 bgun_tick_inc_changefunc(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -s32 bgun0f09a3f8(struct hand *hand, struct weaponfunc *func); -void bgun0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, struct weaponfunc *func); -bool bgun_tick_recoil(struct hand *hand, struct handweaponinfo *info, s32 handnum, struct weaponfunc_shoot *func); -bool bgun_tick_inc_attacking_shoot(struct handweaponinfo *info, s32 handnum, struct hand *hand); -bool bgun_tick_inc_attacking_throw(s32 handnum, struct hand *hand); s32 bgun_get_min_clip_qty(s32 weaponnum, s32 funcnum); -bool bgun_tick_inc_attacking_melee(s32 handnum, struct hand *hand); -bool bgun_tick_inc_attacking_special(struct hand *hand); -s32 bgun_tick_inc_attackempty(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -s32 bgun_tick_inc_attack(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -bool bgun_is_ready_to_switch(s32 handnum); -bool bgun_can_free_weapon(s32 handnum); -bool bgun0f09bf44(s32 handnum); -s32 bgun_tick_inc_changegun(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -s32 bgun_tick_inc_state2(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -s32 bgun_tick_inc(struct handweaponinfo *info, s32 handnum, s32 lvupdate); -bool bgun_set_state(s32 handnum, s32 state); -void bgun_tick_hand(s32 handnum); -void bgun_tick_switch(void); void bgun_init_hand_anims(void); f32 bgun_get_noise_radius(s32 handnum); -void bgun_decrease_noise_radius(void); void bgun_calculate_blend(s32 hand); -void bgun_update_blend(struct hand *hand, s32 handnum); void bgun0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4); -bool bgun_is_loaded(void); -u32 bgun_get_gun_mem_type(void); u8 *bgun_get_gun_mem(void); u32 bgun_calculate_gun_mem_capacity(void); void bgun_free_gun_mem(void); -void bgun_set_gun_mem_weapon(s32 weaponnum); -void bgun_enter_flux(void); bool bgun_change_gun_mem(s32 newowner); -void bgun_tick_gun_load(void); -void bgun_tick_master_load(void); -void bgun_tick_load(void); bool bgun_load_all(void); struct modeldef *bgun_get_cart_modeldef(void); void bgun0f09ebcc(struct defaultobj *obj, struct coord *coord, RoomNum *rooms, Mtxf *matrix1, struct coord *velocity, Mtxf *matrix2, struct prop *prop, struct coord *pos); -void bgun0f09ed2c(struct defaultobj *obj, struct coord *coord, Mtxf *arg2, struct coord *velocity, Mtxf *arg4); struct defaultobj *bgun_create_thrown_projectile2(struct chrdata *chr, struct gset *gset, struct coord *pos, RoomNum *rooms, Mtxf *arg4, struct coord *velocity); void bgun_create_thrown_projectile(s32 handnum, struct gset *gset); -void bgun_update_held_rocket(s32 handnum); -void bgun_create_held_rocket(s32 handnum, struct weaponfunc_shootprojectile *func); -void bgun_free_held_rocket(s32 handnum); void bgun_create_fired_projectile(s32 handnum); void bgun_swivel(f32 autoaimx, f32 autoaimy, f32 crossdamp, f32 aimdamp); void bgun_swivel_with_damp(f32 screenx, f32 screeny, f32 damp); void bgun_swivel_without_damp(f32 arg0, f32 arg1); void bgun_get_cross_pos(f32 *x, f32 *y); void bgun0f0a0c08(struct coord *arg0, struct coord *arg1); -void bgun0f0a0c44(s32 handnum, struct coord *arg1, struct coord *arg2); void bgun_calculate_player_shot_spread(struct coord *arg0, struct coord *arg1, s32 handnum, bool dorandom); void bgun_calculate_bot_shot_spread(struct coord *arg0, s32 weaponnum, s32 funcnum, bool arg3, s32 crouchpos, bool dual); void bgun_set_last_shoot_info(struct coord *pos, struct coord *dir, s32 handnum); s32 bgun_get_shots_to_take(s32 handnum); -void bgun_free_weapon(s32 handnum); -void bgun_tick_switch2(void); void bgun_equip_weapon(s32 weaponnum); s32 bgun_get_weapon_num(s32 handnum); bool bgun0f0a1a10(s32 weaponnum); -s32 bgun_get_switch_to_weapon(s32 handnum); -void bgun_switch_to_previous(void); void bgun_cycle_forward(void); void bgun_cycle_back(void); bool bgun_has_ammo_for_weapon(s32 weaponnum); -void bgun_auto_switch_weapon(void); void bgun_equip_weapon2(s32 handnum, s32 weaponnum); s32 bgun_is_firing(s32 handnum); s32 bgun_get_attack_type(s32 handnum); @@ -109,48 +48,22 @@ u16 bgun_get_name_id(s32 weaponnum); char *bgun_get_short_name(s32 arg0); void bgun_reload_if_possible(s32 handnum); void bgun_set_adjust_pos(f32 angle); -void bgun_start_slide(s32 handnum); -void bgun_update_slide(s32 handnum); -f32 bgun0f0a2498(f32 arg0, f32 arg1, f32 arg2, f32 arg3); -void bgun0f0a24f0(struct coord *arg0, s32 handnum); bool bgun_allows_fullscreen_autoaim(void); void bgun_handle_player_dead(void); bool bgun_is_mission_critical(s32 weaponnum); void bgun_disarm(struct prop *attacker); -void bgun_execute_model_cmd_list(s32 *arg0); -s32 bgun_create_model_cmd_list(struct model *model, struct modelnode *node, s32 *ptr); void bgun_start_detonate_animation(s32 playernum); -void bgun_update_gangsta(struct hand *hand, s32 handnum, struct coord *arg2, struct weaponfunc *funcdef, Mtxf *arg4, Mtxf *arg5); -void bgun_update_smoke(struct hand *hand, s32 handnum, s32 weaponnum, struct weaponfunc *funcdef); -void bgun_update_lasersight(struct hand *hand, struct modeldef *modeldef, s32 handnum, u8 *allocation); -void bgun_update_reaper(struct hand *hand, struct modeldef *modeldef); -void bgun_update_sniper_rifle(struct modeldef *modeldef, u8 *allocation); -void bgun_update_devastator(struct hand *hand, u8 *allocation, struct modeldef *modeldef); -void bgun_update_shotgun(struct hand *hand, u8 *allocation, bool *arg2, struct modeldef *modeldef); -void bgun_update_laser(struct hand *hand); -void bgun_eject_magnum_casings(struct hand *hand, s32 handnum, struct modeldef *modeldef, Mtxf *mtx); -void bgun_update_rocket_launcher(struct hand *hand, s32 handnum, struct weaponfunc_shootprojectile *func); -void bgun0f0a45d0(struct hand *hand, struct modeldef *modeldef, bool isdetonator); -void bgun_tick_eject(struct hand *hand, struct modeldef *modeldef, bool isdetonator); -void bgun0f0a4e44(struct hand *hand, struct weapon *weapondef, struct modeldef *modeldef, struct weaponfunc *funcdef, s32 maxburst, u8 *allocation, s32 weaponnum, bool **arg7, s32 mtxindex, Mtxf *arg9, Mtxf *arg10); -void bgun_create_fx(struct hand *hand, s32 handnum, struct weaponfunc *funcdef, s32 weaponnum, struct modeldef *modeldef, u8 *allocation); -void bgun0f0a5550(s32 handnum); -void bgun_tick_mauler_charge(void); void bgun_tick_gameplay2(void); s32 bgun_allocate_fireslot(void); void bgun_render(Gfx **gdl); -struct sndstate **bgun_allocate_audio_handle(void); void bgun_play_prop_hit_sound(struct gset *gset, struct prop *prop, s32 texturenum); void bgun_play_glass_hit_sound(struct coord *pos, RoomNum *rooms, s32 texturenum); void bgun_play_bg_hit_sound(struct gset *gset, struct coord *hitpos, s32 texturenum, RoomNum *rooms); -void bgun_set_trigger_on(s32 handnum, bool on); s32 bgun_consider_toggle_gun_function(s32 usedowntime, bool trigpressed, bool fromactivemenu); void bgun0f0a8c50(void); -bool bgun_is_using_secondary_function(void); void bgun_tick_gameplay(bool triggeron); void bgun_set_passive_mode(bool enable); void bgun_set_aim_type(u32 aimtype); -void bgun_set_aim_pos(struct coord *coord); void bgun_set_hit_pos(struct coord *coord); void bgun0f0a9494(u32 operation); void bgun0f0a94d0(u32 operation, struct coord *pos, struct coord *rot); @@ -159,7 +72,6 @@ void bgun_set_ammo_quantity(s32 ammotype, s32 quantity); s32 bgun_get_reserved_ammo_count(s32 type); s32 bgun_get_ammo_count(s32 ammotype); s32 bgun_get_capacity_by_ammotype(s32 ammotype); -bool bgun_ammotype_allows_unlimited_ammo(u32 ammotype); void bgun_give_max_ammo(bool force); u32 bgun_get_ammo_type_for_weapon(u32 weaponnum, u32 func); s32 bgun_get_ammo_qty_for_weapon(u32 weaponnum, u32 func); @@ -167,18 +79,12 @@ void bgun_set_ammo_qty_for_weapon(u32 weaponnum, u32 func, u32 quantity); s32 bgun_get_ammo_capacity_for_weapon(s32 weaponnum, s32 func); Gfx *bgun_draw_hud_string(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 valign, u32 colour); Gfx *bgun_draw_hud_integer(Gfx *gdl, s32 value, s32 x, bool halign, s32 y, s32 valign, u32 colour); -void bgun_reset_abmag(struct abmag *abmag); -void bgun0f0a9da8(struct abmag *abmag, s32 remaining, s32 capacity, s32 height); -Gfx *bgun_draw_hud_gauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *abmag, s32 remaining, s32 capacity, u32 vacantcolour, u32 occupiedcolour, bool flip); Gfx *bgun_draw_hud(Gfx *gdl); -void bgun_add_boost(s32 arg0); -void bgun_subtract_boost(s32 arg0); void bgun_apply_boost(void); void bgun_revert_boost(void); void bgun_tick_boost(void); void bgun_set_sight_visible(u32 bits, bool visible); Gfx *bgun_draw_sight(Gfx *gdl); -void bgun0f0abd30(s32 handnum); s32 bgun_get_weapon_num2(s32 handnum); s8 bgun_free_fireslot_wrapper(s32 fireslot); s8 bgun_free_fireslot(s32 fireslot); diff --git a/src/include/game/bondhead.h b/src/include/game/bondhead.h index fb4c2a36c..d09f73fb7 100644 --- a/src/include/game/bondhead.h +++ b/src/include/game/bondhead.h @@ -8,9 +8,6 @@ void bhead_reset(void); void bhead_flip_animation(void); void bhead_update_idle_roll(void); -void bhead_update_pos(struct coord *vel); -void bhead_update_rot(struct coord *lookvel, struct coord *upvel); -void bhead_set_damp(f32 headdamp); void bhead_update(f32 speedforwards, f32 speedsideways); void bhead_adjust_animation(f32 speed); void bhead_start_death_animation(s16 animnum, u32 flip, f32 fstarttime, f32 speed); diff --git a/src/include/game/bondmove.h b/src/include/game/bondmove.h index 0c539116f..ca20d3cfd 100644 --- a/src/include/game/bondmove.h +++ b/src/include/game/bondmove.h @@ -4,15 +4,12 @@ #include "data.h" #include "types.h" -void bmove_set_control_def(u32 controldef); void bmove_set_automovecentre_enabled(bool enabled); void bmove_set_autoaim_y(bool enabled); -bool bmove_is_autoaim_y_enabled(void); bool bmove_is_autoaim_y_enabled_for_current_weapon(void); bool bmove_is_in_sight_aim_mode(void); void bmove_update_autoaim_y_prop(struct prop *prop, f32 autoaimy); void bmove_set_autoaim_x(bool enabled); -bool bmove_is_autoaim_x_enabled(void); bool bmove_is_autoaim_x_enabled_for_current_weapon(void); void bmove_update_autoaim_x_prop(struct prop *prop, f32 autoaimx); struct prop *bmove_get_hoverbike(void); @@ -20,18 +17,7 @@ struct prop *bmove_get_grabbed_prop(void); void bmove_grab_prop(struct prop *prop); void bmove_set_mode(u32 movemode); void bmove_set_mode_for_all_players(u32 movemode); -void bmove_handle_activate(void); -void bmove_apply_move_data(struct movedata *data); -void bmove_update_speed_theta(void); -f32 bmove_get_speed_verta_limit(f32 value); -void bmove_update_speed_verta(f32 value); -f32 bmove_get_speed_theta_control_limit(f32 value); -void bmove_update_speed_theta_control(f32 value); -f32 bmove_calculate_lookahead(void); -void bmove_reset_move_data(struct movedata *data); -void bmove_process_input(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2); void bmove_find_entered_rooms_by_pos(struct player *player, struct coord *arg1, RoomNum *rooms); -void bmove_find_entered_rooms(struct player *player, RoomNum *rooms); void bmove_update_rooms(struct player *player); void bmove_dampen_shotspeed(struct coord *shotspeed); void bmove_shotspeed_to_lateral(f32 *forward, f32 *sideways, struct coord *shotspeed, f32 sintheta, f32 costheta); diff --git a/src/include/game/bondwalk.h b/src/include/game/bondwalk.h index 773d71c84..267405aaa 100644 --- a/src/include/game/bondwalk.h +++ b/src/include/game/bondwalk.h @@ -5,30 +5,12 @@ #include "types.h" void bwalk_init(void); -void bwalk_set_sway_target(s32 value); void bwalk_adjust_crouch_pos(s32 value); -void bwalk0f0c3b38(struct coord *param_1, struct defaultobj *obj); s32 bwalk_try_move_upwards(f32 amount); -bool bwalk_calculate_new_position(struct coord *vel, f32 rotateamount, bool apply, f32 extrawidth, s32 arg4); -bool bwalk_calculate_new_position_with_push(struct coord *delta, f32 rotateamount, bool apply, f32 extrawidth, s32 types); -s32 bwalk0f0c4764(struct coord *delta, struct coord *arg1, struct coord *arg2, s32 types); -s32 bwalk0f0c47d0(struct coord *a, struct coord *b, struct coord *c, struct coord *d, struct coord *e, s32 types); -s32 bwalk0f0c494c(struct coord *a, struct coord *b, struct coord *c, s32 types); -s32 bwalk0f0c4a5c(struct coord *a, struct coord *b, struct coord *c, s32 types); -void bwalk0f0c4d98(void); -void bwalk_update_speed_sideways(f32 targetspeed, f32 accelspeed, s32 mult); -void bwalk_update_speed_forwards(f32 targetspeed, f32 accelspeed); -void bwalk_update_vertical(void); -void bwalk_apply_crouch_speed(void); -void bwalk_update_crouch_offset_real(void); -void bwalk_update_crouch_offset(void); -void bwalk_update_theta(void); void bwalk0f0c63bc(struct coord *arg0, u32 arg1, s32 types); -void bwalk_update_prev_pos(void); void bwalk_handle_activate(void); void bwalk_apply_move_data(struct movedata *data); void bwalk_update_speed_theta(void); -void bwalk0f0c69b8(void); void bwalk_tick(void); #endif diff --git a/src/include/game/bossfile.h b/src/include/game/bossfile.h index a66d354f1..9ca25cfef 100644 --- a/src/include/game/bossfile.h +++ b/src/include/game/bossfile.h @@ -5,9 +5,6 @@ #include "types.h" bool bossfile_load_full(void); -u32 bossfile_find_file_id(void); -void bossfile_load(void); void bossfile_save(void); -void bossfile_set_defaults(void); #endif diff --git a/src/include/game/bot.h b/src/include/game/bot.h index 8483f0079..90ae02f61 100644 --- a/src/include/game/bot.h +++ b/src/include/game/bot.h @@ -6,17 +6,11 @@ bool botroom_find_pos(RoomNum room, struct coord *pos, f32 *angleptr, s32 *padnumptr, s32 *covernumptr); -bool bot_is_dizzy(struct chrdata *chr); -void bot_reset(struct chrdata *chr, u8 respawning); void bot_spawn(struct chrdata *chr, u8 full); void bot_spawn_all(void); -u32 add87654321(u32 value); u32 bot_pickup_prop(struct prop *prop, struct chrdata *chr); bool bot_test_prop_for_pickup(struct prop *prop, struct chrdata *chr); -void bot_check_pickups(struct chrdata *chr); s32 bot_guess_crouch_pos(struct chrdata *chr); -bool bot_apply_movement(struct chrdata *chr); -bool bot_is_about_to_attack(struct chrdata *chr, bool arg1); s32 bot_tick(struct prop *prop); f32 bot_calculate_max_speed(struct chrdata *chr); @@ -27,19 +21,9 @@ void bot_update_lateral(struct chrdata *chr, f32 *move); #endif void bot_disarm(struct chrdata *chr, struct prop *attacker); -void bot_set_target(struct chrdata *chr, s32 propnum); bool bot_is_target_invisible(struct chrdata *botchr, struct chrdata *otherchr); bool bot_has_ground(struct chrdata *chr); -void bot_update_zero_angle(struct chrdata *chr); -bool bot_passes_peace_check(struct chrdata *botchr, struct chrdata *otherchr); -bool bot_passes_coward_check(struct chrdata *botchr, struct chrdata *otherchr); -void bot_choose_general_target(struct chrdata *chr); -void bot_schedule_reload(struct chrdata *chr, s32 handnum); -struct prop *bot_find_pickup(struct chrdata *chr, s32 criteria); -s32 bot_get_num_opponents_in_hill(struct chrdata *chr); void bot_tick_unpaused(struct chrdata *chr); -s32 bot_is_obj_collectable(struct defaultobj *obj); -s32 bot_get_weapon_num(struct chrdata *chr); u8 bot_get_targets_weapon_num(struct chrdata *chr); char *bot_get_command_name(s32 command); void bot_apply_attack(struct chrdata *chr, struct prop *prop); @@ -48,16 +32,6 @@ void bot_apply_protect(struct chrdata *chr, struct prop *prop); void bot_apply_defend(struct chrdata *chr, struct coord *pos, RoomNum *room, f32 angle); void bot_apply_hold(struct chrdata *chr, struct coord *pos, RoomNum *room, f32 angle); void bot_apply_scenario_command(struct chrdata *chr, u32 arg1); -bool bot_can_follow(struct chrdata *leader, struct chrdata *follower); -s32 bot_find_teammate_to_follow(struct chrdata *chr, f32 range); -bool bot_can_do_critical_pickup(struct chrdata *chr); -struct prop *bot_find_default_pickup(struct chrdata *chr); -struct prop *bot_find_any_pickup(struct chrdata *chr); -s32 bot_get_team_size(struct chrdata *chr); -s32 bot_get_count_in_team_doing_command(struct chrdata *self, u32 command, bool includeself); -s32 bot_is_chrs_ctc_token_held(struct chrdata *chr); -bool bot_should_return_ctc_token(struct chrdata *chr); -s32 bot_get_num_teammates_defending_hill(struct chrdata *bot); void bot_check_fetch(struct chrdata *chr); #endif diff --git a/src/include/game/botinv.h b/src/include/game/botinv.h index 8c7b3e8b4..2b4fbdd08 100644 --- a/src/include/game/botinv.h +++ b/src/include/game/botinv.h @@ -5,7 +5,6 @@ #include "types.h" void botinv_clear(struct chrdata *chr); -struct invitem *botinv_get_free_slot(struct chrdata *chr); struct invitem *botinv_get_item(struct chrdata *chr, s32 weaponnum); void botinv_remove_item(struct chrdata *chr, s32 weaponnum); u32 botinv_get_item_type(struct chrdata *chr, u32 weaponnum); @@ -17,13 +16,10 @@ void botinv_score_all_weapons(struct chrdata *chr, s32 *weaponnums, s32 *scores1 bool mp_has_shield(void); s32 mp_get_weapon_slot_by_weapon_num(s32 weaponnum); void botinv_score_weapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2, bool arg7, bool learn); -void botinv_score_weapon_against_target(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2); -void botinv_score_weapon_by_itself(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2); s32 botinv_get_dist_config(s32 weaponnum, s32 funcnum); bool botinv_allows_weapon(struct chrdata *chr, s32 weaponnum, s32 funcnum); void botinv_tick(struct chrdata *chr); bool botinv_switch_to_weapon(struct chrdata *chr, s32 weaponnum, s32 funcnum); -void botinv_drop(struct chrdata *chr, s32 weaponnum, u8 dropall); void botinv_drop_all(struct chrdata *chr, u32 weaponnum); void botinv_drop_one(struct chrdata *chr, u32 weaponnum); diff --git a/src/include/game/camdraw.h b/src/include/game/camdraw.h index 0d3a01f39..266208aa5 100644 --- a/src/include/game/camdraw.h +++ b/src/include/game/camdraw.h @@ -4,87 +4,18 @@ #include "data.h" #include "types.h" -void func0f149c90(struct textureconfig *tconfig); -void *func0f149d58(u32 size, u32 line, char *file); -void func0f149e58(u8 *arg0, u32 size); -void func0f14a00c(bool arg0); -struct var8007f8e0 *func0f14a06c(s32 index); -void func0f14a16c(s32 arg0); -char *ph_get_style_name(s32 stylenum); -char *ph_get_colour_name(s32 colournum); -struct var8007f8dc *func0f14a20c(void); -void func0f14a240(void); -bool func0f14a2fc(s32 index, u32 line, char *file); void phead_init(void); void phead_reset(void); void func0f14a52c(void); void func0f14a560(void); -void func0f14a594(s32 arg0); -s32 func0f14a5a4(void); -void func0f14a678(void); -bool func0f14a8e8(void); -void func0f14a95c(void); -s32 func0f14a984(void); s32 func0f14a9f8(s32 index); -void func0f14aa48(void); s32 func0f14aa70(void); -void func0f14aac4(void); -void func0f14ab3c(void); u16 func0f14ad14(s32 device); s32 func0f14ad38(s32 device); -void func0f14ad58(s32 index); bool func0f14aea0(s32 device); void func0f14aed0(s32 device); -void func0f14b178(void); -void func0f14b228(struct var8007f8e0 *arg0); -void func0f14b394(struct var8007f8e0 *arg0); -bool func0f14b484(s32 index); -void func0f14bc04(void); -void func0f14bd34(s32 index); -void func0f14bdbc(s32 index); -void func0f14bec8(s32 index); -void func0f14c1cc(s32 index); -void func0f14c50c(struct var8007f8e0 *arg0, struct var8007f8e0 *arg1, u32 line, char *file); -void func0f14c75c(struct textureconfig *arg0, struct textureconfig *arg1); -void func0f14c7dc(struct textureconfig *tconfig); -u32 func0f14c814(struct textureconfig *tconfig); -Gfx *func0f14c870(Gfx *gdl, struct textureconfig *tconfig, f32 *arg2, f32 arg3, f32 arg4); -void func0f14cdb8(s32 index, u8 *arg1); void func0f14cf6c(void); -void func0f14d064(s32 index, u8 *arg1); -void func0f14d2c8(u8 *arg0, u8 *arg1); -void func0f14d4f0(u8 *src, u8 *dst); -void func0f14d714(u8 *arg0, u8 *arg1); -void func0f14d84c(f32 *arg0, s32 arg1); -void func0f14d8d8(f32 *arg0, f32 *arg1, s32 arg2, f32 *arg3, s32 arg4); -void phead0f14dac0(u8 *arg0, struct textureconfig *arg1); -void func0f14dc30(s32 index, bool arg1); -void func0f14def0(s32 arg0, u32 line, char *file); -s32 func0f14dfc0(struct var8007f8e0 *arg0, s32 arg1, s32 arg2); -void func0f14e1c4(struct var8007f8e0 *arg0); -f32 func0f14e4ac(s32 arg0, s32 *arg1, s32 *arg2); -void func0f14e790(u8 *arg0); -void func0f14e7e0(u8 *arg0); -void func0f14e884(struct textureconfig *tconfig, s32 arg1, s32 arg2, u64 arg3); -void func0f14ec2c(u32 arg0, u32 arg1, u32 arg2, u32 arg3); -void func0f14ecd8(s32 *arg0, s32 *arg1, s32 *arg2, s32 *arg3); -void func0f14eeb0(f32 arg0[7]); -void func0f14ef50(f32 *arg0); -s32 func0f14f008(s32 index); Gfx *func0f14f07c(Gfx *gdl, s32 headorbodynum, s32 x1, s32 y1, s32 x2, s32 y2); -void func0f14f4b8(struct var8007f8e0 *arg0); -void func0f14f4e4(struct var8007f8e0 *arg0); -void func0f14f510(s32 arg0); -void func0f14f700(struct var8007f8e0 *arg0, u32 arg1, u32 arg2); -u32 func0f14f76c(struct var8007f8e0 *arg0, u32 arg1); -s32 phead0f14f7d4(struct var8007f8e0 *arg0); -void phead0f14f8cc(struct var8007f8e0 *arg0, s32 arg1[8][8]); -void func0f14f974(struct var8007f8e0 *arg0, s32 arg1); -void func0f14faf8(struct var8007f8e0 *arg0, s32 arg1[8][8]); -void func0f14fbfc(u8 *arg0[8], s32 arg1[8][8]); -void phead0f14fdb0(s32 arg0[8][8], u8 **arg1); -void func0f14ff94(struct var8007f8e0 *arg0); -void func0f150068(struct var8007f8e0 *arg0, s32 arg1); bool func0f15015c(s8 device, s32 filenum, u8 *arg2); void ph_get_guid(s32 index, struct fileguid *guid); void phead_init2(void); diff --git a/src/include/game/casing.h b/src/include/game/casing.h index 611d940ab..f7a1b3ad6 100644 --- a/src/include/game/casing.h +++ b/src/include/game/casing.h @@ -5,7 +5,6 @@ #include "types.h" void casings_reset(void); -void casing_tick(struct casing *arg0); void casings_tick(void); #endif diff --git a/src/include/game/challenge.h b/src/include/game/challenge.h index 3f1dc6265..c13616a2d 100644 --- a/src/include/game/challenge.h +++ b/src/include/game/challenge.h @@ -14,25 +14,19 @@ void challenge_perform_sanity_checks(void); char *challenge_get_name_by_slot(s32 slot); bool challenge_is_completed_by_any_chr_with_num_players_by_slot(s32 slot, s32 numplayers); struct mpconfigfull *challenge_load_config(s32 confignum, u8 *buffer, s32 len); -s32 challenge_force_unlock_feature(s32 featurenum, u8 *array, s32 tail, s32 len); -s32 challenge_force_unlock_setup_features(struct mpsetup *mpsetup, u8 *array, s32 len); void challenge_force_unlock_config_features(struct mpconfig *config, u8 *array, s32 len, s32 challengeindex); void challenge_force_unlock_bot_features(void); -void challenge_apply(void); char *challenge_get_current_description(void); char *challenge_get_config_description(struct mpconfigfull *mpconfig); bool challenge_is_complete_for_endscreen(void); bool ai_mp_init_simulants(void); void vm_print_stats_if_enabled(void); -bool challenge_is_available_to_player(s32 chrnum, s32 challengeindex); -bool challenge_is_available_to_any_player(s32 challengeindex); s32 challenge_get_num_available(void); char *challenge_get_name(s32 challengeindex); void challenge_set_current_by_slot(s32 slotnum); s32 challenge_get_current(void); struct mpconfigfull *challenge_load(s32 challengeindex, u8 *buffer, s32 len); struct mpconfigfull *challenge_load_by_slot(s32 n, u8 *buffer, s32 len); -struct mpconfigfull *challenge_load_current(u8 *buffer, s32 len); void challenge_remove_force_unlocks(void); s32 challenge_remove_player_lock(void); void challenge_load_and_store_current(u8 *buffer, s32 len); diff --git a/src/include/game/cheats.h b/src/include/game/cheats.h index 2371a5870..0186c1bc5 100644 --- a/src/include/game/cheats.h +++ b/src/include/game/cheats.h @@ -18,15 +18,9 @@ void cheat_activate(s32 cheat_id); void cheat_deactivate(s32 cheat_id); void cheats_init(void); void cheats_reset(void); -char *cheat_get_name_if_unlocked(struct menuitem *item); -char *cheat_get_marquee(struct menuitem *item); s32 cheat_get_by_timed_stage_index(s32 stage_index, s32 difficulty); s32 cheat_get_by_completed_stage_index(s32 stage_index); s32 cheat_get_time(s32 cheat_id); char *cheat_get_name(s32 cheat_id); -MenuDialogHandlerResult cheat_menu_handle_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult cheat_checkbox_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult cheat_menu_handle_buddy_checkbox(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult cheat_menu_handle_turn_off_all_cheats(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/chr.h b/src/include/game/chr.h index 18e455a7f..b3ac38f64 100644 --- a/src/include/game/chr.h +++ b/src/include/game/chr.h @@ -5,7 +5,6 @@ #include "types.h" void chr_set_chrnum(struct chrdata *chr, s16 chrnum); -void chr_deregister(s32 chrnum); void chr_calculate_push_pos(struct chrdata *chr, struct coord *pos, RoomNum *rooms, bool arg3); #if VERSION >= VERSION_NTSC_1_0 @@ -14,36 +13,26 @@ bool chr_ascend(struct chrdata *chr, struct coord *pos, RoomNum *rooms, f32 amou bool chr_ascend(struct chrdata *chr, struct coord *pos, RoomNum *rooms, f32 amount); #endif -bool chr_update_position(struct model *model, struct coord *arg1, struct coord *arg2, f32 *mangroundptr); s32 chrs_get_num_free(void); s16 chrs_get_next_unused_chrnum(void); struct prop *chr_place(struct prop *prop, struct model *model, struct coord *pos, RoomNum *rooms, f32 arg3, u8 *ailist); void chr_remove(struct prop *prop, bool free); -void chr_update_aim_properties(struct chrdata *chr); void chr_flinch_body(struct chrdata *chr); void chr_flinch_head(struct chrdata *chr, f32 arg1); -f32 chr_get_flinch_amount(struct chrdata *chr); void chr_find_entered_rooms_at_pos(struct chrdata *chr, struct coord *pos, RoomNum *rooms); void chr_update_anim(struct chrdata *chr, s32 lvupdate240, bool arg2); -void chr_tick_child(struct chrdata *chr, struct prop *child, bool fulltick); void chr_update_cloak(struct chrdata *chr); s32 chr_get_cloak_alpha(struct chrdata *chr); void chr_set_poisoned(struct chrdata *chr, struct prop *poisonprop); -void chr_tick_poisoned(struct chrdata *chr); bool chr_tick_beams(struct prop *prop); s32 chr_tick(struct prop *prop); void chr_drop_concealed_items(struct chrdata *chr); void chr_set_hudpiece_visible(struct chrdata *chr, bool visible); void chr_drop_items_for_owner_reap(struct chrdata *chr); -void chrs_set_blood_colour(u8 *rgb); -bool chr_find_onscreen_doors(struct chrdata *chr); -bool chr_should_render_gundl(struct model *model, struct modelnode *node); -void chr_render_attached_object(struct prop *prop, struct modelrenderdata *renderdata, bool xlupass, struct chrdata *chr); void chr_get_blood_colour(s16 bodynum, u8 *colour1, u32 *colour2); Gfx *chr_render(struct prop *prop, Gfx *gdl, bool xlupass); void chr_emit_sparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct coord *coord, struct coord *coord2, struct chrdata *chr2); void chr_bruise_from_stabby_projectile(struct model *model, s32 hitpart, struct modelnode *node, struct coord *arg3); -void chr_bruise(struct model *model, s32 hitpart, struct modelnode *node, struct coord *arg3); void chr_disfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius); f32 chr_get_hit_radius(struct chrdata *chr); void chr_test_hit(struct prop *prop, struct shotdata *shotdata, bool isshooting, bool cheap); @@ -51,34 +40,20 @@ void chr_hit(struct shotdata *shotdata, struct hit *hit); void chranimdebug_everyone(bool enable); void chrs_check_for_noise(f32 noiseradius); bool chr_calculate_autoaim(struct prop *prop, struct coord *screenpos, f32 *xrange, f32 *yrange); -s32 shieldhit_node_to_cmnum(struct prop *arg0, struct modelnode *node, struct model *model, struct prop *arg3); -bool shieldhit_cmnum_to_node(s32 arg0, struct prop *prop, struct prop **propptr, struct modelnode **nodeptr, struct model **modelptr); void shieldhit_create(struct prop *rootprop, f32 shield, struct prop *hitprop, struct modelnode *node, struct model *model, s32 side, s16 *arg6); -void shieldhit_remove(struct shieldhit *shieldhit); void shieldhits_remove_by_prop(struct prop *prop); -s32 shieldhit_find_parentnode_cmnum(struct prop *prop, s32 prevcmnum); -s32 shieldhit_find_childnode_cmnum(struct prop *prop, s32 prevcmnum); -s32 shieldhit_find_anynode_cmnum(struct prop *prop, s32 prevcmnum); void shieldhit_health_to_rgb(f32 health, s32 *r, s32 *g, s32 *b); -f32 shieldhit_get_health(struct prop **propptr); -Gfx *shieldhit_render_component(Gfx *gdl, struct shieldhit *hit, struct prop *prop, struct model *model, struct modelnode *node, s32 side, s32 arg6, s32 arg7, s32 alpha); Gfx *shieldhit_render(Gfx *gdl, struct prop *prop1, struct prop *prop2, s32 alpha, bool arg4, s32 cmnum1, s32 cmnum2, s32 cmnum3, s32 cmnum4); -Gfx *chr_render_cloak(Gfx *gdl, struct prop *chr1, struct prop *chr2); -Gfx *chr_render_shield(Gfx *gdl, struct chrdata *chr, u32 alpha); void shieldhits_tick(void); -void chr_set_drcaroll_images(struct chrdata *drcaroll, s32 imageleft, s32 imageright); s32 chrs_get_num_slots(void); -void chr_register(s32 chrnum, s32 chrindex); Vtx *chr_allocate_vertices(s32 numvertices); void chr_set_perim_enabled(struct chrdata *chr, bool enable); void chr_set_max_damage(struct chrdata *chr, f32 maxdamage); f32 chr_get_max_damage(struct chrdata *chr); void chr_add_health(struct chrdata *chr, f32 health); -f32 chr_get_armor(struct chrdata *chr); void chr_allocate(struct prop *prop, u8 *ailist); struct prop *chr_create_with_model(struct model *model, struct coord *pos, RoomNum *rooms, f32 faceangle, u8 *ailist); void chr_clear_references(s32 propnum); -void chr_find_entered_rooms(struct chrdata *chr, RoomNum *room); void chr_detect_rooms(struct chrdata *chr); void chr_cloak(struct chrdata *chr, bool arg1); void chr_uncloak(struct chrdata *chr, bool value); diff --git a/src/include/game/chraction.h b/src/include/game/chraction.h index eb6890a02..e3fd98aa2 100644 --- a/src/include/game/chraction.h +++ b/src/include/game/chraction.h @@ -4,49 +4,15 @@ #include "data.h" #include "types.h" -f32 chr_get_anim_movedist_per_frame(s16 animnum); bool chr_go_pos_is_waiting(struct chrdata *chr); bool weapon_is_one_handed(struct prop *prop); -f32 chr_get_ranged_speed(struct chrdata *chr, f32 min, f32 max); -s32 chr_get_percentage_of_slowness(struct chrdata *chr, s32 percentage); -f32 chr_get_ranged_argh_speed(struct chrdata *chr, f32 min, f32 max); -f32 chr_get_attack_entity_relative_angle(struct chrdata *chr, s32 attackflags, s32 entityid); f32 chr_get_attack_entity_distance(struct chrdata *chr, u32 attackflags, s32 entityid); void func0f02e3dc(struct coord *a, struct coord *b, struct coord *c, struct coord *d, struct coord *dst); void func0f02e4f8(struct coord *arg0, struct coord *arg1, struct coord *dst); -f32 func0f02e550(struct prop *prop, f32 arg1, f32 arg2, u32 cdtypes, f32 ymax, f32 ymin); -f32 func0f02e684(struct prop *prop, f32 arg1, f32 arg2); -void chr_choose_stand_animation(struct chrdata *chr, f32 mergetime); void chr_stand(struct chrdata *chr); bool chr_face_cover(struct chrdata *chr); -void chr_kneel_choose_animation(struct chrdata *chr); -void chr_start_alarm_choose_animation(struct chrdata *chr); -void chr_throw_grenade_choose_animation(struct chrdata *chr); -void chr_surprised_choose_animation(struct chrdata *chr); -void chr_do_surprised_one_hand(struct chrdata *chr); -void chr_surrender_choose_animation(struct chrdata *chr); -void chr_sidestep_choose_animation(struct chrdata *chr); -void chr_jump_out_choose_animation(struct chrdata *chr); -void chr_run_pos_choose_animation(struct chrdata *chr); -void chr_attack_stand(struct chrdata *chr, u32 attackflags, s32 entityid); -void chr_attack_lie(struct chrdata *chr, u32 attackflags, s32 entityid); -void chr_attack_kneel(struct chrdata *chr, u32 attackflags, s32 entityid); -void chr_attack_walk_choose_animation(struct chrdata *chr); -void chr_attack_walk(struct chrdata *chr, bool run); -void chr_attack_roll_choose_animation(struct chrdata *chr); -void chr_attack_roll(struct chrdata *chr, bool toleft); -void chr_start_anim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe, u8 chranimflags, s32 merge, f32 speed); -void func0f031254(struct chrdata *chr); -void chr_attack(struct chrdata *chr, struct attackanimgroup **animgroups, bool flip, bool *firing, u32 attackflags, s32 entityid, bool standing); -void chr_attack_amount(struct chrdata *chr, u32 attackflags, u32 entityid, u32 maxshots); void chr_begin_death(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hitpart, struct gset *gset, bool knockout, s32 aplayernum); -void chr_begin_argh(struct chrdata *chr, f32 angle, s32 hitpart); -void chr_react_to_damage(struct chrdata *chr, struct coord *dir, f32 angle, s32 hitpart, struct gset *gset, s32 playernum); void chr_yeet_from_pos(struct chrdata *chr, struct coord *pos, f32 arg2); -s32 gset_get_blur_amount(struct gset *gset); -void chr_knock_out(struct chrdata *chr, f32 angle, s32 hitpart, struct gset *gset); -bool chr_is_anim_preventing_argh(struct chrdata *chr, f32 *arg1); -void chr_choke(struct chrdata *chr, s32 choketype); void chr_set_shield(struct chrdata *chr, f32 shield); bool chr_try_create_shieldhit(struct chrdata *chr, struct modelnode *node, struct prop *prop, struct model *model, s32 side, s16 *arg5); void chr_damage_by_dizziness(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop); @@ -54,44 +20,14 @@ void chr_damage_by_laser(struct chrdata *chr, f32 damage, struct coord *vector, void chr_damage_by_impact(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop, s32 hitpart, struct prop *prop2, struct modelnode *node, struct model *model, s32 side, s16 *hitpos); void chr_damage_by_general(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop, s32 arg5); void chr_damage_by_explosion(struct chrdata *chr, f32 damage, struct coord *vector, struct prop *prop, struct coord *explosionpos); -void player_update_damage_stats(struct prop *attacker, struct prop *victim, f32 damage); -void chr_damage(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *aprop, s32 hitpart, bool damageshield, struct prop *prop2, struct modelnode *node, struct model *model, s32 side, s16 *arg11, bool explosion, struct coord *explosionpos); -bool func0f03645c(struct chrdata *chr, struct coord *arg1, RoomNum *arg2, struct coord *arg3, struct coord *arg4, s32 cdtypes); -bool func0f03654c(struct chrdata *chr, struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum *rooms2, struct coord *vector, f32 arg6, u32 types); -bool propchr_has_clear_line_to_pos(struct prop *prop, struct coord *dstpos, struct coord *vector); -bool propchr_has_clear_line_in_vector(struct prop *prop, struct coord *coord, f32 arg2); -bool func0f036974(struct prop *prop, struct coord *coord); -void chr_get_side_vector_to_target(struct chrdata *chr, bool side, struct coord *vector); -bool chr_can_roll_in_direction(struct chrdata *chr, bool toleft, f32 distance); -void chr_get_side_vector(struct chrdata *chr, bool side, struct coord *vector); -bool chr_can_jump_in_direction(struct chrdata *chr, bool side, f32 distance); -bool chr_is_room_off_screen(struct chrdata *chr, struct coord *waypos, RoomNum *wayrooms); -void chr_go_pos_init_magic(struct chrdata *chr, struct waydata *waydata, struct coord *arg2, struct coord *prevpos); -void chr_go_pos_get_cur_waypoint_info_with_flags(struct chrdata *chr, struct coord *pos, RoomNum *rooms, u32 *flags); -s32 chr_go_pos_calculate_base_ttl(struct chrdata *chr); -void chr_go_pos_consider_restart(struct chrdata *chr); -void chr_go_pos_init_expensive(struct chrdata *chr); -void chr_go_pos_advance_waypoint(struct chrdata *chr); -s32 chr_patrol_calculate_step(struct chrdata *chr, bool *forward, s32 numsteps); -s16 chr_patrol_calculate_pad_num(struct chrdata *chr, s32 numsteps); -void chr_patrol_get_cur_waypoint_info_with_flags(struct chrdata *chr, struct coord *pos, RoomNum *rooms, u32 *flags); -void func0f037580(struct chrdata *chr); -void func0f0375b0(struct chrdata *chr); -void chr_nav_tick_magic(struct chrdata *chr, struct waydata *waydata, f32 speed, struct coord *arg3, RoomNum *rooms); void chr_calculate_position(struct chrdata *chr, struct coord *pos); -void chr_go_pos_choose_animation(struct chrdata *chr); bool chr_go_to_room_pos(struct chrdata *chr, struct coord *pos, RoomNum *rooms, u32 goposflags); -void chr_patrol_choose_animation(struct chrdata *chr); -void chr_start_patrol(struct chrdata *chr, struct path *path); -bool chr_has_los_to_entity(struct chrdata *chr, struct coord *chrpos, RoomNum *chrrooms, bool allowextraheight, u32 attackflags, u32 entityid); bool chr_has_los_to_attack_target(struct chrdata *chr, struct coord *pos, RoomNum *rooms, bool allowextraheight); bool chr_has_los_to_chr(struct chrdata *chr, struct chrdata *target, RoomNum *room); bool chr_has_los_to_pos(struct chrdata *viewerchr, struct coord *pos, RoomNum *rooms); -bool chr_has_los_to_pos_wasteful(struct chrdata *chr, struct coord *pos, RoomNum *room); bool chr_has_los_to_prop(struct chrdata *chr, struct prop *prop); bool chr_is_stopped(struct chrdata *chr); bool chr_check_can_see_target(struct chrdata *chr); -bool chr_is_ready_for_orders(struct chrdata *chr); bool chr_try_sidestep(struct chrdata *chr); bool chr_try_jump_out(struct chrdata *chr); bool chr_try_run_sideways(struct chrdata *chr); @@ -100,7 +36,6 @@ bool chr_try_attack_run(struct chrdata *chr); bool chr_try_attack_roll(struct chrdata *chr); bool chr_try_attack_amount(struct chrdata *chr, u32 arg1, u32 arg2, u8 arg3, u8 arg4); bool chr_go_to_pad(struct chrdata *chr, s32 padnum, u32 goposflags); -bool chr_go_to_pos(struct chrdata *chr, struct coord *pos, u32 goposflags); s32 func0f03aca0(struct chrdata *chr, f32 arg1, u8 arg2); bool chr_try_run_from_target(struct chrdata *chr); bool chr_go_to_cover_prop(struct chrdata *chr); @@ -108,91 +43,37 @@ bool chr_drop_item(struct chrdata *chr, u32 modelnum, u32 weaponnum); void chr_punch_inflict_damage(struct chrdata *chr, s32 damage, s32 range, u8 reverse); bool chr_try_punch(struct chrdata *chr, u8 reverse); struct eyespy *chr_to_eyespy(struct chrdata *chr); -void chr_tick_stand(struct chrdata *chr); -void chr_tick_anim(struct chrdata *chr); -void chr_tick_surrender(struct chrdata *chr); -void chr_tick_dead(struct chrdata *chr); -void chr_alert_others_of_injury(struct chrdata *chr, bool dying); -void chr_tick_die(struct chrdata *chr); -void chr_tick_drugged_coming_up(struct chrdata *chr); -void chr_tick_drugged_drop(struct chrdata *chr); -void chr_tick_drugged_ko(struct chrdata *chr); -void chr_tick_argh(struct chrdata *chr); -void chr_tick_pre_argh(struct chrdata *chr); -void chr_tick_sidestep(struct chrdata *chr); -void chr_tick_jump_out(struct chrdata *chr); -void chr_tick_start_alarm(struct chrdata *chr); -void chr_tick_surprised(struct chrdata *chr); void chr_update_fireslot(struct chrdata *chr, s32 handnum, bool withsound, bool withbeam, struct coord *from, struct coord *to); f32 chr_get_inverse_theta(struct chrdata *chr); f32 chr_get_aim_angle(struct chrdata *chr); f32 chr_get_pitch_angle(struct chrdata *chr); -s32 chr_turn(struct chrdata *chr, s32 turning, f32 endanimframe, f32 speed, f32 toleranceangle); bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, s32 arg2, s32 arg3, f32 arg4); void chr_calculate_aim_end_properties(struct chrdata *chr, struct attackanimconfig *animcfg, bool firingleft, bool firingright, f32 shootrotx); f32 chr_get_aim_limit_angle(f32 sqdist); -void chr_calculate_hit(struct chrdata *chr, bool *angleokptr, bool *hit, struct gset *gset); bool chr_get_gun_pos(struct chrdata *chr, s32 handnum, struct coord *gunpos); void chr_calculate_shield_hit(struct chrdata *chr, struct coord *pos, struct coord *vector, struct modelnode **node, s32 *hitpart, struct model **model, s32 *side); void chr_calculate_trajectory(struct coord *frompos, f32 arg1, struct coord *aimpos, struct coord *arg3); -void chr_tick_shoot(struct chrdata *chr, s32 handnum); void func0f041a74(struct chrdata *chr); -bool func0f041c44(struct chrdata *chr); -void chr_attack_amount_update_animation(struct chrdata *chr); -void chr_tick_fire(struct chrdata *chr); -void chr_tick_attack_amount(struct chrdata *chr); -void robot_set_muzzle_flash(struct chrdata *chr, bool right, bool enabled); -void robot_attack(struct chrdata *chr); -void chr_tick_robot_attack(struct chrdata *chr); -void chr_tick_attack(struct chrdata *chr); -void chr_tick_attack_roll(struct chrdata *chr); -void prop_print_dangerous(void); -void chr_tick_throw_grenade(struct chrdata *chr); -bool func0f043f2c(struct chrdata *chr, struct coord *runpos, u32 arg2, f32 *turnspeed); -void chr_tick_attack_walk(struct chrdata *chr); bool pos_is_moving_towards_pos_or_stopped_in_range(struct coord *prevpos, struct coord *moveddelta, struct coord *targetpos, f32 range); bool pos_is_arriving_laterally_at_pos(struct coord *prevpos, struct coord *curpos, struct coord *targetpos, f32 range); -bool pos_is_arriving_at_pos(struct coord *prevpos, struct coord *curpos, struct coord *targetpos, f32 range); -void chr_tick_run_pos(struct chrdata *chr); -void func0f044b68(struct coord *arg0, struct coord *arg1, struct coord *arg2); -bool chr_nav_can_see_next_pos(struct chrdata *chr, struct coord *pos, RoomNum *rooms, struct coord *aimpos, struct coord *arg4, struct coord *arg5, f32 negchrradius, f32 chrradius, s32 cdtypes, s32 arg9); -bool chr_nav_check_for_obstacle(struct chrdata *chr, struct coord *chrpos, RoomNum *chrrooms, struct coord *aimpos, struct coord *leftpos, struct coord *rightpos, f32 negchrradius, f32 chrradius, s32 cdtypes, bool hasobstacle); -bool chr_nav_try_obstacle(struct chrdata *chr, struct coord *arg1, bool arg2, struct coord *arg3, f32 radius, bool arg5, struct coord *nextpos, struct waydata *waydata, f32 arg8, s32 cdtypes, s32 arg10); -struct prop *chr_open_door(struct chrdata *chr, struct coord *rangepos); -void chr_nav_tick_main(struct chrdata *chr, struct coord *pos, struct waydata *waydata, bool arg3); -bool chr_go_pos_update_lift_action(struct chrdata *chr, u32 curpadflags, bool arg2, bool arrivingatlift, s16 curpadnum, s32 nextpadnum); -s16 chr_go_pos_get_next_pad_num(struct chrdata *chr); -void chr_tick_go_pos(struct chrdata *chr); -void chr_tick_patrol(struct chrdata *chr); -bool chr_start_sk_jump(struct chrdata *chr, u8 pouncebits, u8 arg2, s32 arg3, u8 arg4); -void chr_tick_sk_jump(struct chrdata *chr); void chra_tick(struct chrdata *chr); void cutscene_start(u32 ailistid); void chra_tick_bg(void); f32 chr_get_angle_to_pos(struct chrdata *chr, struct coord *pos); -void chr_get_attack_entity_pos(struct chrdata *chr, u32 attackflags, s32 entityid, struct coord *pos, RoomNum *rooms); -f32 chr_get_angle_from_targets_fov(struct chrdata *chr); -f32 chr_get_vertical_angle_to_target(struct chrdata *chr); bool chr_is_in_targets_fov_x(struct chrdata *chr, u8 fov360); bool chr_is_vertical_angle_to_target_within(struct chrdata *chr, u8 arg1); -f32 func0f048fcc(struct chrdata *chr, u8 reverse); bool chr_is_target_in_fov(struct chrdata *chr, u8 arg1, u8 reverse); bool chr_is_looking_at_pos(struct chrdata *chr, struct coord *pos, u8 arg2); f32 chr_get_same_floor_distance_to_pad(struct chrdata *chr, s32 pad_id); void chrs_clear_refs_to_player(s32 playernum); -s32 chr_resolve_id(struct chrdata *ref, s32 id); f32 chr_get_timer(struct chrdata *chr); bool chr_is_target_aiming_at_me(struct chrdata *chr); bool chr_saw_injury(struct chrdata *chr, u8 arg1); bool chr_saw_death(struct chrdata *chr, u8 arg1); -bool waypoint_is_within_90_degrees_of_pos_angle(struct waypoint *waypoint, struct coord *pos, f32 angle); -s32 chr_find_waypoint_within_pos_quadrant(struct coord *pos, RoomNum *rooms, f32 angle, u8 quadrant); bool func0f04a4ec(struct chrdata *chr, u8 quadrant); bool chr_set_pad_preset_to_waypoint_within_target_quadrant(struct chrdata *chr, u8 arg1); bool chr_set_chr_preset_to_chr_near_pad(u32 checktype, struct chrdata *chr, f32 distance, s32 padnum); -bool chr_set_chr_preset_to_chr_near_pos(u8 checktype, struct chrdata *chr, f32 distance, struct coord *pos, RoomNum *room); bool chr_set_pad_preset_to_pad_on_route_to_target(struct chrdata *chr); -bool chr_is_pos_off_screen(struct coord *pos, RoomNum *rooms); #if VERSION >= VERSION_NTSC_1_0 bool chr_adjust_pos_for_spawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 angle, bool allowonscreen, bool force, bool onlysurrounding); @@ -207,33 +88,15 @@ bool chr_check_cover_out_of_sight(struct chrdata *chr, s32 covernum, bool soft); s32 chr_assign_cover_by_criteria(struct chrdata *chr, u16 arg1, s32 arg2); s32 chr_assign_cover_away_from_danger(struct chrdata *chr, s32 mindist, s32 maxdist); bool chr_run_from_pos(struct chrdata *chr, u32 goposflags, f32 distance, struct coord *frompos); -f32 chr_get_angle_from_targets_pov(struct chrdata *chr); bool chr_flank(struct chrdata *chr, u32 angle360, struct coord *pos, u8 use_closest_side, u8 goposflags); void rebuild_teams(void); void rebuild_squadrons(void); void chr_avoid(struct chrdata *chr); void func0f02e9a0(struct chrdata *chr, f32 mergetime); -void func0f02ed28(struct chrdata *chr, f32 mergetime); -void chr_stop(struct chrdata *chr); -void chr_kneel(struct chrdata *chr); -void chr_start_alarm(struct chrdata *chr); -void chr_throw_grenade(struct chrdata *chr, s32 arg1, s32 arg2); -void chr_do_surprised_surrender(struct chrdata *chr); -void chr_do_surprised_look_around(struct chrdata *chr); -void chr_surrender(struct chrdata *chr); -void chr_sidestep(struct chrdata *chr, bool side); -void chr_jump_out(struct chrdata *chr, bool side); -void chr_run_to_pos(struct chrdata *chr, struct coord *pos); -void chr_begin_dead(struct chrdata *chr); f32 chr_get_shield(struct chrdata *chr); void chr_die(struct chrdata *chr, s32 aplayernum); -void chr_go_pos_get_cur_waypoint_info(struct chrdata *chr, struct coord *pos, RoomNum *rooms); -void chr_go_pos_clear_restart_ttl(struct chrdata *chr); -void chr_patrol_get_cur_waypoint_info(struct chrdata *chr, struct coord *pos, RoomNum *rooms); struct path *path_find_by_id(u32 path_id); -void chr_record_last_visible_target_time(struct chrdata *chr); bool chr_has_los_to_target(struct chrdata *chr); -void chr_record_last_see_target_time(struct chrdata *chr); void chr_record_last_hear_target_time(struct chrdata *chr); bool chr_is_dead(struct chrdata *chr); bool chr_try_attack_stand(struct chrdata *chr, u32 attackflags, s32 entityid); @@ -256,22 +119,16 @@ bool chr_try_kneel(struct chrdata *chr); bool chr_try_start_anim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe, u8 chranimflags, s32 merge, f32 speed); bool chr_try_start_alarm(struct chrdata *chr, s32 pad_id); bool chr_consider_grenade_throw(struct chrdata *chr, u32 attackflags, u32 entityid); -void chr_tick_kneel(struct chrdata *chr); -void chr_fade_corpse(struct chrdata *chr); void chr_fade_corpse_when_off_screen(struct chrdata *chr); -void chr_tick_test(struct chrdata *chr); void chr_set_look_angle(struct chrdata *chr, f32 angle); f32 chr_get_rot_y(struct chrdata *chr); -void chr_set_rot_y(struct chrdata *chr, f32 arg1); void chr_reset_aim_end_properties(struct chrdata *chr); void chr_set_firing(struct chrdata *chr, s32 hand, bool firing); void chr_stop_firing(struct chrdata *chr); void chr_set_hand_firing(struct chrdata *chr, s32 hand, bool arg2); -void func0f0429d8(struct chrdata *chr, f32 arg1, f32 arg2); void prop_unset_dangerous(struct prop *prop); void prop_set_dangerous(struct prop *prop); bool chr_detect_dangerous_object(struct chrdata *chr, u8 flags); -void chr_tick_bond_die(struct chrdata *chr); s32 chr_is_using_lift(struct chrdata *chr); bool chr_try_sk_jump(struct chrdata *chr, u8 pouncebits, u8 arg2, s32 arg3, u8 arg4); bool chr_saw_target_recently(struct chrdata *chr); @@ -280,12 +137,9 @@ f32 chr_get_angle_to_target(struct chrdata *chr); f32 chr_get_distance_to_target(struct chrdata *chr); f32 chr_get_distance_to_target2(struct chrdata *chr); f32 chr_get_distance_to_current_player(struct chrdata *chr); -f32 prop_get_distance_to_prop(struct prop *a, struct prop *b); -f32 prop_get_lateral_distance_to_prop(struct prop *a, struct prop *b); f32 chr_get_distance_to_pad(struct chrdata *chr, s32 pad_id); f32 chr_get_distance_to_coord(struct chrdata *chr, struct coord *pos); f32 chr_get_lateral_distance_to_coord(struct chrdata *chr, struct coord *pos); -f32 chr_get_lateral_distance_to_pad(struct chrdata *chr, s32 pad_id); f32 chr_get_squared_distance_to_coord(struct chrdata *chr, struct coord *pos); f32 coord_get_squared_distance_to_coord(struct coord *a, struct coord *b); s32 chr_get_pad_room(struct chrdata *chr, s32 pad_id); diff --git a/src/include/game/crc.h b/src/include/game/crc.h index fb27dfa22..56d4f3326 100644 --- a/src/include/game/crc.h +++ b/src/include/game/crc.h @@ -4,7 +4,6 @@ #include "data.h" #include "types.h" -void crc_calculate_u32_pair(u8 *start, u8 *end, u32 *checksum); void crc_calculate_u16_pair(u8 *start, u8 *end, u16 *checksum); #endif diff --git a/src/include/game/dlights.h b/src/include/game/dlights.h index 8bbef139f..9fd604c13 100644 --- a/src/include/game/dlights.h +++ b/src/include/game/dlights.h @@ -4,8 +4,6 @@ #include "data.h" #include "types.h" -u32 func0f000920(s32 portalnum1, s32 portalnum2); -struct light *room_get_light(s32 roomnum, s32 lightnum); u8 room_get_final_brightness(s32 roomnum); u8 room_get_final_brightness_for_player(s32 roomnum); u8 room_get_settled_regional_brightness_for_player(s32 roomnum); @@ -18,7 +16,6 @@ bool light_is_healthy(s32 roomnum, s32 lightnum); bool light_is_vulnerable(s32 roomnum, s32 lightnum); bool light_is_on(s32 roomnum, s32 lightnum); void room_set_flash_brightness(s32 roomnum, s32 value); -void room_set_defaults(struct room *room); Gfx *lights_set_for_room(Gfx *gdl, RoomNum roomnum); Gfx *lights_set_default(Gfx *gdl); void room_init_lights(s32 roomnum); @@ -27,27 +24,14 @@ void room_set_lights_faulty(s32 roomnum, s32 chance); void room_set_light_broken(s32 roomnum, s32 lightnum); void lights_reset(void); void func0f001c0c(void); -void func0f00215c(u8 *arg0); -void lights_calculate_room_dimensions(void); -void func0f00259c(s32 roomnum); -void func0f002844(s32 roomnum, f32 arg1, s32 arg2, s32 portalnum); void func0f002a98(void); void room_set_lights_on(s32 roomnum, s32 enable); void room_set_light_op(s32 roomnum, s32 operation, u8 br_to, u8 br_from, u8 duration60); bool light_tick_broken(s32 roomnum, s32 lightnum); void lighting_tick(void); -void lights_configure_for_perfect_darkness_cutscene(void); -void lights_configure_for_perfect_darkness_gameplay(void); -void lights_tick_perfect_darkness(void); -void rooms_tick_lighting(void); void lights_tick(void); void room_flash_lighting(s32 roomnum, s32 start, s32 limit); -void room_flash_local_lighting(s32 roomnum, s32 increment, s32 limit); void room_highlight(s32 roomnum); -void func0f004c6c(void); -void func0f00505c(void); -f32 func0f0053d0(s32 room1, struct coord *arg1, s32 portal1, s32 room2, struct coord *arg4, s32 portal2, f32 *arg6); void func0f0056f4(s32 room1, struct coord *coord1, s32 room2, struct coord *coord2, s32 arg4, f32 *arg5, s32 arg6); -void func0f005bb0(void); #endif diff --git a/src/include/game/endscreen.h b/src/include/game/endscreen.h index b37d107b9..e1783a150 100644 --- a/src/include/game/endscreen.h +++ b/src/include/game/endscreen.h @@ -4,36 +4,6 @@ #include "data.h" #include "types.h" -MenuDialogHandlerResult endscreen_handle_retry_mission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult endscreen_handle_2p_completed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult endscreen_handle_2p_failed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult endscreen_handle_decline_mission(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult endscreen_handle_cheat_info(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult endscreen_handle_continue_mission(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult endscreen_handle_replay_last_level(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult endscreen_handle_replay_previous_mission(s32 operation, struct menuitem *item, union handlerdata *data); -char *endscreen_menu_title_retry_mission(struct menudialogdef *dialogdef); -char *endscreen_menu_title_next_mission(struct menudialogdef *dialogdef); -char *endscreen_menu_text_num_kills(struct menuitem *item); -char *endscreen_menu_text_num_shots(struct menuitem *item); -char *endscreen_menu_text_num_head_shots(struct menuitem *item); -char *endscreen_menu_text_num_body_shots(struct menuitem *item); -char *endscreen_menu_text_num_limb_shots(struct menuitem *item); -char *endscreen_menu_text_num_other_shots(struct menuitem *item); -char *endscreen_menu_text_accuracy(struct menuitem *item); -char *endscreen_menu_text_mission_status(struct menuitem *item); -char *endscreen_menu_text_agent_status(struct menuitem *item); -char *endscreen_menu_title_stage_completed(struct menuitem *item); -char *endscreen_menu_text_current_stage_name3(struct menuitem *item); -char *endscreen_menu_title_stage_failed(struct menuitem *item); -char *endscreen_menu_text_mission_time(struct menuitem *item); -struct menudialogdef *endscreen_advance(void); -void endscreen_reset_models(void); -void endscreen_continue(s32 context); -char *endscreen_menu_text_timed_cheat_name(struct menuitem *item); -char *endscreen_menu_text_completion_cheat_name(struct menuitem *item); -char *endscreen_menu_text_target_time(struct menuitem *item); -void endscreen_set_coop_completed(void); void endscreen_prepare(void); void endscreen_push_coop(void); void endscreen_push_solo(void); diff --git a/src/include/game/env.h b/src/include/game/env.h index d928bd877..ae194cdaf 100644 --- a/src/include/game/env.h +++ b/src/include/game/env.h @@ -13,8 +13,6 @@ struct distfadesettings { struct environment *env_get_current(void); f32 env_get_squared_fog_max(void); void env_tick(void); -void env_apply_fog_environment(struct fogenvironment *sky); -void env_apply_no_fog_environment(struct nofogenvironment *sky); void env_set_stage_num(s32 stagenum); void env_choose_and_apply(s32 stagenum, bool allowoverride); void env_apply_transition_frac(f32 arg0); diff --git a/src/include/game/explosions.h b/src/include/game/explosions.h index f2442b45e..94fb52cc2 100644 --- a/src/include/game/explosions.h +++ b/src/include/game/explosions.h @@ -10,17 +10,10 @@ void explosions_stop(void); bool explosion_create_simple(struct prop *prop, struct coord *pos, RoomNum *rooms, s16 type, s32 playernum); bool explosion_create_complex(struct prop *prop, struct coord *pos, RoomNum *rooms, s16 type, s32 playernum); -f32 explosion_get_horizontal_range_at_frame(struct explosion *exp, s32 frame); -f32 explosion_get_vertical_range_at_frame(struct explosion *exp, s32 frame); -void explosion_get_bbox_at_frame(struct coord *lower, struct coord *upper, s32 frame, struct prop *prop); -void explosion_alert_chrs(f32 *radius, struct coord *noisepos); bool explosion_create(struct prop *prop, struct coord *pos, RoomNum *rooms, s16 type, s32 playernum, bool makescorch, struct coord *arg6, RoomNum room, struct coord *arg8); void explosions_update_shake(struct coord *arg0, struct coord *arg1, struct coord *arg2); -bool explosion_overlaps_prop(struct explosion *exp, struct prop *prop, struct coord *pos1, struct coord *pos2); -void explosion_inflict_damage(struct prop *prop); u32 explosion_tick(struct prop *prop); u32 explosion_tick_player(struct prop *prop); Gfx *explosion_render(struct prop *prop, Gfx *gdl, bool xlupass); -Gfx *explosion_render_part(struct explosion *exp, struct explosionpart *part, Gfx *gdl, struct coord *coord, s32 arg4); #endif diff --git a/src/include/game/filelist.h b/src/include/game/filelist.h index ca4be4deb..988dcf2ab 100644 --- a/src/include/game/filelist.h +++ b/src/include/game/filelist.h @@ -10,6 +10,5 @@ void filelist_create(s32 listnum, u8 filetype); s32 filelist_find_or_create(u8 filetype); void filelist_invalidate_pak(s32 device); void filelists_tick(void); -void filelist_update(struct filelist *list); #endif diff --git a/src/include/game/filemgr.h b/src/include/game/filemgr.h index bc74ebf85..4cde572c7 100644 --- a/src/include/game/filemgr.h +++ b/src/include/game/filemgr.h @@ -6,80 +6,19 @@ extern struct menudialogdef g_ChooseLanguageMenuDialog; -char *filemgr_get_device_name(s32 index); char *filemgr_menu_text_device_name(struct menuitem *item); void filemgr_get_select_name(char *buffer, struct filelistfile *file, u32 filetype); -char *filemgr_menu_text_delete_file_name(struct menuitem *item); void filemgr_set_device1_by_serial(s32 deviceserial); -void filemgr_set_device1_by_file(struct filelistfile *file); -void filemgr_set_file_to_delete(struct filelistfile *file, s32 filetype); -char *filemgr_menu_text_fail_reason(struct menuitem *item); -char *filemgr_menu_text_device_name_for_error(struct menuitem *item); void filemgr_push_error_dialog(u16 errno); s32 filemgr_get_device_name_or_start_index(s32 listnum, s32 operation, s32 optionindex); -char *filemgr_menu_text_error_title(struct menuitem *item); -char *filemgr_menu_text_file_type(struct menuitem *item); -void func0f10898c(void); -void filemgr_handle_success(void); -void filemgr_erase_corrupt_file(void); -char *filemgr_menu_text_insert_original_pak(struct menuitem *item); -void filemgr_retry_save(s32 arg0); -bool filemgr_attempt_operation(s32 device, bool closeonsuccess); bool filemgr_save_or_load(struct fileguid *guid, s32 fileop, u32 playernum); -void filemgr_delete_current_file(void); -void func0f1097d0(s32 device); -void filemgr_save_game_to_device(s32 device); -void filemgr_get_file_name(char *dst, struct filelistfile *file); -void filemgr_get_rename_name(char *buffer); -void filemgr_set_rename_name(char *name); -bool filemgr_is_name_available(s32 arg0); -void filemgr_save_to_device(void); -char *filemgr_menu_text_device_name_containing_duplicate_file(struct menuitem *item); -char *filemgr_menu_text_duplicate_file_name(struct menuitem *item); -char *filemgr_menu_text_location_name2(struct menuitem *item); -char *filemgr_menu_text_save_location_spaces(struct menuitem *item); void filemgr_push_select_location_dialog(s32 arg0, u32 filetype); -char *filemgr_menu_text_file_in_use_description(struct menuitem *item); -Gfx *filemgr_render_perfect_head_thumbnail(Gfx *gdl, struct menuitemrenderdata *renderdata, s32 filenum, s32 deviceserial); -bool filemgr_is_file_in_use(struct filelistfile *file); -MenuItemHandlerResult filemgr_file_to_copy_or_delete_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data, bool isdelete); -void filemgr_push_delete_file_dialog(s32 listnum); -char *pak_menu_text_pages_free(struct menuitem *item); -char *pak_menu_text_pages_used(struct menuitem *item); -char *pak_menu_text_status_message(struct menuitem *item); -char *pak_menu_text_editing_pak_name(struct menuitem *item); bool filemgr_consider_pushing_file_select_dialog(void); void bootmenu_reset(void); MenuItemHandlerResult filemgr_choose_agent_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult pak_game_note_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_file_to_copy_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_file_to_delete_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult filemgr_insert_original_pak_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult filemgr_copy_or_delete_list_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult pak_game_notes_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult pak_choose_pak_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); MenuDialogHandlerResult filemgr_main_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult filemgr_device_name_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_file_name_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_device_name_for_error_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_retry_save_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_cancel_save2_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_acknowledge_file_lost_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_reinserted_ok_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_reinserted_cancel_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_duplicate_rename_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_duplicate_cancel_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_cancel_save_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_delete_files_for_save_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_confirm_delete_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult pak_delete_game_note_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult pak_selection_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_agent_name_keyboard_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult filemgr_open_copy_file_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult filemgr_open_delete_file_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_confirm_rename_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_save_elsewhere_yes_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgr_select_location_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); extern const char var7f1b3214[]; extern const char var7f1b3218[]; diff --git a/src/include/game/fmb.h b/src/include/game/fmb.h index ad9d7d2d5..8b0e507fd 100644 --- a/src/include/game/fmb.h +++ b/src/include/game/fmb.h @@ -5,10 +5,5 @@ #include "types.h" void fmb_reset(void); -MenuItemHandlerResult fmb_handle_drop_out(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult fmd_handle_abort_game(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult fmb_handle_advanced_setup(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult fmb_handle_accept_challenge(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult fmb_handle_main_menu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); #endif diff --git a/src/include/game/game_097aa0.h b/src/include/game/game_097aa0.h index 875220ad5..b6c20e529 100644 --- a/src/include/game/game_097aa0.h +++ b/src/include/game/game_097aa0.h @@ -4,7 +4,6 @@ #include "data.h" #include "types.h" -f32 func0f097aa0(f32 arg0); void func0f097b40(f32 *a, f32 *b, f32 *dst); void func0f097b64(f32 *param_1, f32 *param_2, f32 scale, f32 *dst); diff --git a/src/include/game/game_0b0fd0.h b/src/include/game/game_0b0fd0.h index d278dd284..2b5c14fb0 100644 --- a/src/include/game/game_0b0fd0.h +++ b/src/include/game/game_0b0fd0.h @@ -25,7 +25,6 @@ void current_player_set_device_active(s32 weaponum, bool active); u16 weapon_get_file_num(s32 weaponnum); u16 weapon_get_file_num2(s32 weaponnum); void gset_populate_from_current_player(s32 handnum, struct gset *gset); -struct inventory_ammo *gset_get_ammo_definition(struct gset *gset); u8 gset_get_single_penetration(struct gset *gset); f32 gset_get_impact_force(struct gset *gset); f32 gset_get_damage(struct gset *gset); diff --git a/src/include/game/game_13c510.h b/src/include/game/game_13c510.h index e37ed77df..3861efec5 100644 --- a/src/include/game/game_13c510.h +++ b/src/include/game/game_13c510.h @@ -6,10 +6,7 @@ void artifacts_clear(void); void artifacts_tick(void); -u16 func0f13c574(f32 arg0); -s32 func0f13c710(f32 arg0); void artifacts_calculate_glares_for_room(s32 roomnum); -u8 func0f13d3c4(u8 arg0, u8 arg1); Gfx *artifacts_configure_for_glares(Gfx *gdl); Gfx *artifacts_unconfigure_for_glares(Gfx *gdl); Gfx *artifacts_render_glares_for_room(Gfx *gdl, s32 roomnum); diff --git a/src/include/game/game_1531a0.h b/src/include/game/game_1531a0.h index 866788f57..ab4dac154 100644 --- a/src/include/game/game_1531a0.h +++ b/src/include/game/game_1531a0.h @@ -10,10 +10,7 @@ void text_init(void); void text_set_rotation90(bool rotated); -void text_set_wrap_indent(s32 count); -void text0f1531d0(s32 arg0); void text0f1531dc(bool arg0); -void text_load_font(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace); void text_reset(void); Gfx *text0f153628(Gfx *gdl); Gfx *text0f153780(Gfx *gdl); @@ -25,7 +22,6 @@ Gfx *text0f153990(Gfx *gdl, s32 left, s32 top, s32 width, s32 height); Gfx *text0f153a34(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour); Gfx *text0f153ab0(Gfx *gdl); void text0f153b40(void); -void text0f153b6c(s32 arg0); void text_set_diagonal_blend(s32 x, s32 y, f32 redrawtimer, u8 populated); void text_backup_diagonal_blend_settings(void); void text_restore_diagonal_blend_settings(void); @@ -39,15 +35,10 @@ void text_reset_blends(void); bool text_has_diagonal_blend(void); u32 text_apply_projection_colour(s32 x, s32 y, u32 colour); u32 text0f1543ac(s32 x, s32 y, u32 colour); -Gfx *text0f154ecc(Gfx *gdl, u32 arg1, u32 arg2); -Gfx *text0f154f38(Gfx *gdl, s32 *arg1, struct fontchar *curchar, struct fontchar *prevchar, struct font *font, f32 widthscale, f32 heightscale, f32 x, f32 y); Gfx *text0f1552d4(Gfx *gdl, f32 x, f32 y, f32 widthscale, f32 heightscale, char *text, struct fontchar *chars, struct font *font, u32 colour, s32 hdir, s32 vdir); -Gfx *text0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fontchar *prevchar, struct font *font, s32 savedx, s32 savedy, s32 width, s32 height, s32 arg10); void text0f156024(s32 arg0); void text0f156030(u32 colour); Gfx *text_render_projected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *chars, struct font *font, s32 colour, s32 width, s32 height, s32 arg9, s32 lineheight); -Gfx *text0f1566cc(Gfx *gdl, u32 arg1, u32 arg2); -Gfx *text0f156a24(Gfx *gdl, s32 x, s32 y, struct fontchar *char1, s32 arg4, s32 arg5, s32 arg6, s32 arg7); Gfx *text_render(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *font1, struct font *font2, u32 arg6, u32 colour, s32 width, s32 height, u32 arg10, s32 arg11); void text_measure(s32 *textheight, s32 *textwidth, char *text, struct fontchar *font1, struct font *font2, s32 lineheight); void text_wrap(s32 width, char *in, char *out, struct fontchar *font1, struct font *font2); diff --git a/src/include/game/gamefile.h b/src/include/game/gamefile.h index 196664663..57f87d8dc 100644 --- a/src/include/game/gamefile.h +++ b/src/include/game/gamefile.h @@ -7,7 +7,6 @@ u32 gamefile_has_flag(u32 value); void gamefile_set_flag(u32 value); void gamefile_unset_flag(u32 value); -void gamefile_print_flags(void); void gamefile_apply_options(struct gamefile *file); void gamefile_load_defaults(struct gamefile *file); s32 gamefile_load(s32 device); diff --git a/src/include/game/getitle.h b/src/include/game/getitle.h index 8399689d4..8d635fc70 100644 --- a/src/include/game/getitle.h +++ b/src/include/game/getitle.h @@ -6,7 +6,5 @@ void getitle_reset(void); -void getitle_load(void *addr, u32 arg1); -Gfx *getitle_render(Gfx *gdl); #endif diff --git a/src/include/game/gfxreplace.h b/src/include/game/gfxreplace.h index 05f80f0fe..9e220a3d5 100644 --- a/src/include/game/gfxreplace.h +++ b/src/include/game/gfxreplace.h @@ -4,7 +4,6 @@ #include "data.h" #include "types.h" -void gfx_replace_gbi_commands(Gfx *gdl, Gfx *endgdl, s32 type); void gfx_replace_gbi_commands_recursively(struct roomblock *arg0, s32 type); #endif diff --git a/src/include/game/gunfx.h b/src/include/game/gunfx.h index 123b8ac0f..d64e58744 100644 --- a/src/include/game/gunfx.h +++ b/src/include/game/gunfx.h @@ -9,13 +9,10 @@ void lasersights_reset(void); void beam_create(struct beam *beam, s32 weaponnum, struct coord *from, struct coord *to); void beam_create_for_hand(s32 handnum); -Gfx *beam_render_generic(Gfx *gdl, struct textureconfig *arg1, f32 arg2, struct coord *arg3, u32 colour1, f32 arg5, struct coord *arg6, u32 colour2); Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3); void beam_tick(struct beam *beam); -struct casing *casing_create(struct modeldef *modeldef, Mtxf *mtx); void casing_create_for_hand(s32 handnum, f32 ground, Mtxf *mtx); -void casing_render(struct casing *casing, Gfx **gdlptr); void casings_render(Gfx **gdlptr); s32 boltbeam_find_by_prop(struct prop *prop); @@ -27,7 +24,6 @@ void boltbeam_set_automatic(s32 beamnum, f32 speed); Gfx *boltbeams_render(Gfx *gdl); void boltbeams_tick(void); -bool lasersight_exists(s32 id, s32 *index); Gfx *lasersight_render_dot(Gfx *gdl); Gfx *lasersight_render_beam(Gfx *gdl); void lasersight_set_beam(s32 id, s32 arg1, struct coord *near, struct coord *far); diff --git a/src/include/game/hudmsg.h b/src/include/game/hudmsg.h index 8b7e09a62..6ce1c89ee 100644 --- a/src/include/game/hudmsg.h +++ b/src/include/game/hudmsg.h @@ -4,26 +4,13 @@ #include "data.h" #include "types.h" -u8 hudmsgs_are_active(void); -s32 hudmsg_is_zoom_range_visible(void); -Gfx *hudmsg_render_mission_timer(Gfx *gdl, u32 alpha); -Gfx *hudmsg_render_zoom_range(Gfx *gdl, u32 alpha); -Gfx *hudmsg_render_box(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, f32 bgopacity, u32 bordercolour, f32 textopacity); -s32 hudmsg0f0ddb1c(s32 *arg0, s32 arg1); void hudmsgs_hide_by_channel(s32 value); void hudmsgs_reset(void); void hudmsg_remove_all(void); -s32 hudmsg_get_next(s32 refid); void hudmsg_create(char *text, s32 type); void hudmsg_create_with_flags(char *text, s32 type, u32 flags); void hudmsg_create_with_colour(char *text, s32 type, u8 colour); -void hudmsg_create_with_duration(char *text, s32 type, struct hudmsgtype *config, s32 duration60); void hudmsg_create_as_subtitle(char *text, s32 type, u8 colourindex, s32 audiochannelnum); -void hudmsg_calculate_position(struct hudmessage *msg); -void hudmsg_create_from_args(char *text, s32 type, s32 conf00, s32 conf01, s32 conf02, - struct fontchar **conf04, struct font **conf08, - u32 textcolour, u32 shadowcolour, - u32 alignh, s32 conf16, u32 alignv, s32 conf18, s32 arg14, u32 flags); void hudmsgs_tick(void); void hudmsgs_set_on(u32 reason); void hudmsgs_set_off(u32 reason); diff --git a/src/include/game/inv.h b/src/include/game/inv.h index 9ab2a5acb..82ecae489 100644 --- a/src/include/game/inv.h +++ b/src/include/game/inv.h @@ -12,19 +12,11 @@ void inv_reset(void); void inv_init(s32 numdoubles); void inv_clear(void); -void inv_sort_item(struct invitem *item); -void inv_insert_item(struct invitem *item); -void inv_remove_item(struct invitem *item); -struct invitem *inv_find_unused_slot(void); void inv_set_all_guns(bool enable); struct invitem *inv_find_single_weapon(s32 weaponnum); bool inv_has_single_weapon_exc_all_guns(s32 weaponnum); -struct invitem *inv_find_double_weapon(s32 weapon1, s32 weapon2); bool inv_has_double_weapon_exc_all_guns(s32 weapon1, s32 weapon2); bool inv_has_single_weapon_or_prop(s32 weaponnum); -s32 inv_add_one_if_cant_have_slayer(s32 arg0); -s32 current_stage_forbids_slayer(void); -bool inv_can_have_all_guns_weapon(s32 weaponnum); bool inv_has_single_weapon_inc_all_guns(s32 weaponnum); bool inv_has_double_weapon_inc_all_guns(s32 weapon1, s32 weapon2); bool inv_give_single_weapon(s32 weaponnum); @@ -40,9 +32,7 @@ bool inv_has_briefcase(void); bool inv_has_data_uplink(void); bool inv_has_prop(struct prop *prop); s32 inv_get_count(void); -struct invitem *inv_get_item_by_index(s32 index); struct textoverride *inv_get_text_override_for_obj(struct defaultobj *obj); -struct textoverride *inv_get_text_override_for_weapon(s32 weaponnum); s32 inv_get_weapon_num_by_index(s32 index); u16 inv_get_name_id_by_index(s32 index); char *inv_get_name_by_index(s32 index); diff --git a/src/include/game/lv.h b/src/include/game/lv.h index 9e5fa1e99..bd020b6bf 100644 --- a/src/include/game/lv.h +++ b/src/include/game/lv.h @@ -6,25 +6,11 @@ u32 get_var80084040(void); void lv_init(void); -void lv_reset_misc_sfx(void); -s32 lv_get_misc_sfx_index(u32 arg0); -void lv_set_misc_sfx_state(u32 type, bool play); -void lv_update_misc_sfx(void); void lv_reset(s32 stagenum); -Gfx *lv_render_fade(Gfx *gdl); -void lv_fade_reset(void); -bool lv_update_tracked_prop(struct trackedprop *trackedprop, s32 index); -void lv_find_threats_for_prop(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *param_5); -void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *distances); -void lv_find_threats(void); Gfx *lv_render(Gfx *gdl); -void lv_update_solo_handicaps(void); -s32 sub54321(s32 value); -void lv_update_cutscene_time(void); s32 lv_get_slow_motion_type(void); void lv_tick(void); void lv_tick_player(void); -void lv_check_pause_state_changed(void); void lv_set_paused(bool paused); void lv_configure_fade(u32 color, s16 num_frames); bool lv_is_fade_active(void); diff --git a/src/include/game/mainmenu.h b/src/include/game/mainmenu.h index 33a893aa0..b506dae07 100644 --- a/src/include/game/mainmenu.h +++ b/src/include/game/mainmenu.h @@ -11,79 +11,22 @@ extern struct menudialogdef g_PreAndPostMissionBriefingMenuDialog; extern struct menudialogdef g_RetryMissionMenuDialog; extern struct menudialogdef g_NextMissionMenuDialog; -char *menu_text_current_stage_name(struct menuitem *item); char *solo_menu_text_difficulty(struct menuitem *item); -MenuItemHandlerResult menuhandler_control_style_impl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex); -char *solo_menu_title_stage_overview(struct menudialogdef *dialogdef); -f32 func0f1036ac(u8 value, s32 prop); bool is_stage_difficulty_unlocked(s32 stageindex, s32 difficulty); -char *solo_menu_text_best_time(struct menuitem *item); -s32 get_max_ai_buddies(void); -s32 get_num_unlocked_special_stages(void); -s32 func0f104720(s32 value); -char *func0f105664(struct menuitem *item); -char *func0f1056a0(struct menuitem *item); -char *inv_menu_text_primary_function(struct menuitem *item); -char *inv_menu_text_secondary_function(struct menuitem *item); void func0f105948(s32 weaponnum); -char *inv_menu_text_weapon_name(struct menuitem *item); -char *inv_menu_text_weapon_manufacturer(struct menuitem *item); -char *inv_menu_text_weapon_description(struct menuitem *item); bool solo_choose_pause_dialog(void); -MenuDialogHandlerResult menudialog_briefing(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); MenuDialogHandlerResult menudialog00103608(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult menudialog_coop_anti_options(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); MenuDialogHandlerResult menudialog0010559c(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult inventory_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult menudialog_abort_mission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); MenuDialogHandlerResult solo_menu_dialog_pause_status(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandler001024dc(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler001024fc(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_accept_mission(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_accept_pd_mode_settings(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_buddy_options_continue(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_coop_difficulty(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_anti_difficulty(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mission_list(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_control_style(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_fr_inventory_list(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_inventory_list(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_abort_mission(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_cinema(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_aim_control(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_alternative_title(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_always_show_target(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_ammo_on_screen(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_anti_player(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_anti_radar(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_autoaim(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_change_agent(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_coop_buddy(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_coop_friendly_fire(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_coop_radar(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_cutscene_subtitles(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_head_roll(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_hi_res(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_in_game_subtitles(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_lang_filter(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_look_ahead(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_music_volume(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_paintball(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_pd_mode(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_pd_mode_setting(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_reverse_pitch(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_screen_ratio(s32 operation, struct menuitem *item, union handlerdata *data); #if PAL MenuItemHandlerResult menuhandler_language(s32 operation, struct menuitem *item, union handlerdata *data); #endif -MenuItemHandlerResult menuhandler_screen_size(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_screen_split(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_sfx_volume(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_show_gun_function(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_show_mission_time(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_show_zoom_range(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_sight_on_screen(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_solo_difficulty(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_sound_mode(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/menu.h b/src/include/game/menu.h index 07f463c82..0fbc0d302 100644 --- a/src/include/game/menu.h +++ b/src/include/game/menu.h @@ -13,41 +13,22 @@ void menu_tick(void); void menu_stop(void); void menu_play_sound(s32 menusound); -bool menu_is_solo_mission_or_mp(void); bool current_player_is_menu_open_in_solo_or_mp(void); bool func0f0f0c68(void); void menu_set_banner(s32 bannernum, bool allplayers); #if VERSION >= VERSION_NTSC_1_0 -Gfx *menu_render_banner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 msgnum, s32 arg7, s32 arg8); #else -Gfx *menu_render_banner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 msgnum); #endif struct menudfc *func0f0f1338(struct menuitem *item); void func0f0f139c(struct menuitem *item, f32 arg1); void func0f0f13ec(struct menuitem *item); -void func0f0f1418(void); -void func0f0f1494(void); char *menu_resolve_text(uintptr_t thing, void *dialogoritem); char *menu_resolve_param2_text(struct menuitem *item); -char *menu_resolve_dialog_title(struct menudialogdef *dialogdef); -void menu_get_item_blocks_required(struct menuitem *item, s32 *arg1); -void menu_calculate_item_size(struct menuitem *item, s16 *width, s16 *height, struct menudialog *dialog); -void func0f0f1d6c(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu); -void dialog0f0f1ef4(struct menudialog *dialog); -void dialog_calculate_content_size(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu); s32 dialog_find_item(struct menudialog *dialog, struct menuitem *item, s32 *rowindex, s32 *colindex); bool menu_is_scrollable_unscrollable(struct menuitem *item); bool menu_is_item_disabled(struct menuitem *item, struct menudialog *dialog); -bool menu_is_item_focusable(struct menuitem *item, struct menudialog *dialog, s32 arg2); -struct menuitem *dialog_find_item_at_col_y(s32 targety, s32 colindex, struct menudialogdef *dialogdef, s32 *rowindexptr, struct menudialog *dialog); -struct menuitem *dialog_find_first_item(struct menudialog *dialog); -struct menuitem *dialog_find_first_item_right(struct menudialog *dialog); -void dialog_change_item_focus_vertically(struct menudialog *dialog, s32 updown); -s32 dialog_change_item_focus_horizontally(struct menudialog *dialog, s32 leftright); -s32 dialog_change_item_focus(struct menudialog *dialog, s32 leftright, s32 updown); -void menu_open_dialog(struct menudialogdef *dialogdef, struct menudialog *arg1, struct menu *menu); void menu_push_dialog(struct menudialogdef *dialogdef); #if VERSION >= VERSION_NTSC_1_0 @@ -63,43 +44,24 @@ void func0f0f3704(struct menudialogdef *dialogdef); void menu_configure_model(struct menumodel *menumodel, f32 x, f32 y, f32 z, f32 rotx, f32 roty, f32 rotz, f32 scale, u8 flags); void menu_unset_model(struct menumodel *menumodel); Gfx *menu_render_model(Gfx *gdl, struct menumodel *menumodel, s32 modeltype); -void menu_get_team_titlebar_colours(u32 *top, u32 *middle, u32 *bottom); Gfx *menu_apply_scissor(Gfx *gdl); -Gfx *dialog_render(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight); -void menu_get_cont_pads(s8 *contpadnum1, s8 *contpadnum2); -void func0f0f7594(s32 arg0, s32 *vdir, s32 *hdir); #if VERSION >= VERSION_JPN_FINAL -void menu_find_available_size(s32 *xmin, s32 *ymin, s32 *xmax, s32 *ymax, struct menudialog *dialog); #else -void menu_find_available_size(s32 *xmin, s32 *ymin, s32 *xmax, s32 *ymax); #endif -void dialog_calculate_position(struct menudialog *dialog); -void menu_close(void); void func0f0f8120(void); void func0f0f820c(struct menudialogdef *dialogdef, s32 root); -void menu_set_background(s32 bg); void func0f0f8300(void); void menu_push_root_dialog(struct menudialogdef *dialogdef, s32 arg1); void func0f0f85e0(struct menudialogdef *dialogdef, s32 root); -Gfx *menu_render_dialog(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight); -Gfx *menu_render_dialogs(Gfx *gdl); void menu_reset_model(struct menumodel *menumodel, u32 allocationlen, bool allocate); void menu_reset(void); -void menu_swipe(s32 direction); -void dialog_tick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags); -void dialog_init_items(struct menudialog *dialog); void func0f0fa6ac(void); void menu_process_input(void); -Gfx *menu_render_background_layer1(Gfx *gdl, u8 bg, f32 frac); -Gfx *menu_render_background_layer2(Gfx *gdl, u8 bg, f32 frac); Gfx *menu_render(Gfx *gdl); u32 menu_choose_music(void); u32 menu_get_root(void); -void menu_push_pak_dialog_for_player(struct menudialogdef *dialogdef, s32 playernum, s32 arg2); -char *menu_text_save_device_name(struct menuitem *item); -s32 menu_pak_num_to_player_num(s32 paknum); bool menu_is_ready_for_pak_error(s32 device, s32 arg1); void menu_push_pak_error_dialog(s32 arg0, s32 arg1); void func0f0fd494(struct coord *pos); @@ -107,11 +69,6 @@ void func0f0fd548(s32 arg0); struct menudialog *menu_is_dialog_open(struct menudialogdef *dialogdef); struct chrdata *current_player_get_commanding_aibot(void); -MenuItemHandlerResult menuhandler000fcc34(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult am_pick_target_menu_list(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_repair_pak(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_retry_save_pak(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_warn_repair_pak(s32 operation, struct menuitem *item, union handlerdata *data); extern const char var7f1b2658[]; extern const char var7f1b265c[]; diff --git a/src/include/game/menugfx.h b/src/include/game/menugfx.h index 32500c106..c74399a7d 100644 --- a/src/include/game/menugfx.h +++ b/src/include/game/menugfx.h @@ -7,7 +7,6 @@ void menugfx_create_blur(void); Gfx *menugfx_render_bg_blur(Gfx *gdl, u32 colour, s16 arg2, s16 arg3); Gfx *menugfx_render_dialog_background(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct menudialog *dialog, u32 colour1, u32 colour2, f32 arg8); -Gfx *menugfx_render_bg_green_haze(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2); Gfx *menugfx_draw_dropdown_background(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2); #if VERSION >= VERSION_NTSC_1_0 @@ -31,7 +30,6 @@ Gfx *menugfx_draw_dialog_chevron(Gfx *gdl, s32 x, s32 y, s32 arg2, s32 arg3, u32 Gfx *menugfx_draw_checkbox(Gfx *gdl, s32 x, s32 y, s32 size, bool fill, u32 bordercolour, u32 fillcolour); Gfx *menugfx_render_bg_failure(Gfx *gdl); Gfx *menugfx_render_bg_cone(Gfx *gdl); -Gfx *menugfx_render_bg_failure_copy(Gfx *gdl); void menugfx_free_particles(void); u32 menugfx_get_particle_array_size(void); Gfx *menugfx_render_bg_success(Gfx *gdl); diff --git a/src/include/game/menuitem.h b/src/include/game/menuitem.h index 7f7b1935f..c693db5ce 100644 --- a/src/include/game/menuitem.h +++ b/src/include/game/menuitem.h @@ -4,75 +4,23 @@ #include "data.h" #include "types.h" -s32 menuitem0f0e5d2c(s32 arg0, struct menuitem *item); -s16 menuitem_list_get_offset_y(s16 optionindex, struct menuitem *item); -Gfx *menuitem_list_render_header(Gfx *gdl, s16 x1, s16 y1, s16 width, s16 arg4, s16 height, char *text, struct menudialog *dialog); -Gfx *menuitem_list_overlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2); -Gfx *menuitem_list_render(Gfx *gdl, struct menurendercontext *context); -bool menuitem_list_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -void menuitem_dropdown_init(struct menuitem *item, union menuitemdata *data); -Gfx *menuitem_dropdown_render(Gfx *gdl, struct menurendercontext *context); -bool menuitem_dropdown_tick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -Gfx *menuitem_dropdown_overlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, union menuitemdata *data); -bool menuitem_keyboard_is_string_empty_or_spaces(char *text); -Gfx *menuitem_keyboard_render(Gfx *gdl, struct menurendercontext *thing); -bool menuitem_keyboard_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -void menuitem_keyboard_init(struct menuitem *item, union menuitemdata *data); -Gfx *menuitem_separator_render(Gfx *gdl, struct menurendercontext *context); -Gfx *menuitem_objectives_render_one(Gfx *gdl, struct menudialog *dialog, s32 index, s32 position, s16 objx, s16 objy, s16 width, s16 height, bool withstatus, bool narrow); -Gfx *menuitem_objectives_render(Gfx *gdl, struct menurendercontext *context); -Gfx *menuitem_model_render(Gfx *gdl, struct menurendercontext *context); -Gfx *menuitem_label_render(Gfx *gdl, struct menurendercontext *context); -Gfx *menuitem_meter_render(Gfx *gdl, struct menurendercontext *context); -Gfx *menuitem_selectable_render(Gfx *gdl, struct menurendercontext *context); -bool menuitem_selectable_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags); -Gfx *menuitem_slider_render(Gfx *gdl, struct menurendercontext *context); -bool menuitem_slider_tick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -void menuitem_slider_init(union menuitemdata *data); -Gfx *menuitem_carousel_render(Gfx *gdl, struct menurendercontext *context); -bool menuitem_carousel_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags); -Gfx *menuitem_checkbox_render(Gfx *gdl, struct menurendercontext *context); -bool menuitem_checkbox_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags); -char *menuitem_scrollable_get_text(u32 type); -Gfx *menuitem_scrollable_render(Gfx *gdl, struct menurendercontext *context); -bool menuitem_scrollable_tick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -void menuitem_scrollable_init(union menuitemdata *data); -Gfx *menuitem_marquee_render(Gfx *gdl, struct menurendercontext *context); -bool menuitem_marquee_tick(struct menuitem *item, union menuitemdata *data); -void menuitem_marquee_init(union menuitemdata *data); -Gfx *menuitem07_render(Gfx *gdl); -Gfx *menuitem_ranking_render(Gfx *gdl, struct menurendercontext *context); -bool menuitem_ranking_tick(struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -void menuitem_ranking_init(union menuitemdata *data); -Gfx *menuitem_player_stats_render(Gfx *gdl, struct menurendercontext *context); -bool menuitem_player_stats_tick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -Gfx *menuitem_player_stats_overlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, union menuitemdata *data); -void menuitem_player_stats_init(struct menuitem *item, union menuitemdata *data); -Gfx *menuitem_controller_render_line(Gfx *gdl, s32 speed, s32 x1, s32 y1, s32 x2, s32 y2); -Gfx *menuitem_controller_render_texture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32 alpha); -Gfx *menuitem_controller_render_lines(Gfx *gdl, struct menurendercontext *context, s32 firstindex, s32 lastindex, s32 padx, s32 pady, u32 alpha); -u16 menuitem_controller_get_button_action(s32 mode, s32 buttonnum); -Gfx *menuitem_controller_render_text(Gfx *gdl, s32 curmode, struct menurendercontext *context, s32 padx, s32 pady, u32 valuecolour, u32 labelcolour, s8 prevmode); -Gfx *menuitem_controller_render_pad(Gfx *gdl, struct menurendercontext *context, s32 padx, s32 pady, s32 curmode, u32 alpha, u32 colour1, u32 colour2, s8 prevmode); -Gfx *menuitem_controller_render(Gfx *gdl, struct menurendercontext *context); -void menuitem_controller_init(union menuitemdata *data); Gfx *menuitem_render(Gfx *gdl, struct menurendercontext *context); bool menuitem_tick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); diff --git a/src/include/game/modelmgr.h b/src/include/game/modelmgr.h index 722e68168..23c99d253 100644 --- a/src/include/game/modelmgr.h +++ b/src/include/game/modelmgr.h @@ -6,7 +6,6 @@ bool modelmgr_can_slot_fit_rwdata(struct model *modelslot, struct modeldef *modeldef); void modelmgr_print_counts(void); -struct model *modelmgr_instantiate_model(struct modeldef *modeldef, bool arg1); struct model *modelmgr_instantiate_model_without_anim(struct modeldef *modeldef); void modelmgr_free_model(struct model *model); struct model *modelmgr_instantiate_model_with_anim(struct modeldef *modeldef); diff --git a/src/include/game/mplayer/ingame.h b/src/include/game/mplayer/ingame.h index ad91e12d3..49ba5518b 100644 --- a/src/include/game/mplayer/ingame.h +++ b/src/include/game/mplayer/ingame.h @@ -4,26 +4,11 @@ #include "data.h" #include "types.h" -MenuItemHandlerResult mp_stats_for_player_dropdown_handler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mp_menu_text_in_game_limit(struct menuitem *item); char *menutext_pause_or_unpause(s32 arg0); -char *menutext_match_time(s32 arg0); -char *mp_menu_text_weapon_description(struct menuitem *item); -char *mp_menu_title_stats_for(struct menudialogdef *dialogdef); char *mp_menu_text_weapon_of_choice_name(struct menuitem *item); -char *mp_menu_text_award1(struct menuitem *item); -char *mp_menu_text_award2(struct menuitem *item); -char *mp_menu_text_placement_with_suffix(struct menuitem *item); -MenuItemHandlerResult mp_placement_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult mp_awards_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult mp_player_title_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); char *mp_menu_text_player_title(s32 arg0); -MenuItemHandlerResult mp_confirm_player_name_handler(s32 operation, struct menuitem *item, union handlerdata *data); void mp_push_pause_dialog(void); void mp_push_endscreen_dialog(u32 arg0, u32 playernum); -MenuItemHandlerResult menuhandler_mp_end_game(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler00178018(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_in_game_limit_label(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_mp_pause(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/mplayer/mplayer.h b/src/include/game/mplayer/mplayer.h index 8764994ac..e3d857aae 100644 --- a/src/include/game/mplayer/mplayer.h +++ b/src/include/game/mplayer/mplayer.h @@ -5,14 +5,12 @@ #include "types.h" f32 mp_handicap_to_damage_scale(u8 value); -void func0f187838(struct mpchrconfig *mpchr); void mp_start_match(void); void mp_reset(void); void mp_calculate_team_is_only_ai(void); void func0f187fbc(s32 playernum); void func0f187fec(void); void mp_player_set_defaults(s32 playernum, bool autonames); -void func0f1881d4(s32 index); void mp_init(void); void mp_get_teams_with_default_name(u8 *mask); void mp_set_team_names_to_default(u8 mask); @@ -20,7 +18,6 @@ void mp_set_default_names_if_empty(void); s32 mp_calculate_team_score_limit(void); void mp_apply_limits(void); s32 mp_get_player_rankings(struct ranking *rankings); -s32 mp_calculate_team_score(s32 arg0, s32 *arg1); s32 mp_get_team_rankings(struct ranking *rankings); s32 func0f188bcc(void); s32 mp_get_num_weapon_options(void); @@ -28,25 +25,15 @@ char *mp_get_weapon_label(s32 weaponnum); void mp_set_weapon_slot(s32 slot, s32 mpweaponnum); s32 mp_get_weapon_slot(s32 slot); struct mpweapon *mp_get_mp_weapon_by_location(s32 locationindex); -s32 mp_count_weapon_set_thing(s32 weaponsetindex); -s32 func0f188f9c(s32 arg0); s32 func0f189058(bool full); s32 func0f189088(void); char *mp_get_weapon_set_name(s32 arg0); -void func0f18913c(void); -void mp_apply_weapon_set(void); void mp_set_weapon_set(s32 weaponsetnum); void func0f1895e8(void); s32 mp_get_weapon_set(void); bool mp_is_paused(void); void mp_set_paused(u8 mode); Gfx *mp_render_modal_text(Gfx *gdl); -s32 mp_find_max_int(s32 playercount, s32 val0, s32 val1, s32 val2, s32 val3); -s32 mp_find_min_int(s32 playercount, s32 val0, s32 val1, s32 val2, s32 val3); -s32 mp_find_max_float(s32 playercount, f32 val0, f32 val1, f32 val2, f32 val3); -s32 mp_find_min_float(s32 playercount, f32 val0, f32 val1, f32 val2, f32 val3); -void mp_calculate_player_title(struct mpplayerconfig *mpplayer); -void mp_calculate_awards(void); void mp_end_match(void); s32 mp_get_num_heads2(void); s32 mp_get_num_heads(void); @@ -59,22 +46,17 @@ s32 mp_get_mpbodynum_by_bodynum(u16 bodynum); char *mp_get_body_name(u8 mpbodynum); u8 mp_get_body_required_feature(u8 bodynum); s32 mp_get_mpheadnum_by_mpbodynum(s32 bodynum); -s32 mp_choose_random_lock_player(void); bool mp_set_lock(s32 locktype, s32 playernum); s32 mp_get_lock_type(void); u32 mp_get_lock_player_num(void); bool mp_is_player_locked_out(s32 playernum); void mp_calculate_lock_if_last_winner_or_loser(void); -bool mp_is_track_unlocked(s32 tracknum); -s32 mp_get_track_slot_index(s32 tracknum); -s32 mp_get_track_num_at_slot_index(s32 slotindex); s32 mp_get_num_unlocked_tracks(void); s32 mp_get_track_music_num(s32 slotindex); char *mp_get_track_name(s32 slotindex); void mp_set_using_multiple_tunes(bool enable); bool mp_get_using_multiple_tunes(void); bool mp_is_multi_track_slot_enabled(s32 slot); -void mp_set_multi_track_slot_enabled(s32 slot, bool enable); void mp_set_track_slot_enabled(s32 slot); void mp_enable_all_multi_tracks(void); void mp_disable_all_multi_tracks(void); @@ -83,9 +65,7 @@ void mp_set_track_to_random(void); s32 mp_get_current_track_slot_num(void); s32 mp_choose_track(void); struct mpchrconfig *mp_get_chr_config_by_slot_num(s32 slot); -s32 mp_get_chr_index_by_slot_num(s32 slot); s32 mp_get_num_chrs(void); -u8 mp_find_unused_team_num(void); void mp_create_bot_from_profile(s32 botnum, u8 difficulty); void mp_set_bot_difficulty(s32 botnum, s32 difficulty); s32 mp_get_slot_for_new_bot(void); @@ -99,21 +79,14 @@ s32 mp_player_get_index(struct chrdata *chr); struct chrdata *mp_get_chr_from_player_index(s32 index); s32 func0f18d074(s32 index); s32 func0f18d0e8(s32 arg0); -void mpplayerfile_load_gun_funcs(struct savebuffer *buffer, s32 playernum); -void mpplayerfile_save_gun_funcs(struct savebuffer *buffer, s32 playernum); -void mpplayerfile_load_wad(s32 playernum, struct savebuffer *buffer, s32 arg2); -void mpplayerfile_save_wad(s32 playernum, struct savebuffer *buffer); void mpplayerfile_get_overview(char *arg0, char *name, u32 *playtime); s32 mpplayerfile_save(s32 playernum, s32 device, s32 fileid, u16 deviceserial); s32 mpplayerfile_load(s32 playernum, s32 device, s32 arg2, u16 deviceserial); s32 mp_get_num_presets(void); -bool mp_is_preset_unlocked(s32 presetnum); s32 mp_get_num_unlocked_presets(void); char *mp_get_preset_name_by_slot(s32 slot); void mp_apply_config(struct mpconfigfull *mpconfig); void mp0f18dec4(s32 arg0); -void mpsetupfile_load_wad(struct savebuffer *buffer); -void mpsetupfile_save_wad(struct savebuffer *buffer); void mpsetupfile_get_overview(char *arg0, char *filename, u16 *numsims, u16 *stagenum, u16 *scenarionum); s32 mpsetupfile_save(s32 device, s32 filenum, u16 deviceserial); s32 mpsetupfile_load(s32 device, s32 filenum, u16 deviceserial); diff --git a/src/include/game/mplayer/setup.h b/src/include/game/mplayer/setup.h index d41e5445c..de20b00f0 100644 --- a/src/include/game/mplayer/setup.h +++ b/src/include/game/mplayer/setup.h @@ -6,55 +6,8 @@ char *mp_get_current_player_name(struct menuitem *item); s16 mp_choose_random_stage(void); -MenuItemHandlerResult mp_arena_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mp_menu_text_weapon_name_for_slot(struct menuitem *item); -char *mp_menu_text_setup_name(struct menuitem *item); -MenuItemHandlerResult mp_character_body_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpbodynum, s32 mpheadnum, bool isplayer); -MenuDialogHandlerResult menudialog0017a174(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult mp_challenges_list_handler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mp_menu_text_kills(struct menuitem *item); -char *mp_menu_text_deaths(struct menuitem *item); -char *mp_menu_text_games_played(struct menuitem *item); -char *mp_menu_text_games_won(struct menuitem *item); -char *mp_menu_text_games_lost(struct menuitem *item); -char *mp_menu_text_head_shots(struct menuitem *item); -char *mp_menu_text_medal_accuracy(struct menuitem *item); -char *mp_menu_text_medal_head_shot(struct menuitem *item); -char *mp_menu_text_medal_kill_master(struct menuitem *item); -char *mp_menu_text_medal_survivor(struct menuitem *item); -char *mp_menu_text_ammo_used(struct menuitem *item); -char *mp_menu_text_distance(struct menuitem *item); -char *mp_menu_text_time(struct menuitem *item); -char *mp_menu_text_accuracy(struct menuitem *item); -void mp_format_damage_value(char *dst, f32 damage); -char *mp_menu_text_pain_received(struct menuitem *item); -char *mp_menu_text_damage_dealt(struct menuitem *item); -MenuItemHandlerResult mp_medal_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mp_menu_title_stats_for_player_name(struct menudialogdef *dialogdef); -char *mp_menu_text_username_password(struct menuitem *item); -MenuItemHandlerResult mp_character_head_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4); -char *mp_menu_text_body_name(struct menuitem *item); -void func0f17b8f0(void); -MenuItemHandlerResult mp_player_name_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult mp_load_settings_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mp_menu_text_mpconfig_marquee(struct menuitem *item); -MenuItemHandlerResult mp_load_player_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_handicap_player(s32 operation, struct menuitem *item, union handlerdata *data); -char *mp_menu_text_handicap_player_name(struct menuitem *item); -MenuItemHandlerResult mp_add_change_simulant_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mp_menu_text_simulant_description(struct menuitem *item); -MenuDialogHandlerResult menudialog0017ccfc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); MenuItemHandlerResult mp_bot_difficulty_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); char *mp_menu_title_edit_simulant(struct menudialogdef *dialogdef); -char *mp_menu_text_simulant_name(struct menuitem *item); -MenuItemHandlerResult menuhandler_mp_n_teams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams); -char *mp_menu_text_chr_name_for_team_setup(struct menuitem *item); -MenuItemHandlerResult func0f17dac4(s32 operation, struct menuitem *item, union handlerdata *data); -char *mp_menu_text_select_tune_or_tunes(struct menuitem *item); -MenuItemHandlerResult mp_select_tune_list_handler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mp_menu_text_current_track(struct menuitem *item); -MenuItemHandlerResult mp_team_name_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mp_menu_text_team_name(struct menuitem *item); char *func0f17e318(struct menudialogdef *dialogdef); MenuDialogHandlerResult menudialog0017e3fc(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); MenuItemHandlerResult mp_challenges_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); @@ -62,21 +15,13 @@ char *mp_menu_text_challenge_name(struct menuitem *item); MenuDialogHandlerResult mp_combat_challenges_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); char *mp_menu_text_save_player_or_copy(struct menuitem *item); char *mp_menu_text_arena_name(struct menuitem *item); -char *mp_menu_text_weapon_set_name(struct menuitem *item); -void mp_configure_quick_team_players(void); void mp_configure_quick_team_simulants(void); void func0f17f428(void); -MenuItemHandlerResult menuhandler_player_team(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_number_of_simulants(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_simulants_per_team(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult mp_quick_team_simulant_difficulty_handler(s32 operation, struct menuitem *item, union handlerdata *data); -void mp_close_dialogs_for_new_setup(void); void func0f17fcb0(s32 silent); MenuItemHandlerResult menuhandler_mp_slow_motion(s32 operation, struct menuitem *item, union handlerdata *data); void htb_add_pad(s16 padnum); void htb_remove_ammo_crate_at_pad(s16 padnum); void htb_reset(void); -void htb_create_token(void); Gfx *htb_render_hud(Gfx *gdl); void ctc_init_props(void); bool ctc_highlight_prop(struct prop *prop, s32 *colour); @@ -88,14 +33,11 @@ void koh_add_hill(s32 *cmd); void koh_highlight_room(RoomNum roomnum, s32 *arg1, s32 *arg2, s32 *arg3); void htm_add_pad(s16 padnum); void htm_reset(void); -void htb_create_uplink(void); void htm_init_props(void); void htm_tick_chr(struct chrdata *chr); Gfx *htm_render_hud(Gfx *gdl); Gfx *htm_radar_extra(Gfx *gdl); -void pac_reset(void); bool pac_highlight_prop(struct prop *prop, s32 *colour); -void pac_apply_next_victim(void); void pac_handle_death(s32 cplayernum, s32 vplayernum); void pac_tick(void); Gfx *pac_render_hud(Gfx *gdl); @@ -103,8 +45,6 @@ bool pac_radar_chr(Gfx **gdl, struct prop *prop); MenuDialogHandlerResult mp_options_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); char *mp_menu_text_scenario_short_name(struct menuitem *item); char *mp_menu_text_scenario_name(struct menuitem *item); -MenuItemHandlerResult scenario_scenario_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -void scenario_create_match_start_hudmsgs(void); Gfx *scenario_render_hud(Gfx *gdl); void scenario_calculate_player_score(struct mpchrconfig *mpchr, s32 chrnum, s32 *arg2, s32 *arg3); bool scenario_highlight_prop(struct prop *prop, s32 *colour); @@ -116,65 +56,16 @@ s32 scenario_pick_up_briefcase(struct chrdata *chr, struct prop *prop); void scenario_handle_dropped_token(struct chrdata *chr, struct prop *prop); s32 scenario_pick_up_uplink(struct chrdata *chr, struct prop *prop); void scenario_handle_activated_prop(struct chrdata *chr, struct prop *prop); -MenuItemHandlerResult menuhandler_mp_drop_out(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_teams_label(s32 operation, struct menuitem *item, union handlerdata *data); s32 mp_get_num_stages(void); -MenuItemHandlerResult menuhandler_mp_control_style(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_weapon_slot(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_weapon_set_dropdown(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_control_checkbox(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_aim_control(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_mp_checkbox_option(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_teams_enabled(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_display_option_checkbox(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_confirm_save_chr(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_setup_name(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_save_setup_overwrite(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_save_setup_copy(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_character_body(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_username_password(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_character_head(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_time_limit_slider(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_score_limit_slider(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_team_score_limit_slider(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_restore_score_defaults(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_restore_handicap_defaults(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult menudialog_mp_ready(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); MenuDialogHandlerResult menudialog_mp_simulant(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_simulant_head(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_simulant_body(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_mp_delete_simulant(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_mp_change_simulant_type(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_clear_all_simulants(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_add_simulant(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_simulant_slot(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult menudialog_mp_simulants(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_two_teams(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_three_teams(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_four_teams(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_maximum_teams(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_humans_vs_simulants(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_human_simulant_pairs(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_team_slot(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult menudialog_mp_select_tune(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_multiple_tunes(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_team_name_slot(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler0017e38c(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler0017e9d8(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_abort_challenge(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_start_challenge(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler0017ec64(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_mp_lock(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_mp_save_player(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_mp_save_settings(s32 operation, struct menuitem *item, union handlerdata *data); MenuDialogHandlerResult menudialog_mp_game_setup(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); MenuDialogHandlerResult menudialog_mp_quick_go(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_finished_setup(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_quick_team_separator(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_quick_team_option(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult menudialog_combat_simulator(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandler_mp_advanced_setup(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_mp_display_team(s32 operation, struct menuitem *item, union handlerdata *data); MenuItemHandlerResult menuhandler_mp_one_hit_kills(s32 operation, struct menuitem *item, union handlerdata *data); diff --git a/src/include/game/mpstats.h b/src/include/game/mpstats.h index 713c557df..0d192fb82 100644 --- a/src/include/game/mpstats.h +++ b/src/include/game/mpstats.h @@ -12,11 +12,8 @@ void mpstats_increment_total_kill_count(void); void mpstats_increment_total_knockout_count(void); void mpstats_decrement_total_knockout_count(void); u8 mpstats_get_total_knockout_count(void); -u32 mpstats_get_total_kill_count(void); void mpstats_record_player_kill(void); s32 mpstats_get_player_kill_count(void); -void mpstats_record_player_death(void); -void mpstats_record_player_suicide(void); void mpstats_record_death(s32 aplayernum, s32 vplayernum); #endif diff --git a/src/include/game/music.h b/src/include/game/music.h index 0bb42a178..a6605a2f9 100644 --- a/src/include/game/music.h +++ b/src/include/game/music.h @@ -7,18 +7,12 @@ u16 music_get_volume(void); void music_set_volume(u16 volume); bool music_is_track_state(s32 tracktype, s32 state); -s32 music_get_track_state(s32 tracktype); void music_queue_start_event(u32 tracktype, u32 tracknum, f32 arg2, u16 volume); void music_queue_stop_event(s32 tracktype); void music_queue_fade_event(s32 tracktype, f32 arg1, bool keepafterfade); void music_reset(void); void music_queue_stop_all_event(void); -void music_save_interval(void); -void music_restore_interval(void); void music_start_primary(f32 arg0); -void music_start_ambient(f32 arg0); -bool music_is_any_player_in_ambient_room(void); -void music_start_nrg(f32 arg0); void music_start_track_as_menu(s32 tracknum); void music_set_stage_and_start_music(s32 stagenum); void music_set_stage(s32 stagenum); @@ -28,7 +22,6 @@ void music_deactivate_nrg(void); void music_start_menu(void); void music_end_menu(void); void music_start_solo_death(void); -void _music_start_mp_death(f32 arg0); void music_start_mp_death(void); void music_end_death(void); void music_play_track_isolated(s32 tracknum); diff --git a/src/include/game/nbomb.h b/src/include/game/nbomb.h index 577ce295f..d2932518b 100644 --- a/src/include/game/nbomb.h +++ b/src/include/game/nbomb.h @@ -4,18 +4,10 @@ #include "data.h" #include "types.h" -Gfx *func0f008558(Gfx *gdl, s32 depth); -void nbomb_reset(struct nbomb *nbomb); -s32 nbomb_calculate_alpha(struct nbomb *nbomb); -Gfx *nbomb_create_gdl(void); -Gfx *nbomb_render(Gfx *gdl, struct nbomb *nbomb, Gfx *subgdl); void func0f0099a4(void); -void nbomb_inflict_damage(struct nbomb *nbomb); -void nbomb_tick(struct nbomb *nbomb); void nbombs_tick(void); Gfx *nbombs_render(Gfx *gdl); void nbomb_create_storm(struct coord *pos, struct prop *ownerprop); -f32 gas_get_door_frac(s32 tagnum); Gfx *nbomb_render_overlay(Gfx *gdl); Gfx *gas_render(Gfx *gdl); diff --git a/src/include/game/objectives.h b/src/include/game/objectives.h index bc83348ec..33f44b73f 100644 --- a/src/include/game/objectives.h +++ b/src/include/game/objectives.h @@ -14,9 +14,6 @@ void objective_add_room_entered_criteria(struct criteria_roomentered *criteria); void objective_add_throw_in_room_criteria(struct criteria_throwinroom *criteria); void objective_add_holograph_criteria(struct criteria_holograph *criteria); -u32 xor_baffbeff(u32 value); -u32 xor_babeffff(u32 value); -u32 xor_boobless(u32 value); void tags_reset(void); s32 obj_get_tag_num(struct defaultobj *obj); s32 objective_get_count(void); @@ -24,7 +21,6 @@ u32 objective_get_difficulty_bits(s32 index); s32 objective_check(s32 index); bool objective_is_all_complete(void); void objectives_disable_checking(void); -void objectives_show_hudmsg(char *buffer, s32 hudmsgtype); void objectives_check_all(void); void objective_check_room_entered(s32 currentroom); void objective_check_throw_in_room(s32 arg0, RoomNum *requiredrooms); diff --git a/src/include/game/padhalllv.h b/src/include/game/padhalllv.h index e631782db..8ba57c3a8 100644 --- a/src/include/game/padhalllv.h +++ b/src/include/game/padhalllv.h @@ -6,25 +6,8 @@ void nav_set_seed(u32 upper, u32 lower); struct waypoint *waypoint_find_closest_to_pos(struct coord *pos, RoomNum *rooms); -struct waygroup *waygroup_choose_neighbour(s32 *groupnums, s32 step, u32 ignoremask); -void waygroup_set_step_if_undiscovered(s32 *groupnums, s32 step, u32 ignoremask); -bool waygroup_discover_one_step(struct waygroup *group, s32 step, u32 ignoremask); -bool waygroup_discover_steps(struct waygroup *from, struct waygroup *to, struct waygroup *groups, bool discoverall, u32 ignoremask); -bool waygroup_find_route(struct waygroup *from, struct waygroup *to, struct waygroup *groups); -struct waypoint *waypoint_choose_neighbour(s32 *pointnums, s32 step, s32 groupnum, u32 ignoremask); -void waypoint_set_step_if_undiscovered(s32 *pointnums, s32 value, s32 groupnum, u32 ignoremask); -bool waypoint_discover_one_step(s32 *pointnums, s32 step, s32 groupnum, u32 ignoremask); -void waypoint_discover_steps(struct waypoint *from, struct waypoint *to, bool discoverall, u32 ignoremask); -void waypoint_find_route(struct waypoint *from, struct waypoint *to); -s32 waypoint_collect_local(struct waypoint *from, struct waypoint *to, struct waypoint **arr, s32 arrlen); -void waypoint_find_segment_into_group(struct waygroup *fromgroup, struct waygroup *togroup, struct waypoint **frompoint, struct waypoint **topoint); s32 nav_find_route(struct waypoint *from, struct waypoint *to, struct waypoint **arr, s32 arrlen); -void waypoint_reset_all_steps(void); -struct waypoint *waypoint_find_random_at_step(s32 *pointnums, s32 step); -struct waygroup *waygroup_find_random_at_step(s32 *groupnums, s32 step); struct waypoint *nav_choose_retreat_point(struct waypoint *chrpoint, struct waypoint *targetpoint); -void nav_disable_segment_in_direction(struct waypoint *a, struct waypoint *b); -void nav_enable_segment_in_direction(struct waypoint *a, struct waypoint *b); void nav_disable_segment(struct waypoint *a, struct waypoint *b); void nav_enable_segment(struct waypoint *a, struct waypoint *b); diff --git a/src/include/game/pak.h b/src/include/game/pak.h index 37066df36..c7d6229a7 100644 --- a/src/include/game/pak.h +++ b/src/include/game/pak.h @@ -4,11 +4,6 @@ #include "data.h" #include "types.h" -u32 pak_get_block_size(s8 device); -u32 pak_align(s8 device, u32 size); -s32 pak_get_aligned_file_len_by_body_len(s8 device, u32 bodylen); -u32 pak_get_body_len_by_file_len(u32 filelen); -u32 pak_generate_serial(s8 device); bool mempak_is_okay(s8 device); s32 pak_get_file_ids_by_type(s8 device, u32 filetype, u32 *fileids); s32 pak0f1167d8(s8 device); @@ -22,104 +17,32 @@ s32 pak_get_serial(s8 device); void pak0f11698c(s8 device); void pak0f116994(void); void pak0f1169c8(s8 device, bool tick); -bool mempak_is_ready(s8 device); -bool mempak_is_ready_or_full(s8 device); -void pak0f116bdc(s8 device, u8 *arg1, u8 *arg2); -u16 _pak_get_serial(s8 device); -u32 _pak_get_type(s8 device); void pak_set_state(s8 device, s32 value); -s32 pak0f116df0(s8 device, struct pakdata **arg1); -s32 _pak_delete_game_note(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name); -s32 _pak_delete_file(s8 device, s32 fileid); s32 pak_get_plug_count(s8 device); -u32 pak_get_max_file_size(s8 device); -s32 pak_get_body_len_by_type(s8 device, u32 filetype); void pak0f117150(s8 device, u8 *ptr); void pak0f1171b4(s8 device, s32 arg1, s32 arg2); s32 pak_get_unk008(s8 device); -bool pak_retrieve_block_from_cache(s8 device, u32 offset, u8 *dst); -PakErr2 pak_read_header_at_offset(s8 device, u32 offset, struct pakfileheader *header); -void pak_dump_buffer(u8 *buffer, u32 len, char *name); -void pak_dump_eeprom(void); -s32 _pak_save_at_guid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfileid, u8 *olddata); #if VERSION >= VERSION_NTSC_1_0 -PakErr1 pak_init_pak(OSMesgQueue *mq, OSPfs *pfs, s32 channel, s32 *arg3); #else -PakErr1 pak_init_pak(OSMesgQueue *mq, OSPfs *pfs, s32 channel); #endif -PakErr1 _pak_read_write_block(OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer); -PakErr1 pak_query_num_notes(OSPfs *pfs, s32 *max_files, s32 *files_used); -PakErr1 pak_query_num_free_bytes(OSPfs *pfs, s32 *bytes_not_used); -PakErr1 pak_query_note_state(OSPfs *pfs, s32 file_no, OSPfsState *note); -PakErr1 pak_allocate_note(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 size, s32 *file_no); -PakErr1 pak_delete_game_note3(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name); -PakErr1 pak_find_note(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 *file_no); -PakErr1 _pak_resize_note(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name, u32 numbytes); -s32 pak_get_pd_num_pages(s8 device); -u32 pak_get_pd_num_bytes(s8 device); -s32 pak_query_num_free_pages(s8 device); -bool pak_can_fit_camera_file_in_pak(s8 device); s32 pak_get_num_free_camera_spaces_in_pak(s8 device); -s32 _pak_create_camera_file(s8 device, s32 *outfileid); -bool pak_resize_note(s8 device, s32 numpages); -void pak0f1185e0(s8 device, s32 arg1, s32 arg2); -u32 pak0f118674(s8 device, u32 filetype, s32 *outfileid); void pak0f1189d0(void); void paks_init(void); -void pak_calculate_checksum(u8 *arg0, u8 *arg1, u16 *arg2); -s32 _pak_read_body_at_guid(s8 device, s32 fileid, u8 *body, s32 arg3); -s32 _pak_get_file_ids_by_type(s8 device, u32 filetype, u32 *fileids); -s32 pak_check_file_can_fit_in_note(s8 device, s32 filetype, s32 *numspaces); -u32 pak0f119298(s8 device); -void pak0f119340(u32 arg0); s32 pak_find_file(s8 device, u32 fileid, struct pakfileheader *header); #if VERSION >= VERSION_NTSC_FINAL -bool pak_write_blank_file(s8 device, u32 offset, struct pakfileheader *header); #endif -bool pak_repair_as_blank(s8 device, u32 *offset, struct pakfileheader *header); -s32 pak_repair_filesystem(s8 device); -void pak_corrupt(void); #if VERSION >= VERSION_NTSC_1_0 -bool pak_create_initial_files(s8 device); #else -void pak_create_initial_files(s8 device); #endif -s32 pak_find_max_file_id(s8 device); -void pak_merge_blanks(s8 device); void paks_reset(void); -void pak_set_features(s8 device, u8 features, u32 line, char *file); -void pak_set_defaults(s8 arg0); -PakErr1 pak_read_write_block(s8 device, OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer); -bool pak_query_total_usage(s8 device); -void pak_query_pd_size(s8 device); -bool mempak_prepare(s8 device); -bool pak_probe(s8 device); -void pak_wipe(s8 device, u32 blocknumstart, u32 blocknumend); -void pak_save_header_to_cache(s8 device, s32 blocknum, struct pakfileheader *header); -bool pak_retrieve_header_from_cache(s8 device, s32 blocknum, struct pakfileheader *header); -s32 pak_create_filesystem(s8 device); -bool pak_get_filesystem_length(s8 device, u32 *outlen); -s32 pak0f11b86c(s8 device, u32 offset, u8 *data, struct pakfileheader *header, s32 arg4); -bool pak_replace_file_at_offset_with_blank(s8 device, u32 offset); -s32 pak_write_file_at_offset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 bodylen, s32 *outfileid, u8 *olddata, u32 fileid, u32 generation); bool pak_repair(s8 device); -bool pak_handle_result(s32 err1, s8 device, bool arg2, u32 line); void paks_tick(void); void pak0f11c6d0(void); void pak_execute_debug_operations(void); -void pak_check_plugged(void); -void gbpak_handle_error(u32 arg0); -bool gbpak_read(s8 device, u16 address, u8 *buffer, u16 size); -bool gbpak_write(s8 device, u16 address, u8 *buffer, u16 size); -bool pak0f11cd00(s8 device, u16 arg1, char *arg2, s32 arg3, s32 arg4); -bool pak0f11ce00(s8 device, u16 arg1, char *arg2, s32 arg3, bool arg4); -void pak0f11d118(u8 *arg0, u8 arg1, u32 arg2); -void pak0f11d174(s8 device, u8 *arg1); -void pak0f11d214(u8 *arg0, u32 arg1); s32 pak0f11d3f8(s8 device); bool pak0f11d478(s8 device); bool pak0f11d4dc(s8 device); @@ -139,22 +62,13 @@ void pak_disable_rumble_for_player(s8 playernum); void pak_enable_rumble_for_player(s8 playernum); void pak_disable_rumble_for_all_players(void); void pak_enable_rumble_for_all_players(void); -void pak_dump_pak(void); -void pak_tick_state(s8 device); void pak0f11e3bc(s8 device); -void pak_probe_eeprom(void); -PakErr1 pak_read_eeprom(u8 address, u8 *buffer, u32 len); -PakErr1 pak_write_eeprom(u8 address, u8 *buffer, u32 len); void pak_set_bitflag(s32 flagnum, u8 *bitstream, bool set); bool pak_has_bitflag(u32 flagnum, u8 *stream); void pak_clear_all_bitflags(u8 *flags); void pak_n64_font_code_to_ascii(char *src, char *dst, s32 len); s8 pak_find_by_serial(s32 deviceserial); -s32 pak0f11e750(s8 device); bool gbpak_is_any_perfect_dark(void); -bool gbpak_strcmp(char *a, char *b); -s32 gbpak_identify_game(s8 device); -bool pak0f11ea34(s8 device); extern const char var7f1b423c[]; extern const char var7f1b4244[]; diff --git a/src/include/game/player.h b/src/include/game/player.h index 6ba46326b..7e157b378 100644 --- a/src/include/game/player.h +++ b/src/include/game/player.h @@ -8,65 +8,37 @@ f32 player_choose_spawn_location(f32 chrradius, struct coord *dstpos, RoomNum *d f32 player_choose_general_spawn_location(f32 chrradius, struct coord *pos, RoomNum *rooms, struct prop *prop); void player_start_new_life(void); void player_load_defaults(void); -bool player_spawn_anti(struct chrdata *chr, s32 param_2); void player_spawn(void); void player_reset_bond(struct playerbond *pb, struct coord *pos); -void players_tick_all_chr_bodies(void); void player_choose_body_and_head(s32 *bodynum, s32 *headnum, s32 *arg2); -void player_tick_chr_body(void); void player_remove_chr_body(void); -void player_tick_mp_swirl(void); -void player_change_camera(void); void player_start_cutscene(s16 anim_id); void player_reorient_for_cutscene_stop(s32 tweenduration60); -void player_tick_cutscene(bool arg0); f32 player_get_cutscene_blur_frac(void); -void player_set_zoom_fov_y(f32 fovy, f32 timemax); -f32 player_get_zoom_fov_y(void); void player_tween_fov_y(f32 targetfovy); -f32 player_get_teleport_fov_y(void); void player_update_zoom(void); -void player_stop_audio_for_pause(void); void player_tick_pause_menu(void); void player_pause(s32 root); void player_unpause(void); -Gfx *player0f0baf84(Gfx *gdl); Gfx *player_draw_fade(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac); -Gfx *player_draw_stored_fade(Gfx *gdl); -void player_update_colour_screen_properties(void); -void player_tick_chr_fade(void); void player_display_health(void); -void player_tick_damage_and_health(void); void player_display_damage(void); Gfx *player_render_health_bar(Gfx *gdl); void player_surround_with_explosions(s32 arg0); -void player_tick_explode(void); void player_reset_lo_res_if_4mb(void); s16 player_get_fb_width(void); s16 player_get_fb_height(void); bool player_has_shared_viewport(void); -s16 player_get_viewport_width(void); -s16 player_get_viewport_left(void); -s16 player_get_viewport_height(void); -s16 player_get_viewport_top(void); f32 player_get_aspect_ratio(void); -void player_update_shake(void); -void player_tick_teleport(f32 *arg0); void player_configure_vi(void); void player_tick(bool arg0); -void player_allocate_matrices(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up); Gfx *player_update_shoot_rot(Gfx *gdl); void player_display_shield(void); -Gfx *player_render_shield(Gfx *gdl); Gfx *player_render_hud(Gfx *gdl); void player_die(bool force); void player_die_by_shooter(u32 shooter, bool force); void player_check_if_shot_in_back(s32 attackerplayernum, f32 x, f32 z); f32 player_get_health_bar_height_frac(void); -void player_move_camera_from_pos_rooms(struct coord *pos, struct coord *up, struct coord *look, struct coord *pos2, RoomNum *rooms); -void player_move_camera_from_pos_room(struct coord *pos, struct coord *up, struct coord *look, struct coord *memcampos, s32 memcamroom); -void player_move_camera(struct coord *pos, struct coord *up, struct coord *look); -void players_clear_mem_cam_room(void); void player_set_perim_enabled(struct prop *prop, bool enable); bool player_get_geometry(struct prop *prop, u8 **start, u8 **end); void player_update_perim_info(void); @@ -82,29 +54,18 @@ Gfx *player_render(struct prop *prop, Gfx *gdl, bool xlupass); Gfx *player_load_matrix(Gfx *gdl); void player0f0c3320(Mtxf *matrices, s32 count); void player_set_tick_mode(s32 tickmode); -void player_begin_ge_fade_in(void); void players_begin_mp_swirl(void); void player0f0b9a20(void); void player_end_cutscene(void); void player_prepare_move_camera_to_pad(s16 pad_id); void player_prepare_move_camera_to_preset(struct camerapresetobj *preset, bool hasdir, s32 arg2); void player_prepare_move_camera_to_pos(f32 posangle, f32 rotangle, f32 range, f32 height1, f32 height2, s32 padnum); -void player_start_cutscene2(void); void player_set_fade_colour(s32 r, s32 g, s32 b, f32 a); -void player_adjust_fade(f32 maxfadetime, s32 r, s32 g, s32 b, f32 frac); void player_set_fade_frac(f32 maxfadetime, f32 frac); -bool player_is_fade_complete(void); -void player_start_chr_fade(f32 duration60, f32 targetfrac); void player_set_hi_res_enabled(bool enable); void player_auto_walk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist); void player_launch_slayer_rocket(struct weaponobj *rocket); -void player_set_global_draw_world_offset(s32 room); -void player_set_global_draw_camera_offset(void); bool player_is_health_visible(void); -void player_set_camera_mode(s32 mode); void player_set_cam_properties_in_bounds(struct coord *pos, struct coord *up, struct coord *look, s32 room); -void player_set_cam_properties_out_of_bounds(struct coord *pos, struct coord *up, struct coord *look, s32 room); -void player_set_cam_properties(struct coord *pos, struct coord *up, struct coord *look, s32 room); -void player_clear_mem_cam_room(void); #endif diff --git a/src/include/game/playermgr.h b/src/include/game/playermgr.h index 8fdb97e23..fa492e69c 100644 --- a/src/include/game/playermgr.h +++ b/src/include/game/playermgr.h @@ -7,7 +7,6 @@ void playermgr_init(void); void playermgr_reset(void); void playermgr_allocate_players(s32 count); -void playermgr_allocate_player(s32 index); void playermgr_calculate_ai_buddy_nums(void); void set_current_player_num(s32 playernum); s32 playermgr_get_player_num_by_prop(struct prop *prop); diff --git a/src/include/game/portal.h b/src/include/game/portal.h index e4e21ab86..9aba35d5f 100644 --- a/src/include/game/portal.h +++ b/src/include/game/portal.h @@ -6,7 +6,6 @@ void portal_set_xlu_frac2(s32 portalnum, f32 frac); void portal_set_xlu_frac(s32 portalnum, f32 frac); -f32 portal_get_xlu_frac2(s32 arg0); f32 portal_get_xlu_frac(s32 arg0); void portal0f0b65a8(s32 numportals); void portals_reset(void); diff --git a/src/include/game/prop.h b/src/include/game/prop.h index a4540bde4..f7bddac9c 100644 --- a/src/include/game/prop.h +++ b/src/include/game/prop.h @@ -20,38 +20,24 @@ void prop_activate_this_frame(struct prop *prop); void prop_delist(struct prop *prop); void prop_reparent(struct prop *mover, struct prop *adopter); void prop_detach(struct prop *prop); -Gfx *prop_render(Gfx *gdl, struct prop *prop, bool xlupass); Gfx *props_render(Gfx *gdl, RoomNum renderroomnum, s32 renderpass, RoomNum *roomnumsbyprop); void weapon_play_melee_miss_sound(s32 weaponnum, struct prop *prop); -void weapon_play_melee_hit_sound(s32 weaponnum, struct prop *prop); -struct prop *shot_calculate_hits(s32 handnum, bool isshooting, struct coord *gunpos2d, struct coord *gundir2d, struct coord *gunpos3d, struct coord *gundir3d, u32 arg6, f32 distance, bool arg8); struct prop *prop_find_aiming_at(s32 handnum, bool isshooting, u32 context); -void shot_create(s32 handnum, bool arg1, bool dorandom, s32 numshots, bool arg4); void hit_create(struct shotdata *shotdata, struct prop *prop, f32 hitdistance, s32 hitpart, struct modelnode *bboxnode, struct hitthing *hitthing, s32 arg6, struct modelnode *dlnode, struct model *model, bool slowsbullet, bool bulletproof, struct coord *arg11, struct coord *arg12); -void hand_inflict_melee_damage(s32 handnum, struct gset *gset, bool arg2); -void hand_tick_attack(s32 handnum); void hands_tick_attack(void); void prop_execute_tick_operation(struct prop *prop, s32 op); -struct prop *prop_find_for_interact(bool eyespy); -void prop_find_for_uplink(void); bool current_player_interact(bool eyespy); -void prop_pause(struct prop *prop); void prop_unpause(struct prop *prop); void props_tick_player(bool islastplayer); void props_tick_pad_effects(void); void prop_set_perim_enabled(struct prop *prop, bool enable); void props_test_for_pickup(void); -void farsight_choose_target(void); void autoaim_tick(void); u32 prop_door_get_cd_types(struct prop *prop); bool prop_is_of_cd_type(struct prop *prop, u32 types); void rooms_copy(RoomNum *srcrooms, RoomNum *dstrooms); void rooms_append(RoomNum *newrooms, RoomNum *dstrooms, s32 maxlen); bool array_intersects(RoomNum *a, RoomNum *b); -bool prop_try_add_to_chunk(s16 propnum, s32 chunkindex); -s32 room_allocate_prop_list_chunk(s32 room, s32 arg1); -void prop_register_room(struct prop *prop, RoomNum room); -void prop_deregister_room(struct prop *prop, RoomNum room); void prop_deregister_rooms(struct prop *prop); void prop_register_rooms(struct prop *prop); void los_find_intersecting_rooms_properly(struct coord *frompos, RoomNum *fromrooms, struct coord *topos, RoomNum *finalrooms, RoomNum *intersecting, s32 maxintersecting); @@ -60,7 +46,6 @@ void los_find_intersecting_rooms_exhaustive(struct coord *frompos, RoomNum *from void los_find_final_room_exhaustive(struct coord *frompos, RoomNum *fromrooms, struct coord *topos, RoomNum *finalrooms); void los_find_final_room_fast(struct coord *frompos, RoomNum *fromrooms, struct coord *topos, RoomNum *finalrooms); void room_get_props(RoomNum *room, s16 *propnums, s32 len); -void props_defrag_room_props(void); void prop_get_bbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin); bool prop_get_geometry(struct prop *prop, u8 **start, u8 **end); diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h index d778ad93b..a222ac1a3 100644 --- a/src/include/game/propobj.h +++ b/src/include/game/propobj.h @@ -24,114 +24,49 @@ bool countdown_timer_is_running(void); void countdown_timer_set_running(bool running); void countdown_timer_set_value60(f32 value); void countdown_timer_set_visible(u32 reason, bool visible); -void countdown_timer_tick(void); bool door_call_lift(struct prop *doorprop, bool allowclose); -bool door_is_padlock_free(struct doorobj *door); bool obj_can_pickup_from_safe(struct defaultobj *obj); void obj_update_linked_scenery(struct defaultobj *obj, struct prop *prop); -f32 obj_get_local_x_min(struct modelrodata_bbox *bbox); -f32 obj_get_local_x_max(struct modelrodata_bbox *bbox); -f32 obj_get_local_y_min(struct modelrodata_bbox *bbox); -f32 obj_get_local_y_max(struct modelrodata_bbox *bbox); -f32 obj_get_local_z_min(struct modelrodata_bbox *bbox); -f32 obj_get_local_z_max(struct modelrodata_bbox *bbox); -f32 obj_get_rotated_local_x_min_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 obj_get_rotated_local_x_max_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 obj_get_rotated_local_y_min_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 obj_get_rotated_local_y_max_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 obj_get_rotated_local_z_min_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 obj_get_rotated_local_z_max_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); f32 obj_get_rotated_local_x_min_by_mtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); f32 obj_get_rotated_local_x_max_by_mtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); f32 obj_get_rotated_local_y_min_by_mtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); f32 obj_get_rotated_local_y_max_by_mtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); f32 obj_get_rotated_local_z_min_by_mtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); f32 obj_get_rotated_local_z_max_by_mtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); -f32 obj_get_rotated_local_min(struct modelrodata_bbox *bbox, f32 arg1, f32 arg2, f32 arg3); -f32 obj_get_rotated_local_max(struct modelrodata_bbox *bbox, f32 arg1, f32 arg2, f32 arg3); -s32 obj_populate_geoblock_vertices_from_bbox_and_mtx(f32 xmin, f32 xmax, f32 ymin, f32 ymax, f32 zmin, f32 zmax, Mtxf *mtx, struct geoblock *block); -void obj_populate_geoblock_from_bbox_and_mtx(struct modelrodata_bbox *bbox, Mtxf *mtx, struct geoblock *block); -void obj_populate_geoblock_from_modeldef(struct modelrodata_geo *georodata, struct modelrodata_bbox *bbox, Mtxf *mtx, struct geoblock *block); -bool pos_is_within_padbbox(struct coord *coord, struct coord *arg1, struct coord *pos, struct coord *normal, struct coord *up, struct coord *look, f32 xmin, f32 xmax, f32 ymin, f32 ymax, f32 zmin, f32 zmax); -bool pos_is_within_padding_of_padvol(struct coord *coord, struct coord *arg1, s32 padnum); -bool pos_is_within_dist_of_padvol(struct coord *coord, f32 arg1, s32 padnum); bool func0f0679ac(struct model *model, f32 *max, f32 *min, f32 arg3[2], f32 arg4[2]); -void model_get_screen_coords_by_axis(struct model *model, f32 *max, f32 *min, s32 axis); void model_get_screen_coords3(struct model *model, f32 *xmax, f32 *xmin, f32 *ymax, f32 *ymin); -bool model_get_screen_coords2(struct model *model, f32 *x2, f32 *x1, f32 *y2, f32 *y1); bool model_get_screen_coords(struct model *model, f32 *x2, f32 *x1, f32 *y2, f32 *y1); void func0f06803c(struct coord *arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4); struct defaultobj *obj_find_by_pad_num(s32 padnum); -struct defaultobj *obj_find_by_pos(struct coord *pos, RoomNum *rooms); -void projectile_free(struct projectile *projectile); void projectiles_unref_owner(struct prop *owner); -void projectile_reset(struct projectile *projectile); -struct projectile *projectile_allocate(void); void func0f0685e4(struct prop *prop); void projectile_set_sticky(struct prop *prop); -void embedment_free(struct embedment *embedment); struct embedment *embedment_allocate(void); -s32 obj_get_shots_taken(struct defaultobj *obj); s32 obj_get_destroyed_level(struct defaultobj *obj); -struct modelnode *door_find_dl_node(struct model *model); -struct modelnode *modeldef_find_bbox_node(struct modeldef *modeldef); struct modelrodata_bbox *modeldef_find_bbox_rodata(struct modeldef *modeldef); -struct modelnode *model_find_bbox_node(struct model *model); struct modelrodata_bbox *model_find_bbox_rodata(struct model *model); -struct modelnode *obj_find_bbox_node(struct defaultobj *obj); struct modelrodata_bbox *obj_find_bbox_rodata(struct defaultobj *obj); -s32 obj_get_average_brightness_in_rooms(RoomNum *rooms, s32 arg1); -s32 door_calc_average_brightness(struct prop *prop, s32 *arg1, s32 *arg2); s32 func0f068fc8(struct prop *prop, bool arg1); void prop_calculate_shade_colour(struct prop *prop, u8 *nextcol, u16 floorcol); -void prop_calculate_shade_info(struct prop *prop, u8 *nextcol, u16 floorcol); void colour_tween(u8 *col, u8 *nextcol); void obj_merge_colour_fracs(s32 *colour, s32 shademode, f32 fracs[4]); void obj_onmoved(struct defaultobj *obj, bool update_geometry, bool update_rooms); -void obj_init_toggle_nodes(struct defaultobj *obj); -void obj_create_one_debris(struct defaultobj *obj, s32 partindex, struct prop *prop); -void obj_create_debris(struct defaultobj *obj, struct prop *prop); -struct prop *obj_init(struct defaultobj *obj, struct modeldef *modeldef, struct prop *prop, struct model *model); struct prop *obj_init_with_model_def(struct defaultobj *obj, struct modeldef *modeldef); struct prop *obj_init_with_auto_model(struct defaultobj *obj); void func0f06a580(struct defaultobj *obj, struct coord *pos, Mtxf *matrix, RoomNum *rooms); -f32 func0f06a620(struct defaultobj *obj); void func0f06a730(struct defaultobj *obj, struct coord *arg1, Mtxf *matrix, RoomNum *rooms, struct coord *arg4); void func0f06ab60(struct defaultobj *obj, struct coord *arg1, Mtxf *matrix, RoomNum *rooms, struct coord *arg4); void obj_free_projectile(struct defaultobj *obj); void obj_free_embedment_or_projectile(struct prop *prop); void obj_free(struct defaultobj *obj, bool freeprop, bool canregen); void obj_free_permanently(struct defaultobj *obj, bool freeprop); -f32 obj_get_radius(struct defaultobj *obj); bool func0f06b39c(struct coord *pos, struct coord *dir, struct coord *aimpos, f32 arg3); -bool func0f06b488(struct prop *prop, struct coord *arg1, struct coord *arg2, struct coord *arg3, struct coord *arg4, struct coord *arg5, f32 *arg6); -bool func0f06b610(struct defaultobj *obj, struct coord *arg1, struct coord *arg2, struct coord *arg3, f32 arg4, struct coord *arg5, struct coord *arg6, struct coord *arg7, struct coord *arg8, f32 *arg9); bool func0f06bea0(struct model *model, struct modelnode *arg1, struct modelnode *arg2, struct coord *arg3, struct coord *arg4, void *arg5, f32 *arg6, struct modelnode **arg7, s32 *hitpart, s32 *arg9, struct modelnode **arg10); -bool func0f06c28c(struct chrdata *chr, struct coord *arg1, struct coord *arg2, struct coord *arg3, f32 arg4, struct coord *arg5, struct coord *arg6, struct coord *arg7, struct coord *arg8, f32 *arg9); -bool projectile_find_colliding_prop(struct prop *prop, struct coord *pos, struct coord *arg2, u32 cdtypes, struct coord *arg4, struct coord *arg5, RoomNum *rooms); -s32 func0f06cd00(struct defaultobj *obj, struct coord *pos, struct coord *arg2, struct coord *arg3); -bool func0f06d37c(struct defaultobj *obj, struct coord *arg1, struct coord *arg2, struct coord *arg3); void apply_speed(f32 *distdone, f32 maxdist, f32 *speed, f32 accel, f32 decel, f32 maxspeed); void apply_rotation(f32 *angle, f32 maxrot, f32 *speed, f32 accel, f32 decel, f32 maxspeed); -void projectile_fall(struct defaultobj *obj, f32 mtx[3][3]); -void knife_play_woosh_sound(struct defaultobj *obj); -void func0f06e9cc(struct coord *arg0, Mtxf *arg1); -void obj_land2(struct defaultobj *obj, struct coord *arg1, struct coord *arg2); -void bolt_land(struct weaponobj *weapon, struct coord *arg1); -void knife_land(struct defaultobj *obj, struct coord *arg1, struct coord *arg2); -bool obj_embed(struct prop *prop, struct prop *parent, struct model *model, struct modelnode *node); -void obj_land(struct prop *prop, struct coord *arg1, struct coord *arg2, bool *embedded); -bool prop_explode(struct prop *prop, s32 explosiontype); -void ammocrate_tick(struct prop *ammocrate); -void weapon_tick(struct prop *weapon); void func0f07063c(struct prop *prop, bool fulltick); void obj_drop_recursively(struct prop *prop, bool arg1); void func0f0706f8(struct prop *prop, bool fulltick); -void func0f07079c(struct prop *prop, bool fulltick); -s32 glass_calculate_opacity(struct coord *pos, f32 xludist, f32 opadist, f32 arg3); -void obj_get_vertices_from_bbox(struct modelrodata_bbox *bbox, f32 realrot[3][3], struct coord *pos, struct coord *vertices); -void obj_get_vertices_from_georodata(struct modelrodata_geo *georodata, f32 realrot[3][3], struct coord *pos, struct coord *vertices); -void obj_populate_geotile(struct defaultobj *obj, struct geotilef *tile, u32 flags, struct modelrodata_bbox *bbox, struct modelrodata_geo *georodata); void lift_activate(struct prop *prop, u8 liftnum); struct prop *lift_find_by_pad(s16 padnum); f32 lift_get_y(struct liftobj *lift); @@ -140,33 +75,12 @@ void lift_go_to_stop(struct liftobj *lift, s32 stopnum); f32 obj_get_hov_bob_offset_y(struct defaultobj *obj); void hov_update_ground(struct defaultobj *obj, struct hov *hov, struct coord *pos, RoomNum *rooms, f32 matrix[3][3]); void hov_tick(struct defaultobj *obj, struct hov *hov); -s32 obj_is_hoverprop_or_bike(struct defaultobj *obj); f32 hoverprop_get_turn_angle(struct defaultobj *obj); void hoverprop_set_turn_angle(struct defaultobj *obj, f32 angle); s32 func0f072144(struct defaultobj *obj, struct coord *arg1, f32 arg2, bool arg3); -void hovercar_find_next_path(struct hovercarobj *hovercar); -void hovercar_start_next_path(struct hovercarobj *hovercar); -void hovercar_increment_step(struct hovercarobj *hovercar); -f32 obj_collide(struct defaultobj *obj, struct coord *arg1, f32 arg2); void hoverbike_update_movement(struct hoverbikeobj *hoverbike, f32 arg1, f32 arg2, f32 arg3); -void platform_displace_props2(struct prop *platform, Mtxf *arg1); -bool rocket_tick_fbw(struct weaponobj *rocket); s32 projectile_launch(struct defaultobj *obj, struct projectile *projectile, struct coord *arg2, struct coord *arg3); s32 projectile_tick(struct defaultobj *obj, bool *embedded); -void door_tick(struct prop *doorprop); -void door_update_portal_if_windowed(struct prop *door, s32 playercount); -void door_init_matrices(struct prop *door); -void platform_displace_props(struct prop *platform, s16 *propnums, struct coord *prevpos, struct coord *newpos); -void lift_tick(struct prop *lift); -void escastep_tick(struct prop *escalator); -void cctv_tick(struct prop *camera); -void cctv_init_matrices(struct prop *cctv, Mtxf *mtx); -void fan_tick(struct prop *fan); -void fan_update_model(struct prop *fan); -void autogun_tick(struct prop *autogun); -void autogun_init_matrices(struct prop *autogun, Mtxf *mtx); -void autogun_tick_shoot(struct prop *autogun); -void chopper_init_matrices(struct prop *chopper); struct chopperobj *chopper_from_hovercar(struct chopperobj *obj); bool chopper_check_target_in_fov(struct chopperobj *hovercar, u8 param_2); bool chopper_check_target_in_sight(struct chopperobj *obj); @@ -177,61 +91,30 @@ bool chopper_set_armed(struct chopperobj *obj, bool armed); void chopper_restart_timer(struct chopperobj *obj); f32 chopper_get_timer(struct chopperobj *heli); void chopper_set_max_damage(struct chopperobj *obj, u16 health); -f32 func0f07b164(struct coord *pos1, struct coord *pos2, struct coord *pos3, struct coord *result); void chopper_fire_rocket(struct chopperobj *chopper, bool side); -void chopper_increment_barrel(struct prop *prop, bool firing); -void chopper_increment_movement(struct prop *prop, f32 goalroty, f32 goalrotx, struct coord *dir, bool firing); -void chopper_tick_fall(struct prop *chopper); -void chopper_tick_idle(struct prop *chopper); -void chopper_tick_patrol(struct prop *chopper); -void chopper_tick_combat(struct prop *chopper); -void hovercar_tick(struct prop *hovercar); -void hoverprop_tick(struct prop *hoverprop, bool arg1); -void hoverbike_tick(struct prop *hoverbike, bool arg1); -void dropship_update_interior(struct prop *prop); -void glass_update_portal(struct prop *glass, s32 playercount, bool *arg2); -void weapon_init_matrices(struct prop *weapon); -void hangingmonitor_init_matrices(struct prop *hangingmonitors); -void obj_init_matrices(struct prop *prop); -bool prop_can_regen(struct prop *prop); u32 obj_tick(struct prop *prop); s32 obj_tick_player(struct prop *prop); Gfx *props_render_beams(Gfx *gdl); -void tvscreen_set_cmdlist(struct tvscreen *screen, u32 *cmdlist); void tvscreen_set_image_by_num(struct tvscreen *screen, s32 imagenum); -void tvscreen_set_texture(struct tvscreen *screen, s32 texturenum); Gfx *tvscreen_render(struct model *model, struct modelnode *node, struct tvscreen *screen, Gfx *gdl, s32 arg4, s32 arg5); -void obj_render_prop(struct prop *prop, struct modelrenderdata *renderdata, bool xlupass); Gfx *gfx_render_radial_shadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, u32 colour); -Gfx *obj_render_shadow(struct defaultobj *obj, Gfx *gdl); Gfx *obj_render(struct prop *prop, Gfx *gdl, bool xlupass); -bool model_is_node_not_tvscreen(struct modeldef *modeldef, struct modelnode *node); -void obj_deform(struct defaultobj *obj, s32 level); -void obj_bounce(struct defaultobj *obj, struct coord *gundir2d); void obj_set_dropped(struct prop *prop, u32 droptype); void obj_apply_momentum(struct defaultobj *obj, struct coord *speed, f32 rotation, bool addspeed, bool addrotation); void piracy_restore(void); void func0f082e84(struct defaultobj *obj, struct coord *pos, struct coord *dir, struct coord *tween, bool addrotation); void obj_detach(struct prop *prop); bool obj_drop(struct prop *prop, bool lazy); -void obj_fall(struct defaultobj *obj, s32 playernum); -void obj_destroy_supported_objects(struct prop *prop, s32 playernum); -void obj_check_destroyed(struct defaultobj *obj, struct coord *pos, s32 playernum); bool func0f084594(struct model *model, struct modelnode *node, struct coord *arg2, struct coord *arg3, struct hitthing *arg4, s32 *arg5, struct modelnode **arg6); -bool func0f0849dc(struct model *model, struct modelnode *nodearg, struct coord *arg2, struct coord *arg3, struct hitthing *hitthing, s32 *dstmtxindex, struct modelnode **dstnode); -u32 add43214321(u32 value); void glass_destroy(struct defaultobj *obj); void door_destroy_glass(struct doorobj *door); -void cctv_handle_lens_shot(struct defaultobj *obj); void func0f085050(struct prop *prop, f32 damage, struct coord *pos, s32 arg3, s32 playernum); bool func0f085194(struct defaultobj *obj); -bool obj_is_mortal(struct defaultobj *obj); void obj_take_gunfire(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weaponnum, s32 playernum); void obj_damage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weaponnum, s32 playernum); void func0f0859a0(struct prop *prop, struct shotdata *shotdata); void obj_test_hit(struct prop *prop, struct shotdata *shotdata); void obj_hit(struct shotdata *shotdata, struct hit *hit); -u32 propobj_get_ci_tag_id(struct prop *prop); bool obj_is_healthy(struct defaultobj *obj); bool obj_test_for_interact(struct prop *prop); bool current_player_try_mount_hoverbike(struct prop *prop); @@ -239,44 +122,23 @@ bool propobj_interact(struct prop *prop); void obj_set_perim_enabled(struct prop *prop, bool enable); bool obj_get_geometry(struct prop *prop, u8 **start, u8 **end); void obj_get_bbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin); -void ammotype_get_picked_up_text(char *dst); -void ammotype_get_determiner(char *dst, s32 ammotype, s32 qty); -void ammotype_get_pickup_name(char *dst, s32 ammotype, s32 qty); -void ammotype_play_pickup_sound(u32 ammotype); s32 prop_play_pickup_sound(struct prop *prop, s32 weapon); void weapon_play_pickup_sound(s32 weaponnum); -void ammotype_get_pickup_message(char *dst, s32 ammotype, s32 qty); -void current_player_queue_pickup_ammo_hudmsg(s32 ammotype, s32 pickupqty); -void ammo_handle_pickup(s32 ammotype, s32 quantity, bool withsound, bool withhudmsg); s32 ammocrate_get_pickup_ammo_qty(struct ammocrateobj *crate); s32 weapon_get_pickup_ammo_qty(struct weaponobj *weapon); -void weapon_get_pickup_text(char *buffer, s32 weaponnum, bool dual); void current_player_queue_pickup_weapon_hudmsg(u32 weaponnum, bool dual); s32 prop_pickup_by_player(struct prop *prop, bool showhudmsg); s32 obj_test_for_pickup(struct prop *prop); bool func0f0899dc(struct prop *prop, struct coord *arg1, f32 *xrange, f32 *yrange); void model_free_vertices(s32 vtxstoretype, struct model *model); -struct prop *hat_apply_to_chr(struct hatobj *hat, struct chrdata *chr, struct modeldef *modeldef, struct prop *prop, struct model *model); -void hat_load_and_apply_to_chr(struct hatobj *hat, struct chrdata *chr); void hat_assign_to_chr(struct hatobj *hat, struct chrdata *chr); struct prop *hat_create_for_chr(struct chrdata *chr, s32 modelnum, u32 flags); -struct weaponobj *weapon_create(bool musthaveprop, bool musthavemodel, struct modeldef *modeldef); -struct hatobj *hat_create(bool musthaveprop, bool musthavemodel, struct modeldef *modeldef); -struct ammocrateobj *ammocrate_allocate(void); -struct defaultobj *debris_allocate(void); void player_activate_remote_mine_detonator(s32 playernum); -struct weaponobj *weapon_find_child_by_weapon_num(s32 weaponnum, struct prop *prop); struct weaponobj *weapon_find_landed(s32 weaponnum); -void weapon_register_proxy(struct weaponobj *weapon); -void weapon_unregister_proxy(struct weaponobj *weapon); void coord_trigger_proxies(struct coord *pos, bool arg1); -void chrs_trigger_proxies(void); void propweapon_set_dual(struct weaponobj *weapon1, struct weaponobj *weapon2); -struct prop *func0f08adc8(struct weaponobj *weapon, struct modeldef *modeldef, struct prop *prop, struct model *model); struct prop *func0f08ae0c(struct weaponobj *weapon, struct modeldef *modeldef); bool chr_equip_weapon(struct weaponobj *weapon, struct chrdata *chr); -struct prop *func0f08b108(struct weaponobj *weapon, struct chrdata *chr, struct modeldef *modeldef, struct prop *prop, struct model *model); -void func0f08b208(struct weaponobj *weapon, struct chrdata *chr); void func0f08b25c(struct weaponobj *weapon, struct chrdata *chr); struct autogunobj *laptop_deploy(s32 modelnum, struct gset *gset, struct chrdata *chr); struct weaponobj *weapon_create_projectile_from_gset(s32 modelnum, struct gset *gset, struct chrdata *chr); @@ -288,53 +150,25 @@ s32 weapon_test_for_pickup(struct prop *prop); void weapon_set_gunfire_visible(struct prop *prop, bool visible, RoomNum room); bool weapon_is_gunfire_visible(struct prop *prop); s32 hat_get_type(struct prop *prop); -bool door_is_unlocked(struct prop *playerprop, struct prop *doorprop); -bool door_is_pos_in_range(struct doorobj *door, struct coord *pos, f32 arg2, bool isbike); -bool door_is_obj_in_range(struct doorobj *door, struct defaultobj *obj, bool isbike); -bool vector_is_in_front_of_door(struct doorobj *door, struct coord *vector); -bool door_is_range_empty(struct doorobj *door); void doors_check_automatic(void); -void door_get_mtx(struct doorobj *door, Mtxf *matrix); -void door_get_bbox(struct doorobj *door, struct modelrodata_bbox *dst); void door_update_tiles(struct doorobj *door); -void door_calc_texturemap(struct doorobj *door, Vtx *src, Vtx *dst, s32 numvertices); -void door_calc_vertices_without_cache(struct doorobj *door); -void door_calc_vertices_with_cache(struct doorobj *door); void door_activate_portal(struct doorobj *door); void door_deactivate_portal(struct doorobj *door); struct prop *door_init(struct doorobj *door, struct coord *pos, Mtxf *mtx, RoomNum *rooms, struct coord *slidedist, struct coord *centre); -void door_play_opening_sound(s32 soundtype, struct prop *prop); -void door_play_closing_sound(s32 soundtype, struct prop *prop); -void door_play_opened_sound(s32 soundtype, struct prop *prop); -void door_play_closed_sound(s32 soundtype, struct prop *prop); -void door_start_open(struct doorobj *door); -void door_start_close(struct doorobj *door); -u32 decode_xor_aaaaaaaa(u32 value); -void door_finish_open(struct doorobj *door); void door_finish_close(struct doorobj *door); void door_set_mode(struct doorobj *door, s32 newmode); void doors_request_mode(struct doorobj *door, s32 newmode); -s32 door_is_closed(struct doorobj *door); -s32 door_is_open(struct doorobj *door); s32 func0f08e5a8(RoomNum *rooms, struct screenbox *box); f32 obj_calculate_fade_dist_opacity_frac(struct prop *prop, f32 modelscale); -bool pos_is_in_obj_fade_distance(struct coord *coord, f32 modelscale); bool func0f08e8ac(struct prop *prop, struct coord *pos, f32 arg2, bool arg3); bool pos_is_in_draw_distance(struct coord *arg); -void door_create_sparks(struct doorobj *door); -bool door_calc_intended_frac(struct doorobj *door); -void doors_calc_frac(struct doorobj *door); -bool door_test_interact_angle(struct doorobj *door, bool altcoordsystem); bool door_test_for_interact(struct prop *prop); void doors_activate(struct prop *prop, bool allowliftclose); -bool pos_is_in_front_of_door(struct coord *pos, struct doorobj *door); void doors_choose_swing_direction(struct prop *chrprop, struct doorobj *door); bool propdoor_interact(struct prop *doorprop); void alarm_stop_audio(void); -void gas_release_from_pos(struct coord *pos); void gas_stop_audio(void); bool gas_is_active(void); -void gas_tick(void); Gfx *countdown_timer_render(Gfx *gdl); void projectiles_debug(void); void alarm_tick(void); diff --git a/src/include/game/propsnd.h b/src/include/game/propsnd.h index 60d0417b9..a5220fe3f 100644 --- a/src/include/game/propsnd.h +++ b/src/include/game/propsnd.h @@ -13,23 +13,15 @@ void ps_stop_sound(struct prop *prop, s32 type, u16 flags); s32 ps_calculate_volume_from_distance(f32 playerdist, f32 dist1, f32 dist2, f32 dist3, s32 fullvolume); s32 ps_get_volume(s32 channelnum); void ps_create_if_not_dupe(struct prop *prop, s16 soundnum, s32 type); -void ps_stop_channel(s32 channelnum); -void ps_print_channel(struct pschannel *channel); s32 ps_get_subtitle_opacity(s32 channelnum); -void ps_tick_channel(s32 channelnum); void ps_tick(void); void ps_set_pitch(struct prop *prop, f32 targetpitch, s32 changespeed); void ps_set_volume(struct prop *prop, s32 vol); -void ps_stop_one_shoot_channel(struct prop *prop); s16 ps_create(struct pschannel *channel, struct prop *prop, s16 soundnum, s16 padnum, s32 vol, u16 flags, u16 flags2, s32 type, struct coord *pos, f32 pitch, RoomNum *rooms, s32 room, f32 dist1, f32 dist2, f32 dist3); s32 ps_play_from_prop(s32 channelnum, s16 soundnum, s32 vol, struct prop *prop, s16 type, u16 flags); void ps_mute_channel(s32 channelnum); bool ps_is_channel_free(s32 channelnum); void ps_modify(s32 channelnum, s32 arg1, s16 padnum, struct prop *prop, s32 volchangetimer60, s32 dist2, s32 dist3, u16 flags); -s32 ps_calculate_vol(struct coord *pos, f32 arg1, f32 arg2, f32 arg3, RoomNum *rooms, s16 soundnum, s32 arg6, f32 *arg7); -s32 ps_calculate_pan3(s32 degrees, f32 arg1, struct pschannel *channel); -s32 ps_calculate_pan2(struct coord *pos, s32 arg1, f32 arg2, struct pschannel *channel); -s32 ps_calculate_pan(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, f32 playerdist, bool arg5, struct pschannel *channel); void ps_get_theoretical_vol_pan(struct coord *pos, RoomNum *rooms, s16 soundnum, s32 *vol, s32 *pan); void ps_apply_vol_pan(struct sndstate *handle, struct coord *pos, f32 dist1, f32 dist2, f32 dist3, RoomNum *rooms, s16 soundnum, s32 arg7, f32 *distanceptr); s32 ps_get_random_spark_sound(void); diff --git a/src/include/game/race.h b/src/include/game/race.h index 196f8989b..98ffe1fe3 100644 --- a/src/include/game/race.h +++ b/src/include/game/race.h @@ -6,11 +6,6 @@ void races_init(void); -u16 race_get_anim_sum_angle_as_int(s16 animnum, s32 frame, s32 endframe); -s32 race_get_anim_sum_forward_as_int(s16 animnum, s32 startframe, s32 endframe); -s32 race_init_anim_group(struct attackanimconfig *configs); -void race_init_anim_groups(struct attackanimgroup **groups); -s32 race_count_anims(struct animtablerow *rows); void race_init_anims(void); #endif diff --git a/src/include/game/radar.h b/src/include/game/radar.h index fca74df84..2aad7e358 100644 --- a/src/include/game/radar.h +++ b/src/include/game/radar.h @@ -4,10 +4,8 @@ #include "data.h" #include "types.h" -Gfx *radar_render_background(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4); s32 radar_get_team_index(s32 team); Gfx *radar_draw_dot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1, u32 colour2, bool swapcolours); Gfx *radar_render(Gfx *gdl); -Gfx *radar_render_r_tracked_props(Gfx *gdl); #endif diff --git a/src/include/game/room.h b/src/include/game/room.h index eab021c12..ea8bd0ae4 100644 --- a/src/include/game/room.h +++ b/src/include/game/room.h @@ -9,12 +9,8 @@ void rooms_reset(void); void rooms_tick(void); void room_set_last_for_offset(s32 room); -void room_link_mtx(s32 index, s32 roomnum); -void room_unlink_mtx(s32 index, s32 roomnum); void room_free_mtx(s32 index); -s32 room_allocate_mtx(void); void room_populate_mtx(Mtxf *matrix, s32 roomnum); -s32 room_touch_mtx(s32 roomnum); Gfx *room_apply_mtx(Gfx *gdl, s32 roomnum); struct coord *room_get_pos_ptr(s32 room); void room_get_pos(s32 room, struct coord *pos); diff --git a/src/include/game/savebuffer.h b/src/include/game/savebuffer.h index 27b423353..46110c94e 100644 --- a/src/include/game/savebuffer.h +++ b/src/include/game/savebuffer.h @@ -4,15 +4,12 @@ #include "data.h" #include "types.h" -void func0f0d4690(Mtxf *mtx); -void func0f0d475c(Mtxf *mtx); Gfx *func0f0d479c(Gfx *gdl); Gfx *func0f0d49c8(Gfx *gdl); Gfx *func0f0d4a3c(Gfx *gdl, s32 arg1); Gfx *func0f0d4c80(Gfx *gdl); Gfx *menugfx_draw_plane(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, s32 type); void savebuffer_or(struct savebuffer *buffer, u32 arg1, s32 arg2); -void savebuffer_write_bits(struct savebuffer *buffer, u32 value, s32 numbits, u8 *dst); u32 savebuffer_read_bits(struct savebuffer *buffer, s32 offset); void savebuffer_clear(struct savebuffer *buffer); void func0f0d5484(struct savebuffer *buffer, u8 *data, u8 len); diff --git a/src/include/game/setup.h b/src/include/game/setup.h index aff5def38..66ddf5483 100644 --- a/src/include/game/setup.h +++ b/src/include/game/setup.h @@ -9,28 +9,8 @@ void setup_load_waypoints(void); void setup_prepare_cover(void); void props_reset(void); -void setup_create_lift_door(struct linkliftdoorobj *link); -void setup_create_padlocked_door(struct padlockeddoorobj *link); -void setup_create_safe_item(struct safeitemobj *link); -void setup_create_conditional_scenery(struct linksceneryobj *link); -void setup_create_blocked_path(struct blockedpathobj *link); -void setup_reset_0f00cc8c(void); -void setup_reset_proxy_mines(void); -s32 setup_count_command_type(u32 type); void setup_create_object(struct defaultobj *obj, s32 cmdindex); void setup_place_weapon(struct weaponobj *weapon, s32 cmdindex); -void setup_create_hat(struct hatobj *hat, s32 cmdindex); -void setup_create_key(struct keyobj *key, s32 cmdindex); -void setup_create_mine(struct mineobj *mine, s32 cmdindex); -void setup_create_cctv(struct cctvobj *camera, s32 cmdindex); -void setup_create_autogun(struct autogunobj *autogun, s32 cmdindex); -void setup_create_hanging_monitors(struct hangingmonitorsobj *monitors, s32 cmdindex); -void setup_create_single_monitor(struct singlemonitorobj *monitor, s32 cmdindex); -void setup_create_multi_monitor(struct multimonitorobj *monitor, s32 cmdindex); -s32 setup_get_portal_by_pad(s32 padnum); -s32 setup_get_portal_by_door_pad(s32 padnum); -void setup_create_door(struct doorobj *door, s32 cmdindex); -void setup_create_hov(struct defaultobj *obj, struct hov *hov); void setup_load_briefing(s32 stagenum, u8 *buffer, s32 bufferlen, struct briefing *briefing); void setup_load_files(s32 stagenum); void setup_create_props(s32 stagenum); diff --git a/src/include/game/setuputils.h b/src/include/game/setuputils.h index 87fea20ae..ceff44032 100644 --- a/src/include/game/setuputils.h +++ b/src/include/game/setuputils.h @@ -9,7 +9,6 @@ u32 *setup_get_cmd_by_index(s32 cmdindex); s32 setup_get_cmd_index_by_tag(struct tag *tag); u32 setup_get_cmd_index_by_prop(struct prop *prop); bool setup_load_modeldef(s32 modelnum); -bool setup_get_obj_bbox(struct defaultobj *obj, struct coord *pos, f32 realrot[3][3], struct coord *arg3, struct coord *arg4); bool setup0f092304(struct defaultobj *obj, struct coord *arg1, struct coord *arg2); void obj_find_rooms(struct defaultobj *obj, struct coord *pos, f32 realrot[3][3], RoomNum *rooms); void obj_detect_rooms(struct defaultobj *obj); diff --git a/src/include/game/sight.h b/src/include/game/sight.h index 324a89f07..b1c240e6f 100644 --- a/src/include/game/sight.h +++ b/src/include/game/sight.h @@ -4,25 +4,7 @@ #include "data.h" #include "types.h" -bool sight_is_prop_friendly(struct prop *prop); -bool sight_can_target_prop(struct prop *prop, s32 max); -bool sight_is_reactive_to_prop(struct prop *prop); -s32 sight_find_free_target_index(s32 max); void func0f0d7364(void); -void sight_tick(bool sighton); -s32 sight_calculate_box_bound(s32 arg0, s32 arg1, s32 arg2, s32 arg3); -Gfx *sight_draw_target_box(Gfx *gdl, struct trackedprop *trackedprop, s32 textid, s32 time); -Gfx *sight_draw_aimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colour); -Gfx *sight_draw_delayed_aimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colour); -Gfx *sight_draw_default(Gfx *gdl, bool sighton); -Gfx *sight_draw_classic(Gfx *gdl, bool sighton); -Gfx *sight_draw_type2(Gfx *gdl, bool sighton); -Gfx *sight_draw_skedar_triangle(Gfx *gdl, s32 x, s32 y, s32 dir, u32 colour); -Gfx *sight_draw_skedar(Gfx *gdl, bool sighton); -Gfx *sight_draw_zoom(Gfx *gdl, bool sighton); -Gfx *sight_draw_maian(Gfx *gdl, bool sighton); -Gfx *sight_draw_target(Gfx *gdl); -bool sight_has_target_while_aiming(s32 sight); Gfx *sight_draw(Gfx *gdl, bool sighton, s32 sight); #endif diff --git a/src/include/game/sky.h b/src/include/game/sky.h index 5a0e74b60..3f3cca62c 100644 --- a/src/include/game/sky.h +++ b/src/include/game/sky.h @@ -8,28 +8,10 @@ void sky_reset(u32 stagenum); void sky_tick(void); -void sky_get_world_pos_from_screen_pos(f32 left, f32 top, struct coord *dst); -bool sky_is_screen_corner_in_sky(struct coord *corner3dpos, struct coord *dstpos, f32 *dstfrac); -bool sky_is_corner_in_water(struct coord *corner3dpos, struct coord *dstpos, f32 *dstfrac); -void sky_calculate_edge_vertex(struct coord *arg0, struct coord *arg1, struct coord *out); -f32 sky_clamp(f32 value, f32 min, f32 max); -f32 sky_round(f32 value); -void sky_choose_cloud_vtx_colour(struct skyvtx3d *arg0, f32 arg1); -void sky_choose_water_vtx_colour(struct skyvtx3d *arg0, f32 arg1); Gfx *sky_render(Gfx *gdl); -void sky_convert_vertex(struct skyvtx3d *arg0, Mtxf *arg1, u16 arg2, f32 arg3, f32 arg4, struct skyvtx2d *arg5); -bool sky_vertices_are_same(struct skyvtx2d *arg0, struct skyvtx2d *arg1); -Gfx *sky_render_tri(Gfx *gdl, struct skyvtx2d *arg1, struct skyvtx2d *arg2, struct skyvtx2d *arg3, f32 arg4, bool textured); -Gfx *sky_render_full(Gfx *gdl, struct skyvtx2d *arg1, struct skyvtx2d *arg2, struct skyvtx2d *arg3, struct skyvtx2d *arg4, f32 arg5); -void sky_create_sun_artifact(struct artifact *artifact, s32 x, s32 y); -f32 sky_get_artifact_group_intensity_frac(struct artifact *artifacts); Gfx *sky_render_suns(Gfx *gdl, bool xray); -Gfx *sky_render_flare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 flaretimer240, f32 alphafrac); -Gfx *sky_render_teleport_flare(Gfx *gdl, f32 x, f32 y, f32 z, f32 size, f32 intensityfrac); -Gfx *sky_render_teleport_flares(Gfx *gdl); Gfx *sky_render_artifacts(Gfx *gdl); void sky_set_overexposure(s32 arg0, s32 arg1, s32 arg2); -s32 sky_calculate_overexposure_component(s32 arg0, s32 arg1); Gfx *sky_render_overexposure(Gfx *gdl); #endif diff --git a/src/include/game/smoke.h b/src/include/game/smoke.h index 26368f921..83791e72c 100644 --- a/src/include/game/smoke.h +++ b/src/include/game/smoke.h @@ -10,10 +10,7 @@ void smoke_reset(void); void smoke_stop(void); -Gfx *smoke_render_part(struct smoke *smoke, struct smokepart *part, Gfx *gdl, struct coord *coord, f32 size); -struct smoke *smoke_create(struct coord *pos, RoomNum *rooms, s16 type); bool smoke_create_for_hand(struct coord *pos, RoomNum *rooms, s16 type, s32 handnum); -bool smoke_create_with_source(void *source, struct coord *pos, RoomNum *rooms, s16 type, bool srcispadeffect); void smoke_create_at_prop(struct prop *prop, s16 type); void smoke_create_at_pad_effect(struct padeffectobj *effect, struct coord *pos, RoomNum *rooms, s16 type); void smoke_clear_for_prop(struct prop *prop); diff --git a/src/include/game/sparks.h b/src/include/game/sparks.h index e8ca34751..f54f5a673 100644 --- a/src/include/game/sparks.h +++ b/src/include/game/sparks.h @@ -8,8 +8,6 @@ void sparks_reset(void); void sparks_tick(void); -void spark_create(struct coord *pos, struct sparktype *type); -void sparkgroup_ensure_free_spark_slot(struct sparkgroup *group); void sparks_create(s32 room, struct prop *prop, struct coord *pos, struct coord *arg3, struct coord *dir, s32 type); Gfx *sparks_render(Gfx *gdl); diff --git a/src/include/game/splat.h b/src/include/game/splat.h index 96a7c7415..e61d35829 100644 --- a/src/include/game/splat.h +++ b/src/include/game/splat.h @@ -6,7 +6,6 @@ void splat_tick_chr(struct prop *prop); void splats_create_for_chr_hit(struct prop *prop, struct shotdata *arg1, struct coord *arg2, struct coord *arg3, s32 arg4, s32 arg5, struct chrdata *arg6); -s32 splats_create(s32 qty, f32 arg1, struct prop *prop, struct shotdata *arg3, struct coord *arg4, struct coord *arg5, bool isskedar, s32 arg7, s32 arg8, struct chrdata *arg9, s32 arg10); void splats_tick(void); void splat_reset_chr(struct chrdata *chr); diff --git a/src/include/game/stars.h b/src/include/game/stars.h index 50c843a94..499f06af0 100644 --- a/src/include/game/stars.h +++ b/src/include/game/stars.h @@ -4,8 +4,6 @@ #include "data.h" #include "types.h" -void stars0f135c70(void); -void star_insert(s32 arg0, struct coord *arg1); void stars_reset(void); Gfx *stars_render(Gfx *gdl); diff --git a/src/include/game/stubs/game_175f50.h b/src/include/game/stubs/game_175f50.h index c7a874e3f..52afa93b4 100644 --- a/src/include/game/stubs/game_175f50.h +++ b/src/include/game/stubs/game_175f50.h @@ -6,7 +6,5 @@ void stub0f175f50(void); void stub0f175f58(s32 arg0, u8 *dst, u32 numwords); -bool stub0f175f68(s32 arg0, s32 arg1); -void stub0f175f78(s32 arg0, s32 arg1, s32 arg2); #endif diff --git a/src/include/game/tex.h b/src/include/game/tex.h index 9d6cb8a18..13bf0a99e 100644 --- a/src/include/game/tex.h +++ b/src/include/game/tex.h @@ -12,19 +12,11 @@ void tex_set_bitstring(u8 *arg0); s32 tex_read_bits(s32 arg0); void tex_reset(void); -s32 tex_get_mask(s32 value); -s32 tex0f0b33f8(s32 width, s32 height, s32 lod); -s32 tex0f0b3468(s32 width, s32 height, s32 lod); -s32 tex0f0b34d8(s32 width, s32 height, s32 lod); -s32 tex0f0b3548(s32 width, s32 height, s32 lod); -void tex_set_render_mode(Gfx **gdlptr, s32 arg1, s32 numcycles, s32 arg3); void tex_load_from_config(struct textureconfig *config); void tex_select(Gfx **gdl, struct textureconfig *tconfig, u32 arg2, s32 arg3, u32 ulst, bool arg5, struct texpool *pool); s32 tex_get_width_at_lod(struct tex *tex, s32 lod); s32 tex_get_height_at_lod(struct tex *tex, s32 lod); -s32 tex_get_line_size_in_bytes(struct tex *tex, s32 lod); -s32 tex_get_size_in_bytes(struct tex *tex, s32 lod); void tex_get_depth_and_size(struct tex *tex, s32 *arg1, s32 *arg2); s32 tex_load_from_gdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpool *pool, u8 *vtxstart); void tex_copy_gdls(Gfx *src, Gfx *dst, s32 numbytes); diff --git a/src/include/game/texdecompress.h b/src/include/game/texdecompress.h index 54cc0094a..38ddff8f9 100644 --- a/src/include/game/texdecompress.h +++ b/src/include/game/texdecompress.h @@ -4,32 +4,8 @@ #include "data.h" #include "types.h" -void func0f16e810(u32 arg0); -s32 tex_inflate_zlib(u8 *src, u8 *dst, bool arg2, s32 forcenumimages, struct texpool *pool, s32 unusedarg); -s32 tex_align_indices(u8 *arg0, s32 width, s32 height, s32 format, u8 *dst); -s32 tex_get_average_red(u16 colour1, u16 colour2, u16 colour3, u16 colour4); -s32 tex_get_average_green(u16 colour1, u16 colour2, u16 colour3, u16 colour4); -s32 tex_get_average_blue(u16 colour1, u16 colour2, u16 colour3, u16 colour4); -s32 tex_get_average_alpha(u16 colour1, u16 colour2, u16 colour3, u16 colour4); -s32 tex_shrink_paletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, u16 *palette, s32 numcolours); -s32 tex_find_closest_colour_index_r_g_b_a(u8 *palette, s32 numcolours, s32 r, s32 g, s32 b, s32 a); -s32 tex_find_closest_colour_index_i_a(u16 *palette, s32 numcolours, s32 intensity, s32 alpha); -s32 tex_inflate_non_zlib(u8 *src, u8 *dst, s32 arg2, s32 forcenumimages, struct texpool *pool, s32 unusedarg); -s32 tex_shrink_non_paletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format); -void tex_inflate_huffman(u8 *dst, s32 numiterations, s32 chansize); -void tex_inflate_rle(u8 *arg0, s32 arg1); -s32 tex_build_lookup(u8 *arg0, s32 bpp); -s32 tex_get_bit_size(s32 arg0); -void tex_read_alpha_bits(u8 *dst, s32 count); -s32 tex_read_uncompressed(u8 *dst, s32 width, s32 height, s32 format); -s32 tex_channels_to_pixels(u8 *src, s32 width, s32 height, u8 *dst, s32 format); -s32 tex_inflate_lookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, s32 format); -s32 tex_inflate_lookup_from_buffer(u8 *src, s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, s32 format); -void tex_swizzle(u8 *arg0, s32 width, s32 height, s32 format); -void tex_blur(u8 *pixels, s32 width, s32 height, s32 method, s32 chansize); void tex_init_pool(struct texpool *pool, u8 *start, s32 len); struct tex *tex_find_in_pool(s32 texturenum, struct texpool *pool); -s32 tex_get_pool_free_bytes(struct texpool *pool); u8 *tex_get_pool_left_pos(struct texpool *pool); void tex_load_from_display_list(Gfx *gdl, struct texpool *pool, s32 arg2); void tex_load(s32 *updateword, struct texpool *pool, bool unusedarg); diff --git a/src/include/game/timing.h b/src/include/game/timing.h index 4692805e4..c84c60f8a 100644 --- a/src/include/game/timing.h +++ b/src/include/game/timing.h @@ -5,7 +5,6 @@ #include "types.h" void frametime_init(void); -void frametime_apply(s32 diffframe60, s32 diffframe240, s32 frametime); void frametime_calculate(void); void func0f16cf94(void); diff --git a/src/include/game/title.h b/src/include/game/title.h index 3dfce006d..cd30ca952 100644 --- a/src/include/game/title.h +++ b/src/include/game/title.h @@ -17,38 +17,6 @@ void title_reset(void); Gfx *title_clear(Gfx *gdl); char *mp_player_get_weapon_of_choice_name(u32 playernum, u32 slot); -void title_set_light(Lights1 *light, u8 r, u8 g, u8 b, f32 luminosity, struct coord *dir); -void title_init_legal(void); -void title_tick_legal(void); -void title_init_check_controllers(void); -void title_exit_check_controllers(void); -void title_tick_check_controllers(void); -Gfx *title_render_check_controllers(Gfx *gdl); -Gfx *title_render_legal(Gfx *gdl); -void title_init_pd_logo(void); -void title_exit_pd_logo(void); -void title_tick_pd_logo(void); -Gfx *title_render_pd_logo_model(Gfx *gdl, struct model *model, s32 arg2, f32 arg3, s32 arg4, f32 arg5, Mtxf *arg6, Vtx *vertices, Col *colours); -void title_skip_to_pd_title(void); -Gfx *title_render_pd_logo(Gfx *gdl); -void title_init_rare_presents(void); -void title_exit_rare_presents(void); -void title_tick_rare_presents(void); -Gfx *title_render_typewriter_text(Gfx *gdl, s32 *x, s32 *y, u16 textnum, s32 timer, s32 *colourcomponent); -Gfx *title_render_rare_presents(Gfx *gdl); -void title_init_nintendo_logo(void); -void title_exit_nintendo_logo(void); -void title_tick_nintendo_logo(void); -Gfx *title_render_nintendo_logo(Gfx *gdl); -void title_init_rare_logo(void); -void title_exit_rare_logo(void); -void title_tick_rare_logo(void); -f32 func0f019d0c(f32 arg0); -Gfx *title_render_rare_logo(Gfx *gdl); -void title_init_skip(void); -void title_init_no_controller(void); -void title_tick_no_controller(void); -Gfx *title_render_no_controller(Gfx *gdl); void title_set_next_mode(s32 mode); void title_tick(void); bool title_is_changing_mode(void); @@ -59,9 +27,7 @@ bool func0f01ad5c(void); void func0f01adb8(void); void title_tick_old(void); Gfx *title_render(Gfx *gdl); -void title_exit_legal(void); s32 get_num_players(void); void set_num_players(s32 numplayers); -void title_exit_no_controller(void); #endif diff --git a/src/include/game/training.h b/src/include/game/training.h index 6b477b067..d084c22fd 100644 --- a/src/include/game/training.h +++ b/src/include/game/training.h @@ -13,87 +13,55 @@ extern u8 g_DtSlot; bool ci_is_tour_done(void); u8 ci_get_firing_range_score(s32 weaponindex); -void fr_save_score_if_best(s32 weaponindex, s32 difficulty); u8 fr_is_weapon_found(s32 weapon); void fr_set_weapon_found(s32 weaponnum); -s32 ci_is_stage_complete(s32 stageindex); bool func0f19cbcc(s32 weapon); -bool fr_is_weapon_available(s32 weapon); u32 fr_get_weapon_index_by_weapon(u32 weaponnum); -u32 fr_get_weapon_script_index(u32 weaponnum); s32 fr_is_classic_weapon_unlocked(u32 weapon); s32 fr_get_slot(void); void fr_set_slot(s32 slot); u32 fr_get_weapon_by_slot(s32 slot); s32 fr_get_num_weapons_available(void); -void fr_init_lighting(void); -void fr_restore_lighting(void); void fr_reset(void); -void *fr_load_rom_data(u32 len); void fr_set_difficulty(s32 difficulty); u32 fr_get_difficulty(void); -void fr_init_defaults(void); struct frdata *fr_get_data(void); -u32 fr_resolve_fr_pad(u32 arg0); -bool fr_is_difficulty(u32 difficulties); -void fr_execute_weapon_script(s32 scriptindex); -void fr_set_target_props(void); -bool fr_target_is_at_script_start(s32 targetnum); -char *fr_get_instructional_text(u32 index); -void fr_execute_help_script(void); -bool fr_execute_target_script(s32 targetnum); -void fr_hide_all_targets(void); -void fr_init_targets(void); -void fr_close_and_lock_door(void); -void fr_unlock_door(void); void fr_load_data(void); u32 fr_init_ammo(s32 weapon); void fr_begin_session(s32 weapon); char *fr_get_weapon_description(void); void fr_end_session(bool hidetargets); -bool fr_was_too_inaccurate(void); -void fr_set_fail_reason(s32 failreason); -void fr_set_completed(void); bool fr_is_target_one_hit_explodable(struct prop *prop); -f32 fr_get_target_angle_to_pos(struct coord *a, f32 angle, struct coord *b); bool fr_is_target_facing_pos(struct prop *prop, struct coord *pos); struct prop *fr_choose_autogun_target(struct coord *autogunpos); -bool fr_is_ammo_wasted(void); void fr_tick(void); void func0f1a0924(struct prop *prop); bool fr_choose_farsight_target(void); s32 fr_is_in_training(void); void fr_calculate_hit(struct defaultobj *obj, struct coord *hitpos, f32 maulercharge); void fr_increment_num_shots(void); -bool ci_is_chr_bio_unlocked(u32 bodynum); struct chrbio *ci_get_chr_bio_by_bodynum(u32 bodynum); char *ci_get_chr_bio_description(void); s32 ci_get_num_unlocked_chr_bios(void); s32 ci_get_chr_bio_bodynum_by_slot(s32 slot); struct miscbio *ci_get_misc_bio(s32 index); -bool ci_is_misc_bio_unlocked(s32 index); s32 ci_get_num_unlocked_misc_bios(void); s32 ci_get_misc_bio_index_by_slot(s32 slot); char *ci_get_misc_bio_description(void); -bool ci_is_hangar_bio_a_vehicle(s32 index); struct hangarbio *ci_get_hangar_bio(s32 index); -bool ci_is_hangar_bio_unlocked(u32 bioindex); s32 ci_get_num_unlocked_location_bios(void); s32 ci_get_num_unlocked_hangar_bios(void); s32 ci_get_hangar_bio_index_by_slot(s32 slot); char *ci_get_hangar_bio_description(void); struct trainingdata *dt_get_data(void); -void dt_restore_player(void); void dt_push_endscreen(void); void dt_tick(void); void func0f1a1ac0(void); void dt_begin(void); void dt_end(void); -bool dt_is_available(s32 deviceindex); s32 dt_get_num_available(void); s32 dt_get_index_by_slot(s32 wantindex); u32 dt_get_weapon_by_device_index(s32 deviceindex); -u32 ci_get_stage_flag_by_device_index(u32 deviceindex); char *dt_get_description(void); char *dt_get_tip1(void); char *dt_get_tip2(void); @@ -103,35 +71,17 @@ void ht_tick(void); void func0f1a2198(void); void ht_begin(void); void ht_end(void); -bool ht_is_unlocked(u32 value); s32 ht_get_num_unlocked(void); s32 ht_get_index_by_slot(s32 slot); char *ht_get_name(s32 index); -u32 func0f1a25c0(s32 index); char *ht_get_description(void); char *ht_get_tip1(void); char *ht_get_tip2(void); #if VERSION >= VERSION_JPN_FINAL -void fr_get_goal_targets_text(char *buffer1, char *buffer2); -void fr_get_goal_score_text(char *buffer1, char *buffer2); -bool fr_get_min_accuracy(char *buffer1, f32 accuracy, char *buffer2); -bool fr_get_hud_middle_subtext(char *buffer1, char *buffer2); -bool fr_get_feedback(char *score, char *zone, char *extrabuffer); -Gfx *fr_render_hud_element(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, char *string3, u32 colour, u8 alpha); #else -void fr_get_goal_targets_text(char *buffer); -void fr_get_goal_score_text(char *buffer); -bool fr_get_min_accuracy(char *buffer, f32 accuracy); -bool fr_get_hud_middle_subtext(char *buffer); -bool fr_get_feedback(char *score, char *zone); -Gfx *fr_render_hud_element(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u32 colour, u8 alpha); #endif -void fr_get_targets_destroyed_value(char *buffer); -void fr_get_score_value(char *buffer); -f32 fr_get_accuracy(char *buffer); -bool fr_format_time(char *buffer); Gfx *fr_render_hud(Gfx *gdl); #endif diff --git a/src/include/game/trainingmenus.h b/src/include/game/trainingmenus.h index 00fade9c2..cabd3d214 100644 --- a/src/include/game/trainingmenus.h +++ b/src/include/game/trainingmenus.h @@ -4,58 +4,6 @@ #include "data.h" #include "types.h" -char *fr_menu_text_fail_reason(struct menuitem *item); -char *fr_menu_text_difficulty_name(struct menuitem *item); -char *fr_menu_text_time_taken_value(struct menuitem *item); -char *fr_menu_text_score_value(struct menuitem *item); -char *fr_menu_text_weapon_name(struct menuitem *item); -char *fr_menu_text_targets_destroyed_value(struct menuitem *item); -char *fr_menu_text_accuracy_value(struct menuitem *item); -char *fr_menu_text_goal_score_label(struct menuitem *item); -char *fr_menu_text_goal_score_value(struct menuitem *item); -char *fr_menu_text_min_accuracy_or_targets_label(struct menuitem *item); -char *fr_menu_text_min_accuracy_or_targets_value(struct menuitem *item); -char *fr_menu_text_time_limit_label(struct menuitem *item); -char *fr_menu_text_time_limit_value(struct menuitem *item); -char *fr_menu_text_ammo_limit_label(struct menuitem *item); -char *fr_menu_text_ammo_limit_value(struct menuitem *item); -char *ci_menu_text_chr_bio_name(struct menuitem *item); -char *ci_menu_text_chr_bio_age(struct menuitem *item); -char *ci_menu_text_chr_bio_race(struct menuitem *item); -char *ci_menu_text_misc_bio_name(struct menuitem *item); -char *dt_menu_text_name(struct menuitem *item); -char *dt_menu_text_ok_or_resume(struct menuitem *item); -char *dt_menu_text_cancel_or_abort(struct menuitem *item); -char *dt_menu_text_time_taken_value(struct menuitem *item); -char *ht_menu_text_name(struct menuitem *item); -char *ht_menu_text_ok_or_resume(struct menuitem *item); -char *ht_menu_text_cancel_or_abort(struct menuitem *item); -char *ht_menu_text_time_taken_value(struct menuitem *item); -char *bio_menu_text_name(struct menuitem *item); -char *ci_menu_text_hangar_bio_subheading(struct menuitem *item); struct menudialogdef *ci_get_fr_weapon_list_menu_dialog(void); -MenuDialogHandlerResult fr_training_info_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult fr_training_stats_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult ci_character_profile_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult dt_training_details_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult menudialog_device_training_results(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult menudialog001a6aa4(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult menudialog_firing_range_results(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult ci_hangar_holograph_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult fr_details_ok_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult fr_abort_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult fr_weapon_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult fr_scoring_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_fr_failed_continue(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult ci_office_information_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult dt_device_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler_dt_ok_or_resume(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler001a6514(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult ht_holo_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler001a6a34(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandler001a6a70(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult ci_hangar_information_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult ci_hangar_title_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult fr_difficulty_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); #endif diff --git a/src/include/game/utils.h b/src/include/game/utils.h index 1a266fe92..aa33f276d 100644 --- a/src/include/game/utils.h +++ b/src/include/game/utils.h @@ -4,7 +4,6 @@ #include "data.h" #include "types.h" -void func0f176d70(s32 arg0); u32 align4(u32 arg0); u32 align16(u32 arg0); u32 align32(u32 arg0); @@ -13,11 +12,8 @@ void func0f1770ac(struct coord *a, struct coord *b, struct coord *out); bool func0f177164(struct coord *arg0, struct coord *arg1, u32 line, char *file); bool func0f1773c8(struct coord *a, struct coord *b); f32 coords_get_distance(struct coord *a, struct coord *b); -f32 func0f1776cc(struct coord *a, struct coord *b, struct coord *c); -bool func0f17776c(struct coord *a, struct coord *b, f32 mult, struct coord *out); void utils_reset(void); s32 func0f177a54(u8 *arg0, s32 arg1, u8 *arg2, s32 arg3); -s32 func0f177bb4(u8 *arg0, s32 *arg1, s32 *arg2); s32 func0f177c8c(u8 *arg0, s32 *arg1, s32 *roomnum); #endif diff --git a/src/include/game/vtxstore.h b/src/include/game/vtxstore.h index b807562ee..6c1c4580e 100644 --- a/src/include/game/vtxstore.h +++ b/src/include/game/vtxstore.h @@ -6,7 +6,6 @@ void vtxstore_reset(void); -void vtxstore_fix_refs(void *find, void *replacement); void vtxstore_tick(void); void *vtxstore_allocate(s32 count, s32 index, struct modelnode *node, s32 level); void vtxstore_free(s32 type, void *arg1); diff --git a/src/include/game/wallhit.h b/src/include/game/wallhit.h index 0b961c1f0..217c4742f 100644 --- a/src/include/game/wallhit.h +++ b/src/include/game/wallhit.h @@ -6,14 +6,9 @@ void wallhit_reset(void); -s16 wallhit_finalise_axis(f32 arg0); -void wallhit_free(struct wallhit *wallhit); void wallhits_free_by_prop(struct prop *prop, s8 layer); bool chr_is_using_paintball(struct chrdata *chr); void wallhit_choose_blood_colour(struct prop *prop); -void wallhit_fade(struct wallhit *wallhit, u32 arg1); -bool wallhit_remove_one_in_room(s32 arg0); -void wallhit_remove_one(void); void wallhits_tick(void); void wallhit_create(struct coord *relpos, struct coord *arg1, struct coord *arg2, s16 arg3[3], diff --git a/src/include/game/weather.h b/src/include/game/weather.h index 519175469..3d3976d3d 100644 --- a/src/include/game/weather.h +++ b/src/include/game/weather.h @@ -9,18 +9,11 @@ void weather_reset(void); void weather_tick(void); Gfx *weather_render(Gfx *gdl); -void weather_set_boundaries(struct weatherparticledata *data, s32 index, f32 min, f32 max); struct weatherparticledata *weather_allocate_particles(void); -void func0f131610(struct weatherdata *weather); -void func0f131678(s32 arg0); -void weather_set_intensity(s32 intensity); void weather_tick_rain(struct weatherdata *weather); void weather_tick_snow(struct weatherdata *weather); void weather_configure_rain(u32 intensity); void weather_configure_snow(u32 intensity); -bool weather_is_room_weather_proof(s32 room); -Gfx *weather_render_rain(Gfx *gdl, struct weatherdata *weather, s32 arg2); -Gfx *weather_render_snow(Gfx *gdl, struct weatherdata *weather, s32 arg2); void weather_stop(void); #endif diff --git a/src/include/game/zbuf.h b/src/include/game/zbuf.h index 70d0f1a57..f0f7d3303 100644 --- a/src/include/game/zbuf.h +++ b/src/include/game/zbuf.h @@ -6,7 +6,6 @@ void *zbuf_get_allocation(void); void zbuf_reset(s32 stagenum); -void zbuf_allocate(void); void zbuf_swap(void); Gfx *zbuf_configure_rdp(Gfx *gdl); Gfx *zbuf_clear(Gfx *gdl); diff --git a/src/include/lib/anim.h b/src/include/lib/anim.h index 8f4605e13..60df0b2c0 100644 --- a/src/include/lib/anim.h +++ b/src/include/lib/anim.h @@ -5,20 +5,15 @@ #include "types.h" void anims_init(void); -void anims_init_tables(void); void anims_reset(void); s32 anim_get_num_frames(s16 anim_id); bool anim_has_frames(s16 animnum); s32 anim_get_num_animations(void); -u8 *anim_dma(u8 *dst, u32 segoffset, u32 len); s32 anim_get_remapped_frame(s16 animnum, s32 frame); -bool anim_remap_frame_for_load(s16 animnum, s32 frame, s32 *frameptr); bool anim_is_frame_cut_skipped(s16 animnum, s32 frame); u8 anim_load_frame(s16 animnum, s32 framenum); void anim_forget_frame_births(void); void anim_load_header(s16 animnum); -s32 anim_read_bits(u8 *ptr, u8 readbitlen, u32 bitoffset); -s32 anim_read_signed_short(u8 *arg0, u8 arg1, s32 arg2); void anim_get_rot_translate_scale(s32 part, bool flip, struct skeleton *skel, s16 animnum, u8 frameslot, struct coord *rot, struct coord *translate, struct coord *scale); u16 anim_get_pos_angle_as_int(s32 part, bool flip, struct skeleton *skel, s16 animnum, s32 framenum, s16 inttranslate[3], bool use_cache); f32 anim_get_translate_angle(s32 part, bool flip, struct skeleton *skel, s16 animnum, s32 framenum, struct coord *pos, bool arg6); diff --git a/src/include/lib/args.h b/src/include/lib/args.h index 6bfd2fa65..0cd8e29ab 100644 --- a/src/include/lib/args.h +++ b/src/include/lib/args.h @@ -4,7 +4,6 @@ #include "data.h" #include "types.h" -char *arg_parse_string(char *str); void arg_set_string(char *string); s32 args_parse_debug_args(void); char *arg_find_by_prefix(s32 occurrence, char *string); diff --git a/src/include/lib/boot.h b/src/include/lib/boot.h index 2b2a9bb0a..d5bf53e3f 100644 --- a/src/include/lib/boot.h +++ b/src/include/lib/boot.h @@ -5,7 +5,6 @@ void boot(void); s32 boot_get_mem_size(void); void *boot_allocate_stack(s32 threadid, s32 size); -void boot_create_threads(void *arg); void boot_check_stack_overflow(void); #endif diff --git a/src/include/lib/collision.h b/src/include/lib/collision.h index 498ebde39..40050234a 100644 --- a/src/include/lib/collision.h +++ b/src/include/lib/collision.h @@ -5,7 +5,6 @@ #include "types.h" f32 func0f1577f0(f32 arg0[2], f32 arg1[2], f32 arg2[2], f32 arg3[2]); -f32 func0f1578c8(struct widthxz *arg0, struct xz *arg1, struct xz *arg2); f32 func0f1579cc(struct widthxz *arg0, struct xz *arg1, struct xz *arg2, struct xz *arg3); f32 cd_00024e40(void); @@ -18,9 +17,6 @@ void cd_get_obstacle_normal(struct coord *normal); u32 cd_get_geo_flags(void); void cd_set_saved_pos(struct coord *pos1, struct coord *pos2); bool cd_get_saved_pos(struct coord *arg0, struct coord *arg1); -void cd_get_geo_normal(struct geo *geo, struct coord *normal); -void cd_get_floor_col(struct geo *tile, u16 *floorcol); -void cd_get_floor_type(struct geo *tile, u8 *floortype); bool cd_000266a4(f32 x, f32 z, struct geo *tile); void cd_get_props_on_platform(struct prop *platform, s16 *propnums, s32 len); s32 cd_000274e0_block(struct geoblock *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collision *collision); diff --git a/src/include/lib/crash.h b/src/include/lib/crash.h index c1a5b28a3..938803aca 100644 --- a/src/include/lib/crash.h +++ b/src/include/lib/crash.h @@ -95,18 +95,7 @@ extern bool g_CrashEnabled; void crash_set_message(char *string); void crash_create_thread(void); -u32 crash_get_parent_stack_frame(u32 *ptr, u32 *start, u32 sp, u32 *regs); -bool crash_is_return_address(u32 *instruction); -u32 crash_get_stack_end(u32 sp, s32 tid); -u32 crash_get_stack_start(u32 arg0, s32 tid); -bool crash_is_double(f32 value); -void crash_print_float(s32 index, f32 arg1); -void crash_print_2_floats(s32 index, f32 value1, f32 value2); -void crash_print_3_floats(s32 index, f32 value1, f32 value2, f32 value3); -void crash_put_char(s32 x, s32 y, char c); void crash_append_char(char c); -void crash_scroll(s32 numlines); -void crash_render_char(s32 x, s32 y, char c); void crash_reset(void); void crash_render_frame(u16 *fb); diff --git a/src/include/lib/debughud.h b/src/include/lib/debughud.h index 8481ba39b..21848cb35 100644 --- a/src/include/lib/debughud.h +++ b/src/include/lib/debughud.h @@ -4,14 +4,12 @@ #include "data.h" #include "types.h" -void dhud_put_char_at(s32 x, s32 y, char c); void dhud_init(void); void dhud_reset(void); void dhud_clear(void); void dhud_set_pos(s32 x, s32 y); void dhud_set_fg_colour(s32 r, s32 g, s32 b, s32 a); void dhud_set_bg_colour(s32 r, s32 g, s32 b, s32 a); -void dhud_print_char(u8 c); void dhud_print_string(char *text); Gfx *dhud_render(Gfx *gdl); diff --git a/src/include/lib/dma.h b/src/include/lib/dma.h index e56c974bd..c499d694f 100644 --- a/src/include/lib/dma.h +++ b/src/include/lib/dma.h @@ -5,8 +5,6 @@ #include "types.h" void dma_init(void); -void dma_start(void *memaddr, u32 romaddr, u32 len, bool priority); -void dma_check_piracy(void *memaddr, u32 len); void dma_wait(void); void dma_exec(void *memaddr, u32 romaddr, u32 len); void dma_exec_high_priority(void *memaddr, u32 romaddr, u32 len); diff --git a/src/include/lib/joy.h b/src/include/lib/joy.h index d81517cad..ececfec69 100644 --- a/src/include/lib/joy.h +++ b/src/include/lib/joy.h @@ -17,12 +17,8 @@ void joy_set_pfs_temporarily_plugged(s8 index); void joy_init(void); void joy_disable_temporarily(void); void joy_reset(void); -void joy00013e84(void); u32 joy_get_connected_controllers(void); -void joy00014238(void); void joy_debug_joy(void); -s32 joy_start_read_data(OSMesgQueue *mq); -void joy_read_data(void); void joys_handle_retrace(void); void joy00014810(bool value); s32 joy_get_num_samples(void); @@ -50,7 +46,5 @@ void joy_destroy(void); void joy_get_contpad_nums_for_player(s8 playernum, s32 *pad1, s32 *pad2); void joy_stop_rumble(s8 device, bool disablepolling); s32 joy_get_pak_state(s8 device); -s32 joy_get_pak_state2(s8 device); -void joys_tick_rumble(void); #endif diff --git a/src/include/lib/lib_317f0.h b/src/include/lib/lib_317f0.h index 0cdd829f5..f59b9ad07 100644 --- a/src/include/lib/lib_317f0.h +++ b/src/include/lib/lib_317f0.h @@ -4,16 +4,11 @@ #include "data.h" #include "types.h" -void func00033090(struct sndstate *handle); -void func00033100(struct sndstate *state); -u16 sndpCountStates(s16 *numfreeptr, s16 *numallocedptr); void sndpSetAddRefCallback(void *fn); -struct sndstate *func00033390(s32 arg0, ALSound *sound); void sndpSetRemoveRefCallback(void *fn); s32 sndGetState(struct sndstate *handle); struct sndstate *func00033820(s32 arg0, s16 soundnum, u16 vol, ALPan pan, f32 pitch, u8 fxmix, u8 fxbus, struct sndstate **handleptr); void audioStop(struct sndstate *handle); -void func00033bc0(struct sndstate *handle); void func00033db0(void); void func00033dd8(void); void audioPostEvent(struct sndstate *handle, s16 type, s32 data); diff --git a/src/include/lib/lib_34240.h b/src/include/lib/lib_34240.h index 6ad994d8d..3776fefa7 100644 --- a/src/include/lib/lib_34240.h +++ b/src/include/lib/lib_34240.h @@ -4,7 +4,5 @@ #include "data.h" #include "types.h" -void func00034f0c(N_ALCSPlayer *seqp, u8 channel); -void func00034fb8(N_ALCSPlayer *seqp, u8 channel); #endif diff --git a/src/include/lib/lib_3e8c0.h b/src/include/lib/lib_3e8c0.h index 5771bbe34..63672b0f9 100644 --- a/src/include/lib/lib_3e8c0.h +++ b/src/include/lib/lib_3e8c0.h @@ -5,12 +5,6 @@ #include "types.h" bool mp3dec_init(void); -bool mp3dec00040164(struct asistream *stream, u32 gr, u32 ch); -bool mp3dec_unpack_scale_fac(struct asistream *stream, u32 gr, u32 ch); -bool mp3dec00041600(struct asistream *stream, u32 gr, u32 ch); -bool mp3dec00042238(struct asistream *stream, u32 gr, u32 ch); -bool mp3dec000427d8(struct asistream *stream, u32 gr); -bool mp3dec_reduce_aliases(struct asistream *stream, u32 gr, u32 ch); bool mp3dec_set_side_info(struct asistream *stream); bool mp3dec_decode_frame(struct asistream *stream); diff --git a/src/include/lib/main.h b/src/include/lib/main.h index 9da673011..82b560c81 100644 --- a/src/include/lib/main.h +++ b/src/include/lib/main.h @@ -10,11 +10,9 @@ void main_init(void); void main_proc(void); void main_override_variable(char *name, void *value); void main_loop(void); -void main_tick(void); void main_end_stage(void); void main_change_to_stage(s32 stagenum); void func0000e990(void); -void func0000e9c0(void); s32 main_get_stage_num(void); #endif diff --git a/src/include/lib/mema.h b/src/include/lib/mema.h index 9bd72cb4a..66cec9fa7 100644 --- a/src/include/lib/mema.h +++ b/src/include/lib/mema.h @@ -9,7 +9,6 @@ void mema_init(void); void mema_reset(void *ptr, u32 size); void mema_print(void); void *mema_alloc(u32 size); -s32 mema_grow(s32 addr, u32 amount); void _mema_free(s32 addr, s32 size); void mema_free(void *addr, s32 size); s32 mema_get_longest_free(void); diff --git a/src/include/lib/model.h b/src/include/lib/model.h index 6904e389c..5d505796c 100644 --- a/src/include/lib/model.h +++ b/src/include/lib/model.h @@ -24,7 +24,6 @@ void *model_get_part_rodata(struct modeldef *modeldef, s32 partnum); f32 model_get_screen_distance(struct model *model); void *model_get_node_rw_data(struct model *model, struct modelnode *node); void model_node_get_position(struct model *model, struct modelnode *node, struct coord *pos); -void model_node_set_position(struct model *model, struct modelnode *node, struct coord *pos); void model_get_root_position(struct model *model, struct coord *pos); void model_set_root_position(struct model *model, struct coord *pos); void model_node_get_model_relative_position(struct model *model, struct modelnode *node, struct coord *pos); @@ -33,26 +32,13 @@ void model_set_chr_rot_y(struct model *model, f32 angle); void model_set_scale(struct model *model, f32 scale); void model_set_anim_scale(struct model *model, f32 scale); f32 model_get_effective_scale(struct model *model); -void model_tween_pos(struct coord *pos, struct coord *to, f32 frac); f32 model_tween_rot_axis(f32 arg0, f32 angle, f32 frac); -void model_tween_rot(struct coord *arg0, struct coord *arg1, f32 mult); -void model_update_chr_info(struct model *model, struct modelnode *node); void model_update_info(struct model *model); -void model_update_chr_node_mtx(struct modelrenderdata *arg0, struct model *model, struct modelnode *node); -void model_position_joint_using_vec_rot(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node, struct coord *rot, struct coord *pos, bool allowscale, struct coord *arg6); -void model_position_joint_using_quat_rot(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node, f32 rot[4], struct coord *pos, struct coord *arg5); -void model_update_position_node_mtx(struct modelrenderdata *arg0, struct model *model, struct modelnode *node); -void model_update_position_held_node_mtx(struct modelrenderdata *arg0, struct model *model, struct modelnode *node); -void model_update_distance_relations(struct model *model, struct modelnode *node); void model_apply_distance_relations(struct model *model, struct modelnode *node); void model_apply_toggle_relations(struct model *model, struct modelnode *node); void model_apply_head_relations(struct model *model, struct modelnode *node); -void model_apply_reorder_relations_by_arg(struct modelnode *basenode, bool reverse); -void model_apply_reorder_relations(struct model *model, struct modelnode *node); -void model_update_reorder_relations(struct model *model, struct modelnode *node); void model_update_relations_quick(struct model *model, struct modelnode *node); void model_update_relations(struct model *model); -void model_update_matrices(struct modelrenderdata *arg0, struct model *model); void model_set_matrices(struct modelrenderdata *arg0, struct model *model); void model_set_matrices_with_anim(struct modelrenderdata *renderdata, struct model *model); s16 model_get_anim_num(struct model *model); @@ -62,9 +48,6 @@ f32 model_get_anim_end_frame(struct model *model); s32 model_get_num_anim_frames(struct model *model); f32 model_get_anim_speed(struct model *model); f32 model_get_abs_anim_speed(struct model *model); -s32 model_constrain_or_wrap_anim_frame(s32 frame, s16 animnum, f32 endframe); -void model_copy_anim_for_merge(struct model *model, f32 merge); -void model_set_animation2(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge); bool model_is_anim_merging(struct model *model); void model_set_animation_with_merge(struct model *model, s16 animnum, u32 flip, f32 startframe, f32 speed, f32 timemerge, bool domerge); void model_set_animation(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge); @@ -77,28 +60,15 @@ void model_set_anim_speed_auto(struct model *model, f32 arg1, f32 startframe); void model_set_anim_play_speed(struct model *model, f32 speed, f32 frame); void model_set_anim70(struct model *model, void *callback); void model_set_anim_frame(struct model *model, f32 startframe); -void model_set_anim_frame2(struct model *model, f32 arg1, f32 arg2); void model_set_anim_merging_enabled(bool value); bool model_is_anim_merging_enabled(void); -void model_set_anim_frame2_with_chr_stuff(struct model *model, f32 frame, f32 arg2, f32 frame2, f32 arg4); void model_tick_anim_quarter_speed(struct model *model, s32 lvupdate240, bool arg2); void model_tick_anim(struct model *model, s32 lvupdate240, bool arg2); -void model_apply_render_mode_type1(struct modelrenderdata *renderdata); -void model_apply_render_mode_type3(struct modelrenderdata *renderdata, bool arg1); -void model_apply_render_mode_type4(struct modelrenderdata *renderdata, bool arg1); -void model_apply_render_mode_type2(struct modelrenderdata *renderdata); -void model_apply_cull_mode(struct modelrenderdata *renderdata); -void model_render_node_gundl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node); void model_render_node_dl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node); -void model_render_node_star_gunfire(struct modelrenderdata *renderdata, struct modelnode *node); -void model_select_texture(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2); -void model_render_node_chr_gunfire(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node); void model_render(struct modelrenderdata *renderdata, struct model *model); bool model_test_bbox_node_for_hit(struct modelrodata_bbox *bbox, Mtxf *mtx, struct coord *arg2, struct coord *arg3); s32 model_test_for_hit(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode); -void model_promote_node_offsets_to_pointers(struct modelnode *node, u32 vma, u32 fileramaddr); void model_promote_offsets_to_pointers(struct modeldef *modeldef, u32 arg1, uintptr_t arg2); -s32 model_calculate_rw_data_indexes(struct modelnode *node); void model_allocate_rw_data(struct modeldef *modeldef); void model_init_rw_data(struct model *model, struct modelnode *node); void model_init(struct model *model, struct modeldef *modeldef, u32 *rwdatas, bool resetanim); diff --git a/src/include/lib/mp3.h b/src/include/lib/mp3.h index 681e27e05..b2f1fdbde 100644 --- a/src/include/lib/mp3.h +++ b/src/include/lib/mp3.h @@ -13,8 +13,5 @@ s32 func00037ea4(void); void func00037f08(s32 arg0, bool arg1); void func00037f5c(s32 arg0, bool arg1); s32 func00037fc0(s32 arg0, Acmd **cmd); -void func00038924(struct mp3vars *vars); -void func00038b90(void *fn); -void mp3_dma(void); #endif diff --git a/src/include/lib/mtx.h b/src/include/lib/mtx.h index 262d5fd36..1862cdb22 100644 --- a/src/include/lib/mtx.h +++ b/src/include/lib/mtx.h @@ -31,7 +31,6 @@ u32 mtx_get_obfuscated_rom_base(void); void mtx_f2l(Mtxf *src, Mtxf *dst); void mtx00016110(f32 mtx1[3][3], f32 mtx2[3][3]); void mtx00016140(f32 mtx1[3][3], f32 mtx2[3][3], f32 dst[3][3]); -void mtx000161b0(f32 arg0[3][3], f32 src[3], f32 dest[3]); void mtx00016208(f32 mtx[3][3], struct coord *coord); void mtx4_load_y_rotation_with_translation(struct coord *pos, f32 radians, Mtxf *mtx); void mtx4_load_x_rotation(f32 radians, Mtxf *mtx); @@ -59,9 +58,5 @@ void mtx000170e4(f32 src[4][4], f32 dst[4][4]); void mtx0001719c(f32 arg0[4][4], f32 arg1[4][4]); void mtx000172f0(f32 arg0[4][4], f32 arg1[4][4]); void mtx00017588(f32 arg0[4][4], f32 arg1[4][4]); -void mtx00017614(f32 arg0[4][4], f32 arg1[4][4]); -f32 mtx00017a78(f32 arg0[4][4]); -f32 mtx00017c2c(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8); -f32 mtx00017cbc(f32 arg0, f32 arg1, f32 arg2, f32 arg3); #endif diff --git a/src/include/lib/music.h b/src/include/lib/music.h index 825a9c149..952a4e046 100644 --- a/src/include/lib/music.h +++ b/src/include/lib/music.h @@ -4,11 +4,6 @@ #include "data.h" #include "types.h" -s32 music_handle_play_event(struct musicevent *event, s32 result); -s32 music_handle_stop_event(struct musicevent *event, s32 result); -s32 music_handle_fade_event(struct musicevent *event, s32 result); -s32 music_handle_stop_all_event(s32 result); -s32 music_handle_set_interval_event(struct musicevent *event, s32 result); void music_tick_events(void); void music_tick(void); diff --git a/src/include/lib/reset.h b/src/include/lib/reset.h index ceb59067f..ed9ace680 100644 --- a/src/include/lib/reset.h +++ b/src/include/lib/reset.h @@ -2,7 +2,6 @@ #define _IN_BOOT_RESET_H #include -void resetproc(void *data); void reset_thread_create(void); #endif diff --git a/src/include/lib/sched.h b/src/include/lib/sched.h index c7d77b77b..1a3de3a98 100644 --- a/src/include/lib/sched.h +++ b/src/include/lib/sched.h @@ -14,14 +14,11 @@ void __scAppendList(OSSched *sc, OSScTask *t); void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp); void __scMain(void *arg); void __scYield(OSSched *sc); -void sched_init_artifacts(void); void sched_reset_artifacts(void); struct artifact *sched_get_write_artifacts(void); struct artifact *sched_get_front_artifacts(void); void sched_increment_write_artifacts(void); void sched_increment_front_artifacts(void); -void sched_update_pending_artifacts(void); -void sched_consider_screenshot(void); void sched_set_crashed_unexpectedly(bool enable); #endif diff --git a/src/include/lib/segments.h b/src/include/lib/segments.h index 44243e4c8..50f4085a9 100644 --- a/src/include/lib/segments.h +++ b/src/include/lib/segments.h @@ -2,11 +2,6 @@ #define _IN_BOOT_SEGMENTS_H #include -void *seg_get_data_start(void); -void *seg_get_datazip_rom_start(void); -void *seg_get_inflate_rom_start(void); -void *seg_get_inflate_rom_start2(void); -void *seg_get_gamezips_rom_start(void); void seg_inflate(void *src, void *dst, void *scratch); #endif diff --git a/src/include/lib/snd.h b/src/include/lib/snd.h index f699780ca..8cbe2e5c1 100644 --- a/src/include/lib/snd.h +++ b/src/include/lib/snd.h @@ -6,25 +6,14 @@ bool snd_is_filtered(s32 audioid); bool snd_is_playing_mp3(void); -u16 snd0000e9dc(void); void snd_set_sfx_volume(u16 volume); -void snd0000ea80(u16 volume); void snd_reset_cur_mp3(void); -void snd_load_sfx_ctl(void); -void snd_increment_ages(void); -ALEnvelope *snd_load_envelope(u32 offset, u16 index); -ALKeyMap *snd_load_keymap(u32 offset, u16 index); -ALADPCMBook *snd_load_adpcm_book(u32 offset, u16 index); -ALADPCMloop *snd_load_adpcm_loop(u32 offset, u16 index); -ALWaveTable *snd_load_wavetable(u32 offset, u16 index); void snd_set_sound_mode(s32 mode); ALSound *snd_load_sound(s16 soundnum); -void seq_init(struct seqinstance *seq); void snd_init(void); bool snd_is_mp3(s16 soundnum); bool snd_stop_mp3(s16 arg0); bool seq_play(struct seqinstance *seq, s32 tracknum); -u16 seq_get_volume(struct seqinstance *seq); void seq_set_volume(struct seqinstance *seq, u16 volume); void snd_handle_retrace(void); void snd0000fe20(void); @@ -38,9 +27,7 @@ struct sndstate *snd_start(s32 arg0, s16 sound, struct sndstate **handle, s32 vo void snd_start_mp3(s16 soundnum, s32 volume, s32 pan, s32 responseflags); void snd_play_nosedive(s32 seconds); void snd_stop_nosedive(void); -void snd_tick_nosedive(void); void snd_play_ufo(s32 seconds); void snd_stop_ufo(void); -void snd_tick_ufo(void); #endif diff --git a/src/include/lib/str.h b/src/include/lib/str.h index 5acd717c4..838c4d8a4 100644 --- a/src/include/lib/str.h +++ b/src/include/lib/str.h @@ -9,9 +9,7 @@ char *strncpy(char *dst, const char *src, s32 len); char *strcat(char *dst, const char *src); s32 strcmp(const char *s1, const char *s2); s32 strncmp(const char *s1, const char *s2, s32 len); -char toupper(char c); s32 isdigit(char c); -s32 isalpha(char c); s32 isspace(char c); s32 strtol(const char *src, const char **endptr, s32 base); diff --git a/src/include/lib/vi.h b/src/include/lib/vi.h index 96e0dd942..030841170 100644 --- a/src/include/lib/vi.h +++ b/src/include/lib/vi.h @@ -20,7 +20,6 @@ Vp *vi_get_current_player_viewport(void); u16 vi_get_persp_scale(void); Gfx *vi0000ab78(Gfx *gdl); Gfx *vi0000aca4(Gfx *gdl, f32 znear, f32 zfar); -Gfx *vi0000ad5c(Gfx *gdl, Vp *vp); Gfx *vi0000af00(Gfx *gdl, Vp *vp); Gfx *vi0000b0e8(Gfx *gdl, f32 fovy, f32 aspect); Gfx *vi0000b1a8(Gfx *gdl); diff --git a/src/lib/anim.c b/src/lib/anim.c index 034e496ea..77d3e42af 100644 --- a/src/lib/anim.c +++ b/src/lib/anim.c @@ -42,6 +42,8 @@ u8 *g_AnimHostSegment = NULL; extern u8 _animationsTableRomStart; extern u8 _animationsTableRomEnd; +void anims_init_tables(void); + void anims_init(void) { s32 i; diff --git a/src/lib/boot.c b/src/lib/boot.c index 32068f644..eb61310c0 100644 --- a/src/lib/boot.c +++ b/src/lib/boot.c @@ -63,6 +63,8 @@ s32 boot_get_mem_size(void) u32 __osGetFpcCsr(void); u32 __osSetFpcCsr(u32 arg0); +void boot_create_threads(void *arg); + /** * Prepares the inflate, .data and lib segments, then creates and starts the * main thread. diff --git a/src/lib/collision.c b/src/lib/collision.c index b200af1d8..62b3bbf35 100644 --- a/src/lib/collision.c +++ b/src/lib/collision.c @@ -52,6 +52,8 @@ s32 var8005f030 = 0; bool g_CdHasSavedBlock = false; s32 var8005f038 = 0; +void cd_get_geo_normal(struct geo *geo, struct coord *normal); + f32 cd_00024e40(void) { return var8009a8f0; diff --git a/src/lib/crash.c b/src/lib/crash.c index 6b49d1dab..9b7e76162 100644 --- a/src/lib/crash.c +++ b/src/lib/crash.c @@ -177,6 +177,7 @@ extern u32 _libSegmentEnd; void faultproc(void *arg0); u32 crash_generate(OSThread *thread, u32 *callstack, s32 *tracelen); void crash_print_description(u32 mask, char *label, struct crashdescription *descriptions); +void crash_scroll(s32 numlines); #if VERSION < VERSION_NTSC_1_0 void crash_set_message(char *string) diff --git a/src/lib/joy.c b/src/lib/joy.c index 3940469c1..f1ed59d49 100644 --- a/src/lib/joy.c +++ b/src/lib/joy.c @@ -112,6 +112,10 @@ u32 var800612c8nb = 3; u8 var800612ccnb = 0; #endif +void joy00013e84(void); +s32 joy_get_pak_state2(s8 device); +void joys_tick_rumble(void); + #if VERSION >= VERSION_NTSC_1_0 void joy_lock_cyclic_polling(void) { diff --git a/src/lib/main.c b/src/lib/main.c index 57c04d9ab..de515a2ef 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -311,6 +311,9 @@ extern u8 _copyrightSegmentRomStart; extern u8 _copyrightSegmentRomEnd; extern u8 _bssSegmentEnd; +void main_tick(void); +void func0000e9c0(void); + /** * Initialise various subsystems, display the copyright or accessing pak texture, * then initialise more subsystems. diff --git a/src/lib/mp3.c b/src/lib/mp3.c index ab0adf9af..52735c339 100644 --- a/src/lib/mp3.c +++ b/src/lib/mp3.c @@ -28,13 +28,17 @@ struct mp3vars g_Mp3Vars; struct asistream *g_AsiStream; +void func00038b90(void *fn); s32 func00038ba8(s32 arg0, u8 *arg1, s32 arg2, s32 arg3); +void mp3_dma(void); extern f32 *var8009c6d8; extern f32 *var8009c6dc; extern struct mp3decfourbytes *var8009c640; extern f32 *var8009c644; +void func00038924(struct mp3vars *vars); + void mp3_init(ALHeap *heap) { bzero(&g_Mp3Vars, sizeof(struct mp3vars)); diff --git a/src/lib/mtx.c b/src/lib/mtx.c index 154bce19c..9594685cc 100644 --- a/src/lib/mtx.c +++ b/src/lib/mtx.c @@ -7,6 +7,11 @@ #include "data.h" #include "types.h" +void mtx00017614(f32 arg0[4][4], f32 arg1[4][4]); +f32 mtx00017a78(f32 arg0[4][4]); +f32 mtx00017c2c(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8); +f32 mtx00017cbc(f32 arg0, f32 arg1, f32 arg2, f32 arg3); + void mtx00016110(f32 mtx1[3][3], f32 mtx2[3][3]) { f32 mtx3[3][3]; diff --git a/src/lib/naudio/n_sndplayer.c b/src/lib/naudio/n_sndplayer.c index ede40194f..9c57d226c 100644 --- a/src/lib/naudio/n_sndplayer.c +++ b/src/lib/naudio/n_sndplayer.c @@ -24,6 +24,9 @@ void (*g_SndpRemoveRefCallback)(ALSound *) = NULL; void sndpSetAddRefCallback(void *fn); void sndpSetRemoveRefCallback(void *fn); void sndpFreeState(struct sndstate *state); +u16 sndpCountStates(s16 *numfreeptr, s16 *numallocedptr); +void func00033090(struct sndstate *state); +void func00033100(struct sndstate *state); void func00033bc0(struct sndstate *state); void n_alSndpNew(ALSndpConfig *config) diff --git a/src/lib/sched.c b/src/lib/sched.c index a8f4f495f..a594d8a3b 100644 --- a/src/lib/sched.c +++ b/src/lib/sched.c @@ -60,6 +60,9 @@ void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp); void __scYield(OSSched *s); s32 __scSchedule(OSSched *sc, OSScTask **sp, OSScTask **dp, s32 availRCP); +void sched_init_artifacts(void); +void sched_consider_screenshot(void); + OSViMode var8008dcc0[NUM_GFXTASKS]; OSViMode *var8008dd60[NUM_GFXTASKS]; OSViMode var8008dd68[NUM_GFXTASKS]; diff --git a/src/lib/snd.c b/src/lib/snd.c index c49d0e777..d45443e74 100644 --- a/src/lib/snd.c +++ b/src/lib/snd.c @@ -868,6 +868,10 @@ extern u8 _seqctlSegmentRomEnd; extern u8 _seqtblSegmentRomStart; extern u8 _sequencesSegmentRomStart; +u16 seq_get_volume(struct seqinstance *seq); +void snd_tick_nosedive(void); +void snd_tick_ufo(void); + bool snd_is_playing_mp3(void) { return g_SndCurMp3.playing;